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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 341b5af1ac2cf7e91e7467b900b47fb1d49d70f32317cd3c57f1e8074d49bd6a
-  data.tar.gz: 489bd3ae7286ac09505bd0c847c3bceadb62a909dfde42af9371788d1c905460
+  metadata.gz: 45767a63ebfc1b0a7fe71cb28228bc62b60b5b6837193dc375720a0eb2871eb0
+  data.tar.gz: 053df17e2dfffa6b713cdd0fd9e451dd7d147462cb95f6d00ae4638a1fa91db4
 SHA512:
-  metadata.gz: 5fb68d6c4b13a341c44a39912665f4e3ff2f1b5a7abaa7263b4243d990fd6d930706fa07c22bbe88901ebab2f7f6742f4452fc2a18ff7cc941fcc2ef212763c5
-  data.tar.gz: 6b60ab077c8886736b4ae74c1d8be7cf0c9a7981beb127a396c3ce672797f1c3f68cfdbd0086fcccdf7c9494f144008f1fecd9a8022f1b31282e94ea91f6c0d3
+  metadata.gz: 6fb16bd47f99e2d91d9168a68707028041001cd6224a7c0c1448a65c6bdf44240a2f8ac13348c91b468e735e71e483a2397ab47d02562122e922c6ceaf0c0c19
+  data.tar.gz: a1a65ac622a4d77d45584b4d53652b5978ccbba27a4e2e6b978862a9c80596ce81e5ad69d0815fb578015f05fd40a3fe413466ca833623e43a5f2050e008c85d

data/lib/jekyll-bookshop.rb

@@ -14,11 +14,12 @@ module JekyllBookshop
       param_hash = {}
       new_params = {}
       
-      template = params["__template"]
-      return Liquid::Template.parse(template).render(context) if template
+      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 array_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 🤷‍♂️
@@ -49,7 +50,8 @@ module JekyllBookshop
       end
 
       params.each_pair do |param, value|
-        if param.end_with? "_template"
+        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
@@ -76,7 +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
@@ -128,13 +132,13 @@ module JekyllBookshop
       end
 
       bookshop_scss_files = bookshop_scss_files&.collect do |file|
-        "@import '#{file}';"
+        "@import \"#{file}\";"
       end
 
       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.9"
+  VERSION = "2.0.0.pre.alpha.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.9
+  version: 2.0.0.pre.alpha.14
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll