jekyll-bookshop 2.0.0.pre.alpha.8 → 2.0.0.pre.alpha.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ef8591510abbc4fe50bd326fd6d2387da047b547e7f54582b07d1ebf3f2ace
-  data.tar.gz: 7e02ca2b237eff55023a1a12ad3b78abf71a72499c781e69761bacf3e8ab2d8b
+  metadata.gz: 52c01447b01a07e9e104c4daf5f39e74cc97f509de314a61e2758c168272b527
+  data.tar.gz: 5441f54fbedc4234706659096695f5f4ba7a78371b0f1baec33257532945a28f
 SHA512:
-  metadata.gz: 1bd9f64db37ca097bb9431f1e8a4dcedac9834b6e60a689db434c52787cbf4e04d20f8a46dc2a207d8fc62368b7f6238216a793135cd59b70a14aab51e214575
-  data.tar.gz: 16f22b6f1a460f4be51803233196a0f6f096cbcc4da8b4f311cb2e6965e7abc39335b33044e4e099e60ccbf3379daa84169806bd61b575d09a12d541a0bdefa5
+  metadata.gz: 5e97c34357c628af30189fe417caaba2cdf27e9ef32b9db7704938d936fce6ca6bbf51716cf05a0e718f4604fd49e7896d0d334097a2eb5efe7881c2af7c3462
+  data.tar.gz: 4ec958445695604b0ba14081d02ff11098ec2b1cca8ae83634b2004af8db76f11d152261c86c3c9228203b959d62cf7772e380738807e0c72a0e622c9c70a9bb

data/lib/jekyll-bookshop.rb

@@ -1,5 +1,6 @@
 require "jekyll"
-require 'pathname'
+require "pathname"
+require "dry/inflector"
 
 module JekyllBookshop
   class Tag < Jekyll::Tags::IncludeTag
@@ -9,6 +10,61 @@ module JekyllBookshop
       context['site']['bookshop_component_locations'].freeze
     end
 
+    def expand_param_templates(params, context, parent_param)
+      param_hash = {}
+      new_params = {}
+      
+      is_template = params.key?("__template") || params.key?("__template_code")
+      template = params["__template"] || params["__template_code"] || ""
+      return Liquid::Template.parse(template).render(context) if is_template
+
+      array_template = params["__array_template"] || ""
+      if params.key? "__array_template"
+          # We're adding a new root scope here and then removing it.
+          # Who knows why, but assign and capture always add to the root scope.
+          # Which is why this is hacked in, instead of using context.stack 🤷‍♂️
+          context.scopes.push({})
+          Liquid::Template.parse(array_template).render(context)
+          template_scope = context.scopes.pop()
+          template_array = template_scope[parent_param] || "";
+          unless template_array.is_a? Array
+            Jekyll.logger.warn "Bookshop:",
+                                  "#{array_template} did not evaluate to an array
+                                   as required for key #{parent_param}.__array_template"
+            template_array = []
+          end
+
+          params.delete("__array_template")
+          output_array = []
+          template_array.each do |item|
+            inflector = Dry::Inflector.new
+            singular_parent = inflector.singularize(parent_param)
+            next_scope = {}
+            next_scope[singular_parent] = item
+
+            context.push(next_scope)
+            output_array.push(expand_param_templates(params, context, ""))
+            context.pop()
+          end
+          return output_array
+      end
+
+      params.each_pair do |param, value|
+        is_template = param.end_with?("_template") || param.end_with?("_template_code")
+        if is_template
+          param_root, param_remainder = param.split('.', 2)
+          param_hash[param_root] ||= {}
+          param_hash[param_root][param_remainder] = value
+        else
+          new_params[param] = value
+        end
+      end
+      param_hash.each_pair do |param, values|
+        new_params[param] = expand_param_templates(values, context, param)
+      end
+      new_params
+    end
+
     # Support the bind syntax, spreading an object into params
     def parse_params(context)
       params = super
@@ -22,6 +78,9 @@ module JekyllBookshop
       end
 
       params.delete('bind')
+      context.scopes.push({}) # Do all expansion in an ephemeral root scope
+      params = expand_param_templates(params, context, "")
+      context.scopes.pop()
 
       params
     end
@@ -31,6 +90,9 @@ module JekyllBookshop
       site = context.registers[:site]
 
       file = render_variable(context) || @file
+      is_template = file.end_with? "__template"
+
+      file = file.gsub(".__template", "")
       cname = file.strip.split("/").last
       file = "#{file}/#{cname}.jekyll.html"
       validate_file_name(file)
@@ -52,6 +114,7 @@ module JekyllBookshop
           raise e
         end
       end
+
     end
   end
 
@@ -75,7 +138,7 @@ module JekyllBookshop
       output_css = if Jekyll.env == "production"
         bookshop_scss_files.join("\n")
       else
-"html:not([data-bookshop-hmr]) {
+"@media all, bookshop {
 #{bookshop_scss_files.join("\n")}
 }"
       end

data/lib/jekyll-bookshop/version.rb

@@ -1,3 +1,3 @@
 module JekyllBookshop
-  VERSION = "2.0.0.pre.alpha.8"
+  VERSION = "2.0.0.pre.alpha.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.8
+  version: 2.0.0.pre.alpha.13
 platform: ruby
 authors:
-- Liam Bigelow
+- CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-12 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,9 +30,29 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description:
 email:
-- liam@cloudcannon.com
+- support@cloudcannon.com
 executables: []
 extensions: []
 extra_rdoc_files: []