valise 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 595572bd8badbc1f6cdc0180301b97c39b5a5db9
-  data.tar.gz: 51ce6702114d48371432dd2bbe9747d6dcea9b83
+  metadata.gz: a283caacd236ce4be21dd9f0e2d3df40948c3bdb
+  data.tar.gz: 49c285b29cded418465616fc560392a5d05dda71
 SHA512:
-  metadata.gz: 34cd3b95ab86795ff19f622fa8f9e6dc7601bd87470ba5eff8c27cf5eaab9a803b7812fd0f422efc190877055b1b1cb6ea0a58ff74912d44ec6a95062c21a112
-  data.tar.gz: 6b1e8ccf94867befc5e5c1897bbfd8a650de738cfac98e8d28381303c889fa1b5e853f13d56e9b353abb4d247760a3b28821ed9ab3a76b9aeb9eaab47fb68dc6
+  metadata.gz: 8a36a7e75ec4ee6e1b83105d3b675b2289a2d4f11a343876a8b84c37cdb9f2aa275fcb71a436fb9f2983e3725bb8e4a76a0fd5a0f90e51e6939ac4147d245781
+  data.tar.gz: 00b1168bfa5f39af1d09f9b686f7ec0951fff8e3289b93254b0ddf153de17cb854f91cae3a5da1984ac5d813dfecd964803a2dbc648f86f4963b0ef9f31817fd

data/lib/valise/strategies/merge-diff.rb

@@ -37,8 +37,13 @@ module Valise
           item.each_pair do |key, value|
             case value
             when Hash
-              collect[key] ||= {}
-              deep_merge(collect[key], value)
+              existing = collect[key] ||= {}
+              case existing
+              when Hash
+                deep_merge(existing, value)
+              else
+                collect[key] = value
+              end
             else
               collect[key] = value
             end

data/spec/merge-diff.rb

@@ -81,6 +81,13 @@ describe Valise do
 
       item.contents["a"].should == {"a" => 1, "b" => 2, "c" => 3}
     end
+
+    it "should merge mixed scalars and lists" do
+      bottom_hash["a"] = {"a" => 1, "b" => 1, "c" => [1], "d" => {"1" => 1}}
+      middle_hash["a"] = {"a" => [1], "b" => {"1" => 2}, "c" => 1, "d" => "1"}
+
+      item.contents["a"].should == {"a" => [1], "b" => {"1" => 2}, "c" => 1, "d" => "1"}
+    end
   end
 
   describe "diff" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valise
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
@@ -210,7 +210,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- valise-1.1.2 RDoc
+- valise-1.1.3 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement