jekyll-bookshop 2.0.0.pre.alpha.4 → 2.0.0.pre.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46fab0870b0fe3bf2f18ef2de82d603f18698c2b2e91d2dcab4a0f955d8c015
-  data.tar.gz: 2c3d5177e8b9f1f560cfa11cbb38bca7c882b9ef0059f8f2849fc73c926558c6
+  metadata.gz: 341b5af1ac2cf7e91e7467b900b47fb1d49d70f32317cd3c57f1e8074d49bd6a
+  data.tar.gz: 489bd3ae7286ac09505bd0c847c3bceadb62a909dfde42af9371788d1c905460
 SHA512:
-  metadata.gz: 29560e6e5a13f36cab682805f6d97a885c5d3ec9d7f5bc1d0bff9cb374ec45e7c297077274526b82bad425024cec247bfc3c3651b10f8097011f20c426324880
-  data.tar.gz: 9f09c58f4b19555df6d90fb810c3170bf7a020cb9b97dbdf046731d4a555c63c724f027081316a1c2f51b5abf53d8956d136bd5a9f0ac6c683fee99d44725266
+  metadata.gz: 5fb68d6c4b13a341c44a39912665f4e3ff2f1b5a7abaa7263b4243d990fd6d930706fa07c22bbe88901ebab2f7f6742f4452fc2a18ff7cc941fcc2ef212763c5
+  data.tar.gz: 6b60ab077c8886736b4ae74c1d8be7cf0c9a7981beb127a396c3ce672797f1c3f68cfdbd0086fcccdf7c9494f144008f1fecd9a8022f1b31282e94ea91f6c0d3

data/lib/jekyll-bookshop.rb

@@ -1,15 +1,66 @@
 require "jekyll"
-require 'pathname'
+require "pathname"
+require "dry/inflector"
 
 module JekyllBookshop
   class Tag < Jekyll::Tags::IncludeTag
 
     # Look for includes in the built bookshop directory
     def tag_includes_dirs(context)
-      bookshop_locations = context['site']['bookshop_locations']&.collect do |location|
-        Pathname.new(location + "/components").cleanpath.to_s
+      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
-      bookshop_locations.freeze
+      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
@@ -25,6 +76,7 @@ module JekyllBookshop
       end
 
       params.delete('bind')
+      params = expand_param_templates(params, context, "")
 
       params
     end
@@ -34,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)
@@ -55,6 +110,7 @@ module JekyllBookshop
           raise e
         end
       end
+
     end
   end
 
@@ -63,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", '')
@@ -91,19 +147,28 @@ module JekyllBookshop
 
     # Add the paths to find bookshop's styles
     def self.open_bookshop(site)
-      bookshop_locations = site.config['bookshop_locations']&.collect do |location|
-        Pathname.new(location + "/").cleanpath.to_s
+      bookshop_base_locations = site.config['bookshop_locations']&.collect do |location|
+        Pathname.new("#{site.source}/#{location}/").cleanpath.to_s
       end
-      bookshop_locations = bookshop_locations.select do |location|
+      bookshop_base_locations = bookshop_base_locations.select do |location|
         Dir.exist?(location)
       end
+      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(*bookshop_locations);
+      site.config['watch_dirs'].push(*bookshop_base_locations);
 
       site.config['sass'] ||= {}
       site.config['sass']['load_paths'] ||= []
-      site.config['sass']['load_paths'].push(*bookshop_locations)
+      site.config['sass']['load_paths'].push(*bookshop_base_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)
     end
   end
 

data/lib/jekyll-bookshop/version.rb

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

metadata

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