abroad 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dadd8e40a0bd722140b69e9afc49eae5aa28f28e
-  data.tar.gz: f204d17dffbc54735c6255765e675e809bc0cd29
+  metadata.gz: 0b68ea68c52475a6416744f8605aacf49a680b44
+  data.tar.gz: 9f3b19ef80343e6b157ccf016f8ee040ce422a0a
 SHA512:
-  metadata.gz: bca09d5714337ed9456c3dfa774d3ba63287114a4e8d2a6403dfcf0f71267902f9dcdf76840537b9be98231c6bac86a19342f27dd495977a0636021d2ab09c1d
-  data.tar.gz: 63b5cc4df1bef7e34f0501932b22c5e7c54f90e13be4738d9b6664848310e8daf3e653c90c1c099968a2922c08110ad4f237ad07e1c360129814d84284ef1b6a
+  metadata.gz: 9b4bb6fcdbb232870d7f88d654a010f0569b6490f8c00922adcc243c0e8a0ad1a78d924c75430267bd1e6ba292669def38e4c828bb385d008e2db3f09b4e3516
+  data.tar.gz: 43ca2d4a935b470fe1de2e05d7aa74fb82898f73eeeec6d111dee6f882243690d8d76dd77c615eb9f15ec806d9bd5a1a4bb94c3c9b0fbd928c002f45b1d82e0a

data/lib/abroad/extractors/yaml/dotted_key_extractor.rb

@@ -21,7 +21,7 @@ module Abroad
                 walk(val, cur_path + [segment], options, &block)
               end
             when Array
-              if options[:preserve_arrays]
+              if options[:preserve_arrays] && string_array?(obj)
                 yield scrub_path(cur_path).join('.'), obj
               else
                 obj.each_with_index do |val, idx|
@@ -33,6 +33,17 @@ module Abroad
           end
         end
 
+        def string_array?(arr)
+          arr.all? do |elem|
+            case elem
+              when Hash, Array
+                false
+              else
+                true
+            end
+          end
+        end
+
         def scrub_path(path)
           path  # no-op
         end

data/lib/abroad/version.rb

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

data/spec/extractors/yaml/dotted_key_extractor_spec.rb

@@ -16,4 +16,18 @@ describe Abroad::Extractors::Yaml::DottedKeyExtractor do
       'foo.bar' => %w(a b c)
     )
   end
+
+  it "expands arrays if they don't contain only strings" do
+    content = YAML.dump(foo: { bar: [{ baz: 'boo' }] })
+    extractor = Abroad::Extractors::Yaml::DottedKeyExtractor.from_string(content)
+    enum = extractor.extract_each(preserve_arrays: true)
+
+    phrases = enum.with_object({}) do |(key, value), ret|
+      ret[key] = value
+    end
+
+    expect(phrases).to eq(
+      'foo.bar.0.baz' => 'boo'
+    )
+  end
 end

metadata

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