bookshop-array-structures 2.0.0.pre.alpha.6 → 2.0.0.pre.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3711c17e1471fd6edbf0ea003a9acf57dfefd5a9f63bf782dc513e2017a68b0
-  data.tar.gz: ab98a4c6242250a4fee5bfc65f942b77668e2d9b50a9a1e28edb212571753af9
+  metadata.gz: bc64af97dba6b97d2887320793f66249a7b17754eb3f21e3007857232bba53a9
+  data.tar.gz: ac861a05afe512c38ecf28f45e8da9262ef433683b9b12f59274c503d1a869e9
 SHA512:
-  metadata.gz: a93e89d72c800dddfcd45485f9693b02ea2f2068cea4aff19e63e088986dc79c140eb40531ee76df909040836642401377ede3c50a41ec5ee059d786cc1bce71
-  data.tar.gz: 3cd104e743326297fd72e43d46a43e93dd60bd485e77e2585860985eacc6d2a499e75a127918f64ad4ff210300bcd5be16c1c815d4fa1c2a7df0b2cbdb54d8fc
+  metadata.gz: '0957f4491873f58ac95b6569ed762939ccae6cbeeecb3cbf6fb7d4a2f1b5c34ef00207a189411f7666ead8a0e8bc81a524bdd0af1a2ca43a13778cefddca3450'
+  data.tar.gz: 4f959f0b3e6dfd264745fa5a55f355311e1e31857b469c0e894ee4cea76e17588e51451dd598ae79bbee62a3251dffd2372a923145357b7215d9e74403033a97

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bookshop-array-structures (2.0.0.pre.alpha.3)
+    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)
@@ -16,7 +16,7 @@ GEM
     builder (3.2.4)
     citrus (3.0.2)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     dry-inflector (0.2.0)
     em-websocket (0.5.2)
       eventmachine (>= 0.12.9)

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

@@ -171,7 +171,115 @@ module Bookshop
         result["array_structures"].push("bookshop_components")
       end
       result.delete("_hidden") unless result["_hidden"].nil?
-      return result
+      results = [result]
+      if result["_template"]
+        results.push(transform_template_component(result))
+      end
+      result.delete("_template")
+      return results
+    end
+
+    def self.transform_template_component(result)
+      schema_result = Marshal.load(Marshal.dump(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"
+      schema_result["label"] = "Templated #{schema_result["label"]}"
+      schema_result["_array_structures"] = {}
+      schema_result["_select_data"] = {}
+      schema_result.delete("_template")
+      schema_result
+    end
+
+    # 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, 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? "_"
+      end
+      flatten_hash(structure["value"]).each do |flat_key|
+        cascade_key = flat_key.split(".").last
+        matched_comment = structure.dig("_comments", cascade_key)
+        matched_substructure = structure.dig("_array_structures", cascade_key, "values", 0)
+
+        if 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
+          end
+          matched_substructure["_comments"].each_pair do |subkey, subcomment|
+            # Pull substructure's comments into this structure
+            structure["_comments"]["#{flat_key}.#{subkey}"] = subcomment
+          end
+        else
+          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
+          end
+        end
+      end
+      structure["value"] = flattened_keys
+    end
+
+    # Recursively convert a hash into flat dot-notation keys
+    def self.flatten_hash(hash)
+      keys = [];
+      hash.each_pair do |k, v|
+        next if k.start_with? "_"
+        if v.is_a? Hash
+          flatten_hash(v).each do |ik|
+            keys.push("#{k}.#{ik}")
+          end
+        else
+          keys.push(k)
+        end
+      end
+      keys
+    end
+
+    def self.templatize_values(hash)
+      templated_hash = hash.dup
+      hash.each_pair do |k, v|
+        next if k.start_with? "_"
+        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
+
+    def self.templatize_comments(hash)
+      templated_hash = hash.dup
+      hash.each_pair do |k, comment|
+        next if k.end_with? "__array_template"
+        templated_hash.delete(k)
+        templated_hash["#{k}.__template"] = comment
+      end
+      templated_hash
     end
 
     def self.transform_legacy_component(path, component, site)
@@ -192,7 +300,7 @@ module Bookshop
         result["array_structures"].push("components")
       end
       result.delete("_hidden") unless result["_hidden"].nil?
-      return result
+      return [result]
     end
 
     def self.rewrite_bookshop_toml(content)
@@ -235,17 +343,19 @@ module Bookshop
           puts exception
           next
         end
-        transformed_component = transform_component(f, component, site)
-        array_structures = transformed_component.delete("array_structures")
-        array_structures.each{|key|
-          begin
-            site.config["_array_structures"][key] ||= {}
-            site.config["_array_structures"][key]["values"] ||= []
-            site.config["_array_structures"][key]["values"].push(transformed_component)
-          rescue => exception
-            puts "❌ Error Adding Story to Array Structures: " + f
-            puts "🤔 Maybe your current _config.yml has conflicting array structures?"
-          end
+        transformed_components = transform_component(f, component, site)
+        transformed_components.each{|transformed_component|
+          array_structures = transformed_component.delete("array_structures")
+          array_structures.each{|key|
+            begin
+              site.config["_array_structures"][key] ||= {}
+              site.config["_array_structures"][key]["values"] ||= []
+              site.config["_array_structures"][key]["values"].push(transformed_component)
+            rescue => exception
+              puts "❌ Error Adding Story to Array Structures: " + f
+              puts "🤔 Maybe your current _config.yml has conflicting array structures?"
+            end
+          }
         }
       end
     end

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

@@ -1,5 +1,5 @@
 module Bookshop
   module Arraystructures
-    VERSION = "2.0.0.pre.alpha.6"
+    VERSION = "2.0.0.pre.alpha.11"
   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.6
+  version: 2.0.0.pre.alpha.11
 platform: ruby
 authors:
-- Tate
+- CloudCannon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-13 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: []