From 41d0d6d51a8145d486ca35aa30b6c62fad6847ad Mon Sep 17 00:00:00 2001 From: Tobi Lutke Date: Tue, 29 Jul 2025 17:11:18 -0400 Subject: [PATCH] the performance runner wasn't actually working before --- performance/shopify/database.rb | 25 +++++++-- performance/shopify/vision.database.yml | 68 ++++++++++--------------- performance/theme_runner.rb | 61 ++++++++++++---------- 3 files changed, 81 insertions(+), 73 deletions(-) diff --git a/performance/shopify/database.rb b/performance/shopify/database.rb index 893c4e9d..922fde34 100644 --- a/performance/shopify/database.rb +++ b/performance/shopify/database.rb @@ -32,19 +32,36 @@ module Database end end - # Some standard direct accessors so that the specialized templates - # render correctly - db['collection'] = db['collections'].values.first db['product'] = db['products'].values.first db['blog'] = db['blogs'].values.first db['article'] = db['blog']['articles'].first - db['cart'] = { + # Some standard direct accessors so that the specialized templates + # render correctly + db['collection'] = db['collections'].values.first + db['collection']['tags'] = db['collection']['products'].map { |product| product['tags'] }.flatten.uniq.sort + + db['tags'] = db['collection']['tags'][0..1] + db['all_tags'] = db['products'].values.map { |product| product['tags'] }.flatten.uniq.sort + db['current_tags'] = db['collection']['tags'][0..1] + db['handle'] = db['collection']['handle'] + + db['cart'] = { 'total_price' => db['line_items'].values.inject(0) { |sum, item| sum + item['line_price'] * item['quantity'] }, 'item_count' => db['line_items'].values.inject(0) { |sum, item| sum + item['quantity'] }, 'items' => db['line_items'].values, } + db['linklists'] = db['link_lists'] + + db['shop'] = { + 'name' => 'Snowdevil', + 'currency' => 'USD', + 'money_format' => '${{amount}}', + 'money_with_currency_format' => '${{amount}} USD', + 'money_format_with_currency' => 'USD ${{amount}}', + } + db end end diff --git a/performance/shopify/vision.database.yml b/performance/shopify/vision.database.yml index 9f38c304..15e206c2 100644 --- a/performance/shopify/vision.database.yml +++ b/performance/shopify/vision.database.yml @@ -345,8 +345,7 @@ products: featured_image: products/arbor_draft.jpg images: - products/arbor_draft.jpg - description: - The Arbor Draft snowboard wouldn't exist if Polynesians hadn't figured out how to surf hundreds of years ago. But the Draft does exist, and it's here to bring your urban and park riding to a new level. The board's freaky Tiki design pays homage to culture that inspired snowboarding. It's designed to spin with ease, land smoothly, lock hook-free onto rails, and take the abuse of a pavement pounding or twelve. The Draft will pop off kickers with authority and carve solidly across the pipe. The Draft features targeted Koa wood die cuts inlayed into the deck that enhance the flex pattern. Now bow down to riding's ancestors. + description: The Arbor Draft snowboard wouldn't exist if Polynesians hadn't figured out how to surf hundreds of years ago. But the Draft does exist, and it's here to bring your urban and park riding to a new level. The board's freaky Tiki design pays homage to culture that inspired snowboarding. It's designed to spin with ease, land smoothly, lock hook-free onto rails, and take the abuse of a pavement pounding or twelve. The Draft will pop off kickers with authority and carve solidly across the pipe. The Draft features targeted Koa wood die cuts inlayed into the deck that enhance the flex pattern. Now bow down to riding's ancestors. variants: - *product-1-var-1 - *product-1-var-2 @@ -377,8 +376,7 @@ products: featured_image: products/element58.jpg images: - products/element58.jpg - description: - The Element is a technically advanced all-mountain board for riders who readily transition from one terrain, snow condition, or riding style to another. Its balanced design provides the versatility needed for the true ride-it-all experience. The Element is exceedingly lively, freely initiates, and holds a tight edge at speed. Its structural real-wood topsheet is made with book-matched Koa. + description: The Element is a technically advanced all-mountain board for riders who readily transition from one terrain, snow condition, or riding style to another. Its balanced design provides the versatility needed for the true ride-it-all experience. The Element is exceedingly lively, freely initiates, and holds a tight edge at speed. Its structural real-wood topsheet is made with book-matched Koa. variants: - *product-2-var-1 @@ -411,8 +409,7 @@ products: - products/technine1.jpg - products/technine2.jpg - products/technine_detail.jpg - description: - 2005 Technine Comic Series Description The Comic series was developed to be the ultimate progressive freestyle board in the Technine line. Dependable edge control and a perfect flex pattern for jumping in the park or out of bounds. Landins and progression will come easy with this board and it will help your riding progress to the next level. Street rails, park jibs, backcountry booters and park jumps, this board will do it all. + description: 2005 Technine Comic Series Description The Comic series was developed to be the ultimate progressive freestyle board in the Technine line. Dependable edge control and a perfect flex pattern for jumping in the park or out of bounds. Landins and progression will come easy with this board and it will help your riding progress to the next level. Street rails, park jibs, backcountry booters and park jumps, this board will do it all. variants: - *product-3-var-1 - *product-3-var-2 @@ -446,8 +443,7 @@ products: images: - products/technine3.jpg - products/technine4.jpg - description: - 2005 Technine Comic Series Description The Comic series was developed to be the ultimate progressive freestyle board in the Technine line. Dependable edge control and a perfect flex pattern for jumping in the park or out of bounds. Landins and progression will come easy with this board and it will help your riding progress to the next level. Street rails, park jibs, backcountry booters and park jumps, this board will do it all. + description: 2005 Technine Comic Series Description The Comic series was developed to be the ultimate progressive freestyle board in the Technine line. Dependable edge control and a perfect flex pattern for jumping in the park or out of bounds. Landins and progression will come easy with this board and it will help your riding progress to the next level. Street rails, park jibs, backcountry booters and park jumps, this board will do it all. variants: - *product-4-var-1 @@ -478,8 +474,7 @@ products: featured_image: products/burton.jpg images: - products/burton.jpg - description: - The Burton boots are particularly well on snowboards. The very best thing about them is that the according picture is cubic. This makes testing in a Vision testing environment very easy. + description: The Burton boots are particularly well on snowboards. The very best thing about them is that the according picture is cubic. This makes testing in a Vision testing environment very easy. variants: - *product-5-var-1 - *product-5-var-2 @@ -516,8 +511,7 @@ products: featured_image: products/ducati.jpg images: - products/ducati.jpg - description: -

