jekyll-bookshop 2.0.0.pre.alpha.6 → 2.0.0.pre.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547820823e84a8f724261d8ad21f9da6453543e62e0d352506fa178455860932
-  data.tar.gz: 76e11bf1ef21346e48c80f7bb58241e2a5dd371f93563d1eae1d156f883f6998
+  metadata.gz: b83f0c00e59a3a11cd3c45a83b827b4746a059767be1b54aba7ca4bad15e6637
+  data.tar.gz: f0e07eaf06e489df91881bfb6fbd56f8aa92fbb703bdd9d00f88f745e6574c16
 SHA512:
-  metadata.gz: 78351e3aa8d0474f42c7ffb0f447c0e92b47503273b01e8e638b61e2363c52c1de707763c8738c79f7d7d5a43ca0b23cdf6df0bb576fa9d9499ec43354266992
-  data.tar.gz: 826de74c699df019fd758bfeeb13751938fd9230ad1ca3ab28a2001fa9fd2af2fb2916f606bd77f58f7bab706c6f59603a4d29db644c01f691f10074da22d36b
+  metadata.gz: 1531dbce913e222352948952e7ce04061cb384f592174eeddda60e22fe5051c8500726b24e7c3965af0fc881e29d5691cfe30da5fbc46be05ba572797ed020e7
+  data.tar.gz: eca3de9faa109f6b36e228857410e7faa92367a35f863ecbbc3e9585d01b38de5829304f7dc2386612724de082a893877e4e658d5d902e5c49689143bffac898

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 params.key? "__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|
+        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.6"
+  VERSION = "2.0.0.pre.alpha.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.6
+  version: 2.0.0.pre.alpha.11
 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: []