bookshop-array-structures 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c4b7006d6acc1a01ccb184fb5d9122e03acc278d40a9194c5a51e5e53c39ad
-  data.tar.gz: aff6856e93b8c304e5003fad6b943148e24253ec2e30a566b4912c12f5150d52
+  metadata.gz: 7c0a35b6a33b5ee4c41a6613b606215917ad4d8f96428e7a2c65a103cbd40bf5
+  data.tar.gz: 62fd2204b8c1686bc9ecc62b3854fbeb74503f1ebc81c64e832ba43ddadda1ad
 SHA512:
-  metadata.gz: a1fb28bef8d8e90f581be164b8dec8fe3689b0801bad16fdad31b2b8cebc7a287d4c46edd48805928a3e6abd4d494016ae5f405dfb3119b1a9033232fb966797
-  data.tar.gz: ca588fddf15bc24e5814c259e36d89fc9b20beb86a2dd5b204f05d4535c444af710e5a30eca0507e9682c190705cc87f9fc6f95dc69bcaa52a12cf468e02f1c5
+  metadata.gz: 72d4fa070d5331c027d10a54c444c5042d8cf5eebc91fac52a01e7af925213f13243e71f5942044a9a4ef3ca1ff82655f743ac5f90c7235155a32e3c9ee6436b
+  data.tar.gz: 27919b0a39c3495ef05121344c238a0e15a513f78bfdb60497f9744dc371771768f79fe71a5d38cec0e10d8208468109dae80cf915d8cdab404c62a52fd3be4d

data/lib/bookshop-array-structures.rb

@@ -4,8 +4,8 @@ require "toml-rb"
 module Bookshop
   class ArrayStructures
     def self.get_story_name(path)
-      basename = path.split("/").last.split(".").first
-      return basename.split("-").map(&:capitalize).join(" ")
+      basename = get_component_type(path)
+      return basename.split(/-|\//).map(&:capitalize).join(" ")
     end
 
     def self.get_component_type(path)
@@ -18,12 +18,9 @@ module Bookshop
       return result
     end
 
-
-    def self.transform_component(path, component, site)
-      result = {}
-      result['_component_type'] = get_component_type(path);
-      component.each_pair { |storyname, story|
-        story.each_pair {|key, value|
+    def self.handle_story(story, site)
+      result = {};
+      story.each_pair {|key, value|
           if result.has_key?(key) && storyname != "defaults"
             next
           end
@@ -63,31 +60,67 @@ module Bookshop
               end
               site.config["_select_data"][new_key].push(option)
             } 
+          elsif key.include? "--"
+            new_key = key.split("--").first
+            result[new_key] = nil
           else
             result[key] = value
           end
         }
+        return result
+    end
+
+    def self.transform_component(path, component, site)
+      result = { "value" => {} }
+      result["label"] = get_story_name(path)
+      result["value"]["_component_type"] = get_component_type(path)
+      component.each_pair { |storyname, story|
+        if storyname == "meta"
+          result.merge!(story)
+        else
+          result["value"].merge!(handle_story(story, site))
+        end
       }
+      result["array_structures"] ||= [];
+      contains_component = result["array_structures"].select{|value| value == 'components'}.length > 0
+      if !contains_component && !result["_hidden"]
+        result["array_structures"].push("components")
+      end
+      result.delete("_hidden") unless result["_hidden"].nil?
       return result
     end
 
     def self.build_array_structures(site)
-      base_path = ""
+      base_path = "_bookshop/components/"
       if !site.theme.nil?
         base_path = site.theme.root + "/_bookshop/components/"
       end
       site.config["_select_data"] ||= {}
       site.config["_array_structures"] ||= {}
-      site.config["_array_structures"]["components"] ||= {
-        "values" => []
-      }
+      puts "📚 Parsing Stories..."
       Dir.glob("**/*.stories.{toml,tml,tom,tm}", base: base_path).each do |f|
-        component = TomlRB.load_file(base_path + f)
-        site.config["_array_structures"]["components"]["values"].push({
-          "label" => get_story_name(f),
-          "value" => transform_component(f, component, site)
-        })
+        begin
+          component = TomlRB.load_file(base_path + f)  
+        rescue => exception
+          puts "❌ Error Parsing Story: " + f
+          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
+        }
       end
+      puts "✅ Finshed Parsing Stories"
+      #puts site.config["_array_structures"].inspect
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Bookshop
   module Arraystructures
-    VERSION = "1.4.6"
+    VERSION = "1.4.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookshop-array-structures
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Tate
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -50,7 +50,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - tate@cloudcannon.com
 executables: []
@@ -64,7 +64,7 @@ homepage: https://github.com/cloudcannon/bookshop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Jekyll plugin to generate array structures from bookshop
 test_files: []