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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b80104056e78915d6eedc29619a34914c07c8a5b5d6bc04ec1d28b0d96337a
-  data.tar.gz: a14718cdcfd503cbef9c185ad812bd995ef03abeef5e22eb54557a7a67cb8a55
+  metadata.gz: 8bdfa2472fe2135938ef5d3c819411412c46f1b5c30cc224ae1f388442a28e3a
+  data.tar.gz: 0140b5a55a4684fe41e00e448fafafee6e2c61d569d881fe82e73870b3bad1e8
 SHA512:
-  metadata.gz: 2eba54c7c2e53f66d953e48aac1fcd0f4fc2a8991539e0ca929fdcc7d73015525beb9ce0e3cf42938cb8bff7c4bb3e762531984805ce37791fca88eaec3a3765
-  data.tar.gz: 5a421d4799a3a30fe06deadc927c1e7bfe060c4c8586e63b50dff2391129429a1640c67838351c2be1096f0dc0d69be7859dd8ac1986c136621d1fc4ab8c78a7
+  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.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,24 +343,26 @@ 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
 
     def self.build_array_structures(site)
       bookshop_locations = site.config['bookshop_locations']&.collect do |location|
-        Pathname.new(location + "/components").cleanpath.to_s
+        Pathname.new("#{site.source}/#{location}/components").cleanpath.to_s
       end
       bookshop_locations = bookshop_locations.select do |location|
         Dir.exist?(location)

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

@@ -1,5 +1,5 @@
 module Bookshop
   module Arraystructures
-    VERSION = "2.0.0.pre.alpha.5"
+    VERSION = "2.0.0.pre.alpha.10"
   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.5
+  version: 2.0.0.pre.alpha.10
 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: []