‘S’ PERFORMANCE

+ description:

‘S’ PERFORMANCE

Producing 170hp (125kW) and with a dry weight of just 169kg (372.6lb), the new 1198 S now incorporates more World Superbike technology than ever before by taking the 1198 motor and adding top-of-the-range suspension, lightweight chassis components and a true racing-style traction control system designed for road use.

The high performance, fully adjustable 43mm Öhlins forks, which sport low friction titanium nitride-treated fork sliders, respond effortlessly to every imperfection in the tarmac. Beyond their advanced engineering solutions, one of the most important characteristics of Öhlins forks is their ability to communicate the condition and quality of the tyre-to-road contact patch, a feature that puts every rider in superior control. The suspension set-up at the rear is complemented with a fully adjustable Öhlins rear shock equipped with a ride enhancing top-out spring and mounted to a single-sided swingarm for outstanding drive and traction. The front-to-rear Öhlins package is completed with a control-enhancing adjustable steering damper.

variants: @@ -636,7 +630,6 @@ products: - *product-9-var-2 - *product-9-var-3 - # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- # Line Items # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -644,8 +637,8 @@ products: line_items: - &line_item-1 id: 1 - title: 'Arbor Draft' - subtitle: '151cm' + title: "Arbor Draft" + subtitle: "151cm" price: 29900 line_price: 29900 quantity: 1 @@ -654,8 +647,8 @@ line_items: - &line_item-2 id: 2 - title: 'Comic ~ Orange' - subtitle: '159cm' + title: "Comic ~ Orange" + subtitle: "159cm" price: 19900 line_price: 39800 quantity: 2 @@ -681,7 +674,7 @@ links: - &link-4 id: 4 title: Powered by Shopify - url: 'http://shopify.com' + url: "http://shopify.com" - &link-5 id: 5 title: About Us @@ -715,8 +708,6 @@ links: title: Catalog url: /collections/all - - # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- # Link Lists # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -724,8 +715,8 @@ links: link_lists: - &link-list-1 id: 1 - title: 'Main Menu' - handle: 'main-menu' + title: "Main Menu" + handle: "main-menu" links: - *link-12 - *link-5 @@ -733,8 +724,8 @@ link_lists: - *link-8 - &link-list-2 id: 1 - title: 'Footer Menu' - handle: 'footer' + title: "Footer Menu" + handle: "footer" links: - *link-5 - *link-6 @@ -768,8 +759,7 @@ collections: title: Snowboards handle: snowboards url: /collections/snowboards - description: -

