abroad 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b68ea68c52475a6416744f8605aacf49a680b44
-  data.tar.gz: 9f3b19ef80343e6b157ccf016f8ee040ce422a0a
+  metadata.gz: b46d62e7ba153afa73884e35c5bc6f1ecaa7a8e3
+  data.tar.gz: 2b40cc7ffbff3270a2e20e66851a253e7b3fead4
 SHA512:
-  metadata.gz: 9b4bb6fcdbb232870d7f88d654a010f0569b6490f8c00922adcc243c0e8a0ad1a78d924c75430267bd1e6ba292669def38e4c828bb385d008e2db3f09b4e3516
-  data.tar.gz: 43ca2d4a935b470fe1de2e05d7aa74fb82898f73eeeec6d111dee6f882243690d8d76dd77c615eb9f15ec806d9bd5a1a4bb94c3c9b0fbd928c002f45b1d82e0a
+  metadata.gz: 89b758b0a1bb58e8a0242e1f9f8ce5213981ba338bdd7255e4fe6f7b9afb2c9a2138f35de3da6b291b7c9e90ee0168af42979571072e4662a9a6ed0b32e7b358
+  data.tar.gz: 7708f3064b712244753192b8dfa2e19f11b7c05270e0e51c3b0c68825b4f76bd276e91a1a52716aafa482d1ac9d78ebaa2656e1b2bbed59ff471467aa2619714

data/lib/abroad/serializers/yaml/rails_serializer.rb

@@ -16,7 +16,7 @@ module Abroad
 
         def write_key_value(key, value)
           key_parts = split_key(key)
-          trie.add(key_parts, encode(value))
+          add_key_value(key_parts, value)
         end
 
         def flush
@@ -28,6 +28,23 @@ module Abroad
 
         private
 
+        def add_key_value(key_parts, value)
+          case value
+            when Array
+              value.each_with_index do |element, idx|
+                add_key_value(key_parts + [idx.to_s], element)
+              end
+
+            when Hash
+              value.each_pair do |key, val|
+                add_key_value(key_parts + [key], val)
+              end
+
+            else
+              trie.add(key_parts, encode(value))
+          end
+        end
+
         def encode(value)
           case value
             when Array
@@ -59,7 +76,6 @@ module Abroad
           end
         end
 
-        # depth-first
         def write_node(node, parent_key)
           if node
             if node.has_children?
@@ -77,13 +93,12 @@ module Abroad
         end
 
         def write_value(node, parent_key)
-          value = (node ? node.value : '') || ''
+          value = coerce((node ? node.value : '') || '')
 
-          case value
-            when Array
-              write_array_value(parent_key, value)
-            else
-              write_textual_value(parent_key, value)
+          if writer.in_map?
+            writer.write_key_value(parent_key, value)
+          else
+            writer.write_element(value)
           end
         end
 
@@ -99,27 +114,6 @@ module Abroad
           end
         end
 
-        def write_textual_value(parent_key, value)
-          value = coerce(value)
-
-          if writer.in_map?
-            writer.write_key_value(parent_key, value)
-          else
-            writer.write_element(value)
-          end
-        end
-
-        def write_array_value(parent_key, elements)
-          # we should _always_ be in a map, but just in case...
-          writer.write_sequence(parent_key) if writer.in_map?
-
-          elements.each do |element|
-            writer.write_element(coerce(element))
-          end
-
-          writer.close_sequence
-        end
-
         def write_map(node, parent_key)
           if writer.in_map?
             writer.write_map(parent_key)
@@ -158,8 +152,8 @@ module Abroad
             arr[idx] = node.children[idx.to_s]
           end
         end
-      end
 
+      end
     end
   end
 end

data/lib/abroad/version.rb

@@ -1,3 +1,3 @@
 module Abroad
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
 end

data/spec/serializers/yaml/rails_serializer_spec.rb

@@ -159,6 +159,24 @@ describe Abroad::Serializers::Yaml::RailsSerializer do
     })
   end
 
+  it 'works for nested arrays' do
+    result = serialize do
+      serializer.write_key_value('foo', [
+        { 'bar' => %w(a b), 'baz' => 'boo' },
+        { 'bar' => %w(c d), 'baz' => 'bop' }
+      ])
+    end
+
+    expect(result).to eq({
+      'fr' => {
+        'foo' => [
+          { 'bar' => %w(a b), 'baz' => 'boo' },
+          { 'bar' => %w(c d), 'baz' => 'bop' }
+        ]
+      }
+    })
+  end
+
   it 'writes nested key/value pairs and arrays (in any order)' do
     result = serialize do
       serializer.write_key_value('foo.0.bar.0', 'a')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abroad
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities