bookshop-array-structures 2.0.0.pre.alpha.8 → 2.0.0.pre.alpha.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22677855f6b324f9afb59568c281564392c3fdd50777dfe1b90067aedbc11391
-  data.tar.gz: 2e16193303b823509f81735a4f9c77ea1a88a49c9f77954f218dd3136ab8d5a0
+  metadata.gz: 6cf0300e43535775fbc9d534f5423f73273d5aa43f6ec11173d3a131d987f0c1
+  data.tar.gz: dbfc037fa29d74277e0671baac116036c2b5341de316f7943c86f920dba0d0b7
 SHA512:
-  metadata.gz: c58f22533b9570e8fd2a1b5026e57efae6633cadb20eb735bfbc6d2fd99276c36bd8b0ab01ec87e236fdf9d80521bada5ebd9395b50b8b84099422cf6294064d
-  data.tar.gz: ad50d2713c9c761e30b5e486b865663f503e5458e48b768bbd005a4ccd3f4a893eddca731728890e877fee166c17ae4f3b121ce63f0fea3b99941314735c8bf3
+  metadata.gz: 907e37b22973b00d90f6f17bc69c598ea9506a41d9faaa691af7bc4d338cd21d9651fec61744ae775e1e8aa993bd021138c3d551530262630b7f824a4db92bfd
+  data.tar.gz: c52ca5c3d5df70c3a5d3de2b6dd3c35c64d06d2f4289aac82fd0740b4e8cd996de12004f5a2a4a40aa27ece9d4f1e4a98d3af24c7acfd18365598db5397dedd8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bookshop-array-structures (2.0.0.pre.alpha.7)
+    bookshop-array-structures (2.0.0.pre.alpha.11)
       dry-inflector (>= 0.1, < 1.0)
       jekyll (>= 3.7, < 5.0)
       toml-rb (>= 2.0, < 3.0)

data/bookshop-array-structures.gemspec

@@ -3,8 +3,8 @@ require_relative 'lib/bookshop-array-structures/version'
 Gem::Specification.new do |spec|
   spec.name          = "bookshop-array-structures"
   spec.version       = Bookshop::Arraystructures::VERSION
-  spec.authors       = ["Tate"]
-  spec.email         = ["tate@cloudcannon.com"]
+  spec.authors       = ["CloudCannon"]
+  spec.email         = ["support@cloudcannon.com"]
   spec.homepage      = "https://github.com/cloudcannon/bookshop"
   spec.summary       = "A Jekyll plugin to generate array structures from bookshop"
 

data/lib/bookshop-array-structures.rb

@@ -180,10 +180,12 @@ module Bookshop
     end
 
     def self.transform_template_component(result)
+      base_template_hash = {"pre.__template_code" => ""}
+      base_comment_hash = {"pre.__template_code" => "Helper liquid to run before the feilds below. Assigns and captures will be available"}
       schema_result = Marshal.load(Marshal.dump(result))
-      unwrap_structure_template(schema_result)
-      schema_result["value"] = templatize_values(schema_result["value"])
-      schema_result["_comments"] = templatize_comments(schema_result["_comments"])
+      unwrap_structure_template(schema_result, "site")
+      schema_result["value"] = base_template_hash.merge! templatize_values(schema_result["value"])
+      schema_result["_comments"] = base_comment_hash.merge! templatize_comments(schema_result["_comments"])
       schema_result["value"]["_bookshop_name"] = "#{schema_result["value"]["_bookshop_name"]}.__template"
       schema_result["label"] = "Templated #{schema_result["label"]}"
       schema_result["_array_structures"] = {}
@@ -195,7 +197,9 @@ module Bookshop
     # Breadth-first search through the structure, looking for keys
     # that will match array structure or comments and flattening them
     # into the root structure
-    def self.unwrap_structure_template(structure)
+    def self.unwrap_structure_template(structure, parent_scope)
+      inflector = Dry::Inflector.new
+      singular_parent_scope = inflector.singularize(parent_scope)
       flattened_keys = {}
       structure["value"].each_pair do |base_key, base_value|
         flattened_keys[base_key] = base_value if base_key.start_with? "_"
@@ -206,7 +210,15 @@ module Bookshop
         matched_substructure = structure.dig("_array_structures", cascade_key, "values", 0)
 
         if matched_substructure
-          unwrap_structure_template(matched_substructure)
+          # Mark this key as an array so the include plugin knows to return
+          # a value and not a string
+          flattened_keys["#{flat_key}.__array_template"] = "{% assign #{cascade_key} = #{singular_parent_scope}.#{cascade_key} %}"
+          if matched_comment
+            structure["_comments"].delete(cascade_key)
+            structure["_comments"]["#{flat_key}.__array_template"] = matched_comment
+          end
+          
+          unwrap_structure_template(matched_substructure, cascade_key)
           matched_substructure["value"].each_pair do |subkey, subvalue|
             # Pull substructure's flat keys into this structure
             flattened_keys["#{flat_key}.#{subkey}"] = subvalue
@@ -215,15 +227,12 @@ module Bookshop
             # Pull substructure's comments into this structure
             structure["_comments"]["#{flat_key}.#{subkey}"] = subcomment
           end
-          # Mark this key as an array so the include plugin knows to return
-          # a value and not a string
-          flattened_keys["#{flat_key}.__array_template"] = "{{#{cascade_key}}}"
-          if matched_comment
-            structure["_comments"].delete(cascade_key)
-            structure["_comments"]["#{flat_key}.__array_template"] = matched_comment
-          end
         else
-          flattened_keys[flat_key] = ""
+          key_parent_scope = ""
+          unless singular_parent_scope == "site"
+            key_parent_scope = "#{singular_parent_scope}."
+          end
+          flattened_keys[flat_key] = "{{ #{key_parent_scope}#{flat_key.split('.').last} }}"
           if matched_comment
             structure["_comments"].delete(cascade_key)
             structure["_comments"][flat_key] = matched_comment
@@ -251,11 +260,16 @@ module Bookshop
 
     def self.templatize_values(hash)
       templated_hash = hash.dup
-      hash.each_key do |k|
+      hash.each_pair do |k, v|
         next if k.start_with? "_"
-        next if k.end_with? "__array_template"
-        templated_hash.delete(k)
-        templated_hash["#{k}.__template"] = "{{#{k.split('.').last}}}"
+        if k.end_with? "__array_template"
+          # Remove and re-add the array so position is preserved
+          templated_hash.delete(k)
+          templated_hash[k] = v
+        else
+          templated_hash.delete(k)
+          templated_hash["#{k}.__template"] = v
+        end
       end
       templated_hash
     end

data/lib/bookshop-array-structures/version.rb

@@ -1,5 +1,5 @@
 module Bookshop
   module Arraystructures
-    VERSION = "2.0.0.pre.alpha.8"
+    VERSION = "2.0.0.pre.alpha.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookshop-array-structures
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.8
+  version: 2.0.0.pre.alpha.13
 platform: ruby
 authors:
-- Tate
+- CloudCannon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-12 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -72,7 +72,7 @@ dependencies:
         version: '1.0'
 description:
 email:
-- tate@cloudcannon.com
+- support@cloudcannon.com
 executables: []
 extensions: []
 extra_rdoc_files: []