trickery 0.0.2 → 0.0.3

data/lib/trickery/hash/deep_merge.rb

@@ -1,7 +1,7 @@
 class ::Hash
   def deep_merge(*hashes)
     merger = proc do |key, v1, v2|
-      Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+      Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : (v2.nil? ? v1 : v2)
     end
     hashes.inject(self) do |result, other|
       result.merge(other, &merger)

data/lib/trickery/version.rb

@@ -1,3 +1,3 @@
 module Trickery
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/trickery/hash/deep_merge_spec.rb

@@ -19,10 +19,10 @@ describe Hash do
     assert { { a: { b: 2, c: 4 } } == a.deep_merge(b, c) }
   end
 
-  it 'merges nil' do
+  it 'ignores nil' do
     a = { a: { b: 0 } }
     b = { a: { b: nil } }
-    assert { { a: { b: nil } } == a.deep_merge(b) }
+    assert { { a: { b: 0 } } == a.deep_merge(b) }
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trickery
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3366191683089287710
+      hash: 2592008232353536074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3366191683089287710
+      hash: 2592008232353536074
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23