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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b83f0c00e59a3a11cd3c45a83b827b4746a059767be1b54aba7ca4bad15e6637
-  data.tar.gz: f0e07eaf06e489df91881bfb6fbd56f8aa92fbb703bdd9d00f88f745e6574c16
+  metadata.gz: 21ca731f6c601f6a8a9dcf77961545abc9f2f685bcd35f711ee42417d43e6343
+  data.tar.gz: b1745066742f5ae58c723c9c080a1872da41218ff64bb8ead5f0ce5bbd070d78
 SHA512:
-  metadata.gz: 1531dbce913e222352948952e7ce04061cb384f592174eeddda60e22fe5051c8500726b24e7c3965af0fc881e29d5691cfe30da5fbc46be05ba572797ed020e7
-  data.tar.gz: eca3de9faa109f6b36e228857410e7faa92367a35f863ecbbc3e9585d01b38de5829304f7dc2386612724de082a893877e4e658d5d902e5c49689143bffac898
+  metadata.gz: dfb44b01c31a8bc33b3206fd6382e6ca42a90c7295de629d9852f2714275713618d19b4b80928a509a05bd5dcaabb4e016dbf52e362dd86bb6b17f09c4c7a9d7
+  data.tar.gz: b915ab8df7097692e3891c0c95f8c22b74803c55a24b5b3e2d62028683df159863556bb19f6540cc4a19ec2a146278179c823ca524de76996900af8e6df88e1d

data/lib/jekyll-bookshop.rb

@@ -14,8 +14,9 @@ module JekyllBookshop
       param_hash = {}
       new_params = {}
       
-      template = params["__template"] || ""
-      return Liquid::Template.parse(template).render(context) if params.key? "__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 params.key? "__array_template"
@@ -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
@@ -68,7 +70,7 @@ module JekyllBookshop
       params = super
 
       params.each do |key, value|
-        if key == 'bind'
+        if key == 'bind' && value.is_a?(Hash)
           valueHash = {}.merge(value)
           params = valueHash.merge(params)
           next
@@ -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.11"
+  VERSION = "2.0.0.pre.alpha.16"
 end

metadata

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