bookshop-array-structures 2.0.0.pre.alpha.14 → 2.0.0.pre.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8052309d296ee3695983daa041d9e39bdf69f3f226474ba81f5f1cf4e696cf4
-  data.tar.gz: 146fc74df0dca682270676200315df23cb1b44b6c49fb61ad5895a6655789a8a
+  metadata.gz: ffe817204ff4c9f64cb28ea3b5016a4511ee24c0a7673c72d04cb5d92d1b6ac8
+  data.tar.gz: 9b1e308639b9fd6fe37cf766ec0de492dc9c6c9e31dff433a2730160b78a5e55
 SHA512:
-  metadata.gz: 3938ce43ce5271697c32869082cd8a543ac071ef8817a76e4dc3833d2e81c0fea887215fab8409ec49101cfd342ae2ba20e758d6722c8c168bb9a2994ae87ffe
-  data.tar.gz: 5933b04fab640e1eafc53c6ba335d4d659d985d42f4c01e6afa020a0ebe0379181938a91c0f37263d5327e3cedabfd3510d47c59548e4b431687b55b4507bc59
+  metadata.gz: fb006014847f7a8744268c8767672ee47f1e66360f96d131156cddcd05ae3e066423566eb328eaf00629df3e0181d096ec77224400491837753842155f40a9ab
+  data.tar.gz: bb2b543bcda1169f2d17d84b9d36184eccf77423a4adef0446aa3edcc15c3c9c902cd1d5026b1fe69cc2fb26f5c8a7835f94b26d9d3566a69175b08b864b534d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bookshop-array-structures (2.0.0.pre.alpha.11)
+    bookshop-array-structures (2.0.0.pre.alpha.17)
       dry-inflector (>= 0.1, < 1.0)
       jekyll (>= 3.7, < 5.0)
       toml-rb (>= 2.0, < 3.0)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     ast (2.4.2)
@@ -17,12 +17,12 @@ GEM
     citrus (3.0.2)
     colorator (1.1.0)
     concurrent-ruby (1.1.9)
-    dry-inflector (0.2.0)
+    dry-inflector (0.2.1)
     em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.15.1)
+    ffi (1.15.3)
     forwardable-extended (2.6.0)
     hashdiff (1.0.1)
     http_parser.rb (0.6.0)
@@ -71,7 +71,7 @@ GEM
     public_suffix (4.0.6)
     rainbow (2.2.2)
       rake
-    rake (10.5.0)
+    rake (12.3.3)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)

data/lib/bookshop-array-structures.rb

@@ -31,30 +31,28 @@ module Bookshop
       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
-          end
+          next if value_context.has_key?(key)
 
           if value.is_a? Hash
             comment =   value["--bookshop_comment"]         || 
-                        value["default--bookshop_comment"]  || 
-                        value["select--bookshop_comment"]   || 
-                        value["preview--bookshop_comment"]
+                        value["select--bookshop_comment"]  || 
+                        value["preview--bookshop_comment"]   || 
+                        value["default--bookshop_comment"]
             if comment
               structure["_comments"][key] = comment
             end
-            unless value["default"].nil?
-              value_context[key] = value["default"]
-              next
-            end
             if value["select"]
-              value_context[key] = nil
+              value_context[key] = value["default"]
               plural_key = inflector.pluralize(key)
               structure["_select_data"][plural_key] = value["select"]
               next
             end
             if value["preview"]
-              value_context[key] = nil
+              value_context[key] = value["default"]
+              next
+            end
+            unless value["default"].nil?
+              value_context[key] = value["default"]
               next
             end
             value_context[key] ||= {}
@@ -68,6 +66,11 @@ module Bookshop
                 structure["_comments"][key] = value[0]["--bookshop_comment"]
               end
 
+              if structure["raw_fields"]&.include?(key)
+                value_context[key] = nil
+                next
+              end
+
               singular_title = inflector.classify(key).gsub(/(.)([A-Z])/, '\1 \2')
               structure["_array_structures"][key] ||= {
                 "values" => [{
@@ -176,6 +179,7 @@ module Bookshop
         results.push(transform_template_component(result))
       end
       result.delete("_template")
+      result.delete("raw_fields")
       return results
     end
 

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

@@ -1,5 +1,5 @@
 module Bookshop
   module Arraystructures
-    VERSION = "2.0.0.pre.alpha.14"
+    VERSION = "2.0.0.pre.alpha.18"
   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.14
+  version: 2.0.0.pre.alpha.18
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll