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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6738d08d84522a5465442dcfdba331e599e1d24db2298e8fc60ae474dc097f41
-  data.tar.gz: c7ecfde99307b8756bc24cc175421735869d013760dd5311b26e6a39c8ce7ff4
+  metadata.gz: 22677855f6b324f9afb59568c281564392c3fdd50777dfe1b90067aedbc11391
+  data.tar.gz: 2e16193303b823509f81735a4f9c77ea1a88a49c9f77954f218dd3136ab8d5a0
 SHA512:
-  metadata.gz: 2441b86eebcee962023cc93266905d04ec5e95609ba5cb42089fd727fc7d4264a26d89cd78e68a0206f8fa0460b2c869b87ab7979e487179aca645ee1ee2ab88
-  data.tar.gz: ce87689acdc1e21fc509612e6477d8aea56ca4ec9b98e93a0db38cbd72eb5dc95ccc56bb04145de945e7603ce74da3cf8da215e110ed5544c1eb5b8d7d5bd7e0
+  metadata.gz: c58f22533b9570e8fd2a1b5026e57efae6633cadb20eb735bfbc6d2fd99276c36bd8b0ab01ec87e236fdf9d80521bada5ebd9395b50b8b84099422cf6294064d
+  data.tar.gz: ad50d2713c9c761e30b5e486b865663f503e5458e48b768bbd005a4ccd3f4a893eddca731728890e877fee166c17ae4f3b121ce63f0fea3b99941314735c8bf3

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    bookshop-array-structures (1.6.1)
+    bookshop-array-structures (2.0.0.pre.alpha.7)
+      dry-inflector (>= 0.1, < 1.0)
       jekyll (>= 3.7, < 5.0)
       toml-rb (>= 2.0, < 3.0)
 
@@ -15,7 +16,8 @@ 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)
       http_parser.rb (~> 0.6.0)

data/bookshop-array-structures.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll", ">= 3.7", "< 5.0"
   spec.add_dependency "toml-rb", ">= 2.0", "< 3.0"
+  spec.add_dependency "dry-inflector", ">= 0.1", "< 1.0"
 end

data/lib/bookshop-array-structures.rb

@@ -1,6 +1,7 @@
 require "jekyll"
-require 'pathname'
+require "pathname"
 require "toml-rb"
+require "dry/inflector"
 
 module Bookshop
   class ArrayStructures
@@ -28,6 +29,7 @@ module Bookshop
       structure["_comments"] ||= {}
       structure["value"] ||= {}
       value_context = structure["value"] if value_context.nil?
+      inflector = Dry::Inflector.new
       value_obj.each_pair {|key, value|
           if value_context.has_key?(key)
             next
@@ -47,7 +49,8 @@ module Bookshop
             end
             if value["select"]
               value_context[key] = nil
-              structure["_select_data"][key+"s"] = value["select"]
+              plural_key = inflector.pluralize(key)
+              structure["_select_data"][plural_key] = value["select"]
               next
             end
             if value["preview"]
@@ -65,7 +68,14 @@ module Bookshop
                 structure["_comments"][key] = value[0]["--bookshop_comment"]
               end
 
-              structure["_array_structures"][key] ||= {"values" => [{"value" => {}}]}
+              singular_title = inflector.classify(key).gsub(/(.)([A-Z])/, '\1 \2')
+              structure["_array_structures"][key] ||= {
+                "values" => [{
+                  "label" => singular_title,
+                  "icon" => "add_box",
+                  "value" => {}
+                }]
+              }
               handle_bookprops( value[0], 
                                 structure["_array_structures"][key]["values"][0],
                                 structure["_array_structures"][key]["values"][0]["value"])
@@ -161,7 +171,103 @@ 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)
+      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)
+      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
+          unwrap_structure_template(matched_substructure)
+          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
+          # 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] = ""
+          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_key do |k|
+        next if k.start_with? "_"
+        next if k.end_with? "__array_template"
+        templated_hash.delete(k)
+        templated_hash["#{k}.__template"] = "{{#{k.split('.').last}}}"
+      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)
@@ -182,7 +288,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)
@@ -225,24 +331,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.3"
+    VERSION = "2.0.0.pre.alpha.8"
   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.3
+  version: 2.0.0.pre.alpha.8
 platform: ruby
 authors:
 - Tate
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -50,6 +50,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description:
 email:
 - tate@cloudcannon.com