This is a description for my Snowboards collection.

+ description:

This is a description for my Snowboards collection.

products: - *product-1 - *product-2 @@ -787,8 +777,8 @@ collections: - &collection-5 id: 5 title: Paginated Sale - handle: 'paginated-sale' - url: '/collections/paginated-sale' + handle: "paginated-sale" + url: "/collections/paginated-sale" products: - *product-1 - *product-2 @@ -799,8 +789,8 @@ collections: - &collection-6 id: 6 title: All products - handle: 'all' - url: '/collections/all' + handle: "all" + url: "/collections/all" products: - *product-7 - *product-8 @@ -812,7 +802,6 @@ collections: - *product-4 - *product-5 - # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- # Pages and Blogs # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -823,8 +812,7 @@ pages: handle: contact url: /pages/contact author: Tobi - content: - "

You can contact us via phone under (555) 567-2222.

+ content: "

You can contact us via phone under (555) 567-2222.

Our retail store is located at Rue d'Avignon 32, Avignon (Provence).

Opening Hours:
Monday through Friday: 9am - 6pm
Saturday: 10am - 3pm
Sunday: closed

" created_at: 2005-04-04 12:00 @@ -874,12 +862,12 @@ blogs: url: /blogs/news articles: - id: 3 - title: 'Welcome to the new Foo Shop' + title: "Welcome to the new Foo Shop" author: Daniel content:

Welcome to your Shopify store! The jaded Pixel crew is really glad you decided to take Shopify for a spin.

To help you get you started with Shopify, here are a couple of tips regarding what you see on this page.

The text you see here is an article. To edit this article, create new articles or create new pages you can go to the Blogs & Pages tab of the administration menu.

The Shopify t-shirt above is a product and selling products is what Shopify is all about. To edit this product, or create new products you can go to the Products Tab in of the administration menu.

While you're looking around be sure to check out the Collections and Navigations tabs and soon you will be well on your way to populating your site.

And of course don't forget to browse the theme gallery to pick a new look for your shop!

Shopify is in beta
If you would like to make comments or suggestions please visit us in the Shopify Forums or drop us an email.

