attribute_struct 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4678195877f88a043df9e50bb70bd2b15d6e0de6
-  data.tar.gz: 67a4f4870ed31aeabb2e43602c8d996bc2f550ee
+  metadata.gz: 2784bc7275103df06114555bef8c340a6af7e41d
+  data.tar.gz: a718c494924468d7653683451f5734debeeaf536
 SHA512:
-  metadata.gz: 5d0d0c9f6dd9fb55e757fb2a91988cf7d58ded85d393e75f03261d27f4df0fe9692b1d64385e6cc186079a8e3a7cbb4be494101bd4b6cbf03689d4be17aace36
-  data.tar.gz: 27a40c5108a547180fcbb91f2f78db07adf405e42b6ed9a3a3b12a3c533ff594ba52d92f10d84f6d1b689e05586b7cd4d4fe70a545864de136dbdae54125fb91
+  metadata.gz: ebdb20db6a9a5a1060a7868f60aeb9f1ed1a2e8e00767027ce530d5b2a7584d7398e16b69c4822c87b0d2325c21db9425bd5094b305e319d04205111998dcd22
+  data.tar.gz: a5e0a40f61d168e0653f9322123f0b33ece9e0b576db793bb0910643cd3fc37ffe201d8a6178ac45d12e3bfc1f5bea8fb4c43ea6ee5b9124e33651bef218ac47

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.2.14
+* Fix `:value_collapse` option to prevent multiple nestings
+
 ## v0.2.12
 * Implementation updates to monkey camels helper
 * Provide bang style helper methods for all helpers

data/lib/attribute_struct/attribute_hash.rb

@@ -225,7 +225,7 @@ class AttributeStruct
       if value.class == Hash
         Mash.from_hash(value)
       elsif value.is_a?(Array)
-        value.collect { |e| convert_value(e) }
+        value.class.new.replace(value.collect { |e| convert_value(e) })
       else
         value
       end

data/lib/attribute_struct/attribute_struct.rb

@@ -172,7 +172,9 @@ class AttributeStruct < BasicObject
           if(orig == :__unset__)
             @table[sym] = base
           else
-            orig = [orig] unless orig.is_a?(::Array)
+            unless(orig.is_a?(CollapseArray))
+              orig = CollapseArray.new.push(orig)
+            end
             orig << base
             @table[sym] = orig
           end
@@ -193,14 +195,16 @@ class AttributeStruct < BasicObject
         end
         block.arity == 0 ? leaf._build(&block) : leaf._build(leaf, &block)
         if(orig)
-          orig = [orig] unless orig.is_a?(::Array)
+          unless(orig.is_a?(CollapseArray))
+            orig = CollapseArray.new.push(orig)
+          end
           orig << leaf
         else
           orig = leaf
         end
-        @table[sym] = result
+        @table[sym] = orig
       else
-        if(args.size > 1 && args.all?{|i| i.is_a?(::String) || i.is_a?(::Symbol)})
+        if(args.size > 1 && args.all?{|i| i.is_a?(::String) || i.is_a?(::Symbol)} && !_state(:value_collapse))
           @table[sym] = _klass_new unless @table[sym].is_a?(_klass)
           endpoint = args.inject(@table[sym]) do |memo, k|
             unless(memo[k].is_a?(_klass))
@@ -211,7 +215,9 @@ class AttributeStruct < BasicObject
           return endpoint # custom break out
         else
           if(_state(:value_collapse) && !(leaf = @table[sym]).nil?)
-            leaf = CollapseArray.new.push(leaf) unless leaf.is_a?(CollapseArray)
+            unless(leaf.is_a?(CollapseArray))
+              leaf = CollapseArray.new.push(leaf)
+            end
             leaf << (args.size > 1 ? args : args.first)
             @table[sym] = leaf
           else

data/lib/attribute_struct/version.rb

@@ -2,5 +2,5 @@ require 'attribute_struct/attribute_struct'
 
 class AttributeStruct
   # Current library version
-  VERSION = ::Gem::Version.new('0.2.12')
+  VERSION = ::Gem::Version.new('0.2.14')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribute_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Attribute structures
 email: chrisroberts.code@gmail.com