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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f916f25db1483e458aa21fa59eb9c51ffa634ea125b5f9815f16720577e96353
-  data.tar.gz: 7038f5c2f29d3a4cf75e558ae9dffbd3d6843e92e16e91c812e61a3394f973c9
+  metadata.gz: f13abc99b301d86c40d59d436c03b6ffecf219c2fb970fb58bc60e6384ebb1cf
+  data.tar.gz: 3854362932a2ce2f3e968ad417530e16721fd7d3a3baa805bf4f77145f30fc80
 SHA512:
-  metadata.gz: 012d8267c8a87c6b7671cd58ca66813313acdf001c86913ba7b9249c243a72be6c97aaf7b687a0d1b789729355f711aa431bf020a6dd8b19966f32489f16ac8c
-  data.tar.gz: 674d6d702c6277734c2e4897681514082cf81fd597af2bbf78870350007266efe64861e8c048cf164e84e616ba2b7dfdf29ecb4907508cf871d5ae3ca8e91e58
+  metadata.gz: 83ced29aebf52c3c959ba3feaa6c28e1c406f2195693ac3b85730c8904cfa163b5d09682bc935ca0681028f342d74713bfa190fe7bc1e2dcfdf101edd7512721
+  data.tar.gz: '08d1f87ff6e228ea678ddb6cbb70982bd0fc413ffad3f8a10c598df22bbd626a95c526e56f5b1bdea2377860815e9f75ac82543e274fdf474bb24d7aa95f39a6'

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.10"
+  VERSION = "2.0.0.pre.alpha.15"
 end

metadata

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