bookshop-array-structures 2.0.0.pre.alpha.9 → 2.0.0.pre.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e462ed292655141cffd66539af92a6d4f4cabadf23ff19d37fb94fe53b83254
-  data.tar.gz: 0d9836c8ad1816e22fb6cbd8c4001c3289ea8b32576e8538a79721d7366d481c
+  metadata.gz: 8bdfa2472fe2135938ef5d3c819411412c46f1b5c30cc224ae1f388442a28e3a
+  data.tar.gz: 0140b5a55a4684fe41e00e448fafafee6e2c61d569d881fe82e73870b3bad1e8
 SHA512:
-  metadata.gz: 669c00b48bfa5819817c0d86804dfee927b3a923d4203afddb58c821450cb2341081b91c93ad07b2aeb3069bcff2db10f766d8f57a1fee83caef1a2f30029983
-  data.tar.gz: f4d365d566d66c731720db57ada3306228dfd0196c481bf40ea1d84c7ace0432956cc516c851ffc011be1c1f9b8e4449dedb70f07de6039eab99d4401bce8a7b
+  metadata.gz: 583bd805506bf76b676efa8f456799a51d487454af3374f6d8dc4678af9abf2063ba623b7dc34b4ab722ec926abb6fae86ad78a13fddeae94d8ae4359062c741
+  data.tar.gz: 9b0d91988ba19200cc686cb5fc3a9f1bbc781dca017bca5ab1e179f5c51048c25a457e1ca97ccef93692c90edca92b66460633ea9f23ce294562811d1722072f

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.9)
       dry-inflector (>= 0.1, < 1.0)
       jekyll (>= 3.7, < 5.0)
       toml-rb (>= 2.0, < 3.0)

data/lib/bookshop-array-structures.rb

@@ -181,7 +181,7 @@ module Bookshop
 
     def self.transform_template_component(result)
       schema_result = Marshal.load(Marshal.dump(result))
-      unwrap_structure_template(schema_result)
+      unwrap_structure_template(schema_result, "site")
       schema_result["value"] = templatize_values(schema_result["value"])
       schema_result["_comments"] = templatize_comments(schema_result["_comments"])
       schema_result["value"]["_bookshop_name"] = "#{schema_result["value"]["_bookshop_name"]}.__template"
@@ -195,7 +195,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 +208,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 +225,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 +258,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.9"
+    VERSION = "2.0.0.pre.alpha.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookshop-array-structures
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.9
+  version: 2.0.0.pre.alpha.10
 platform: ruby
 authors:
 - CloudCannon