created_at: 2005-04-04 16:00 - id: 4 - title: 'Breaking News: Restock on all sales products' + title: "Breaking News: Restock on all sales products" author: Tobi content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. created_at: 2005-04-04 12:00 @@ -891,13 +879,12 @@ blogs: url: /blogs/bigcheese-blog articles: - id: 1 - title: 'One thing you probably did not know yet...' + title: "One thing you probably did not know yet..." author: Justin content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. created_at: 2005-04-04 16:00 comments: - - - id: 1 + - id: 1 author: John Smith email: john@smith.com content: Wow...great article man. @@ -905,8 +892,7 @@ blogs: created_at: 2009-01-01 12:00 updated_at: 2009-02-01 12:00 url: "" - - - id: 2 + - id: 2 author: John Jones email: john@jones.com content: I really enjoyed this article. And I love your shop! It's awesome. Shopify rocks! @@ -932,7 +918,7 @@ blogs: url: /blogs/paginated-blog articles: - id: 6 - title: 'One thing you probably did not know yet...' + title: "One thing you probably did not know yet..." author: Justin content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. created_at: 2005-04-04 16:00 diff --git a/performance/theme_runner.rb b/performance/theme_runner.rb index aa5b9cb9..87b110dd 100644 --- a/performance/theme_runner.rb +++ b/performance/theme_runner.rb @@ -25,15 +25,17 @@ class ThemeRunner # Initialize a new liquid ThemeRunner instance # Will load all templates into memory, do this now so that we don't profile IO. - def initialize + def initialize(strictness: {}) + @strictness = strictness @tests = [] Dir[__dir__ + '/tests/**/*.liquid'].each do |test| next if File.basename(test) == 'theme.liquid' - test_name = File.basename(File.dirname(test)) + "/" + File.basename(test) - theme_name = File.basename(File.dirname(test)) - template_name = File.basename(test) - layout_path = File.dirname(test) + '/theme.liquid' + theme_path = File.realpath(File.dirname(test)) + theme_name = File.basename(theme_path) + test_name = theme_name + "/" + File.basename(test) + template_name = File.basename(test, '.liquid') + layout_path = theme_path + '/theme.liquid' test = { test_name: test_name, @@ -41,7 +43,7 @@ class ThemeRunner layout: File.file?(layout_path) ? File.read(layout_path) : nil, template_name: template_name, theme_name: theme_name, - theme_path: File.realpath(File.dirname(test)), + theme_path: theme_path, } @tests << test @@ -100,47 +102,50 @@ class ThemeRunner private def render_template(compiled_test) - tmpl, assigns, layout = compiled_test.values_at(:tmpl, :assigns, :layout) + tmpl, layout, assigns = compiled_test.values_at(:tmpl, :layout, :assigns) if layout - assigns['content_for_layout'] = tmpl.render!(assigns) - layout.render!(assigns) + assigns['content_for_layout'] = tmpl.render!(assigns, @strictness) + layout = layout.render!(assigns, @strictness) + layout else - tmpl.render!(assigns) + tmpl.render!(assigns, @strictness) end end def compile_and_render(test) - compiled_test = compile_test(test[:liquid], test[:layout], test[:template_name], test[:theme_path]) + compiled_test = compile_test(test) render_template(compiled_test) end def compile_all_tests @compiled_tests = [] @tests.each do |test_hash| - @compiled_tests << compile_test( - test_hash[:liquid], - test_hash[:layout], - test_hash[:template_name], - test_hash[:theme_path], - ) + @compiled_tests << compile_test(test_hash) end @compiled_tests end - def compile_test(template, layout, template_name, theme_path) - tmpl = Liquid::Template.new - tmpl.assigns['page_title'] = 'Page title' - tmpl.assigns['template'] = template_name - tmpl.registers[:file_system] = ThemeRunner::FileSystem.new(theme_path) - - parsed_template = tmpl.parse(template) + def compile_test(test_hash) + theme_path, template_name, layout, liquid = test_hash.values_at(:theme_path, :template_name, :layout, :liquid) assigns = Database.tables.dup + assigns.merge!({ + 'title' => 'Page title', + 'page_title' => 'Page title', + 'content_for_header' => '', + 'template' => template_name, + }) + + fs = ThemeRunner::FileSystem.new(theme_path) + + result = {} + result[:assigns] = assigns + result[:tmpl] = Liquid::Template.parse(liquid, registers: { file_system: fs }) + if layout - parsed_layout = tmpl.parse(layout).dup - { tmpl: parsed_template, assigns: assigns, layout: parsed_layout } - else - { tmpl: parsed_template, assigns: assigns } + result[:layout] = Liquid::Template.parse(layout, registers: { file_system: fs }) end + + result end end