jekyll-bookshop 2.0.0.pre.alpha.7 → 2.0.0.pre.alpha.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cac00131ec04e5582dc6c8f89e177a3aa306abbc5c51522f0a9175af5016249
-  data.tar.gz: b3b97e8005d57aaef0c5b12c813c4671e07e9336b83a17ece8888ef8347e2a59
+  metadata.gz: 2d0e9021962d6d2d9eef26d3151037110b8438ce7ef83736631cbc05f87c29d0
+  data.tar.gz: a9c525e23e1dc61a008d86755d5216e91ebbcbf64dd1331297f7ef103d3fa731
 SHA512:
-  metadata.gz: 7e9706e863b2d8b1f5b5edbe00afd8f011270faae31f4b8d0db3ab8863414e66f3c30c80a7ffcc5c1de69172846f50d5ca5c6066659050acd005e8b7babb8a14
-  data.tar.gz: db11956432b5a16c4b27e464c2c3de3d20f1d06128e2ce15f959c056846573e2e75e4d213bd3d822eb8b5fbecc3570a1668b4bcebe39ba5f9a3b6b6d1ab1b602
+  metadata.gz: f678a6095815f900eeff2a8810f64dfe45d10eaf03884aba0aff9d9b164cd9712029a9f0f1649b97327df5a217dc4b54548eb56b3efe5c79a4efc1b7870be006
+  data.tar.gz: dfdf1bdadfb87ad5989707ee70aaed180937defcf87c50dffbef5156f9f82fdc52ee9646e6cdc2ed627fb6778e1d7f7df561c9bd5a5cabe4643d95ca757b8a20

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
 

data/lib/jekyll-bookshop/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.7
+  version: 2.0.0.pre.alpha.12
 platform: ruby
 authors:
-- Liam Bigelow
+- CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-14 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: []