jekyll-bookshop 2.0.0.pre.alpha.5 → 2.0.0.pre.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e92ee512a6bc33f0b3bd8559a05d6b60302c0e11c22a14c6f89ec001121a05db
-  data.tar.gz: 1c05f39bea2e59713a16c54f03d8ebe63a9c37bbeb8546a0da41342a51011360
+  metadata.gz: f916f25db1483e458aa21fa59eb9c51ffa634ea125b5f9815f16720577e96353
+  data.tar.gz: 7038f5c2f29d3a4cf75e558ae9dffbd3d6843e92e16e91c812e61a3394f973c9
 SHA512:
-  metadata.gz: a8f34bf13c9ab929a66fb53f09d4f79efc8384b10fb27b466fb6c7fde6f38a418be50eb67c07029bf61c5c1d01cb41684996af8e52120af18d361c2eb5f5b4e2
-  data.tar.gz: 4bed403b8d80a9ec62ac56e69cf8e405f9da6a654b942813d3f2ba4d5c0b7bb16e3b937493b843f44dc7040947a23e34097d6556b861ee581c6d6c4039e3fe60
+  metadata.gz: 012d8267c8a87c6b7671cd58ca66813313acdf001c86913ba7b9249c243a72be6c97aaf7b687a0d1b789729355f711aa431bf020a6dd8b19966f32489f16ac8c
+  data.tar.gz: 674d6d702c6277734c2e4897681514082cf81fd597af2bbf78870350007266efe64861e8c048cf164e84e616ba2b7dfdf29ecb4907508cf871d5ae3ca8e91e58

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,59 @@ module JekyllBookshop
       context['site']['bookshop_component_locations'].freeze
     end
 
+    def expand_param_templates(params, context, parent_param)
+      param_hash = {}
+      new_params = {}
+      
+      template = params["__template"]
+      return Liquid::Template.parse(template).render(context) if template
+
+      array_template = params["__array_template"]
+      if 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|
+        if param.end_with? "_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 +76,7 @@ module JekyllBookshop
       end
 
       params.delete('bind')
+      params = expand_param_templates(params, context, "")
 
       params
     end
@@ -31,6 +86,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 +110,7 @@ module JekyllBookshop
           raise e
         end
       end
+
     end
   end
 
@@ -60,7 +119,7 @@ module JekyllBookshop
       site = context.registers[:site]
       
       bookshop_scss_files = []
-      site.config['bookshop_locations']&.each do |location|
+      site.config['bookshop_base_locations']&.each do |location|
         components_loc = Pathname.new(location + "/").cleanpath.to_s
         scss_files = Dir.glob(components_loc + "/**/*.scss")&.collect do |scss_file|
           scss_file.sub!(components_loc+"/", '').sub!(".scss", '')
@@ -88,25 +147,25 @@ module JekyllBookshop
 
     # Add the paths to find bookshop's styles
     def self.open_bookshop(site)
-      base_bookshop_locations = site.config['bookshop_locations']&.collect do |location|
+      bookshop_base_locations = site.config['bookshop_locations']&.collect do |location|
         Pathname.new("#{site.source}/#{location}/").cleanpath.to_s
       end
-      base_bookshop_locations = base_bookshop_locations.select do |location|
+      bookshop_base_locations = bookshop_base_locations.select do |location|
         Dir.exist?(location)
       end
-      bookshop_component_locations = base_bookshop_locations&.collect do |location|
+      bookshop_component_locations = bookshop_base_locations&.collect do |location|
         Pathname.new("#{location}/components/").cleanpath.to_s
       end
 
       site.config['watch_dirs'] ||= [] # Paired with CloudCannon/jekyll-watch
-      site.config['watch_dirs'].push(*base_bookshop_locations);
+      site.config['watch_dirs'].push(*bookshop_base_locations);
 
       site.config['sass'] ||= {}
       site.config['sass']['load_paths'] ||= []
-      site.config['sass']['load_paths'].push(*base_bookshop_locations)
+      site.config['sass']['load_paths'].push(*bookshop_base_locations)
 
-      site.config['bookshop_locations'] = []
-      site.config['bookshop_locations'].push(*base_bookshop_locations)
+      site.config['bookshop_base_locations'] ||= []
+      site.config['bookshop_base_locations'].push(*bookshop_base_locations)
 
       site.config['bookshop_component_locations'] ||= []
       site.config['bookshop_component_locations'].push(*bookshop_component_locations)

data/lib/jekyll-bookshop/version.rb

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

metadata

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