casted_hash 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6f21e00d6939ee05431e9cd4a91d3a05a3a0cb8
-  data.tar.gz: 2795940878a1721f5e08f76c0e89d33af294a9ca
+  metadata.gz: bf3b3d257f7006192515041d52f399aca8090943
+  data.tar.gz: ae3a58bcf07664a3403e66eb0db81ae761c7b871
 SHA512:
-  metadata.gz: 99487582e081aeb4d5f81edbe97a926f58909dfae05d4925e4a825292aa6d9b1c314590f2465e5fc1936f5f927471da4ba131f5e602d0d84ae1cf9eba72c4425
-  data.tar.gz: 63ab1e583432fd53eae7c04ef525971765b4786d128e7203bf4b3e46c86acefb7233bab665877b638e0f1a2259de4cec044095dc92eccc969db830dbad8baf26
+  metadata.gz: 5b51d3de96a7ed760fb02673dc6aba39677081f856075dd719cd1c8245e69c826f53e63fb7e6dc02cd1373692703054943b81dad2fbf30b4bc4ea0d61c85b3e4
+  data.tar.gz: 24aa339f2d51e5679e81e6eaadfaa1fa98f601b3707de39e4a02a829a5df7c70ef19fcf586a2b23ed9afc8c436ef08cc618aac05b63db062e0ccbb726d11b1d5

data/lib/casted_hash.rb

@@ -1,5 +1,5 @@
 class CastedHash < Hash
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 
   def initialize(constructor = {}, cast_proc = nil)
     raise ArgumentError, "`cast_proc` required" unless cast_proc
@@ -53,15 +53,16 @@ class CastedHash < Hash
   def update(other_hash)
     return self if other_hash.empty?
 
-    if other_hash.is_a? CastedHash
-      other_hash.keys.each do |key|
-        if other_hash.casted?(key)
-          casted!(key)
-        elsif casted?(key)
-          uncast!(key)
+    if other_hash.is_a?(CastedHash)
+      super(other_hash).tap do
+        other_hash.keys.each do |key|
+          if other_hash.casted?(key)
+            casted!(key)
+          elsif casted?(key)
+            uncast!(key)
+          end
         end
       end
-      super(other_hash)
     else
       other_hash.each_pair { |key, value| self[key] = value }
       self

data/test/test_casted_hash.rb

@@ -102,22 +102,23 @@ describe CastedHash do
 
       assert_equal 11, hash1[:a]
       assert_equal 12, hash1[:b]
-      assert_equal 104, hash2[:d]
       assert hash1.casted?(:a)
       assert hash1.casted?(:b)
-      assert hash2.casted?(:d)
 
+      assert_equal 104, hash2[:d]
+      assert hash2.casted?(:d)
       assert !hash2.casted?(:a)
 
       hash3 = hash1.merge hash2
       assert_equal 10, hash3[:z]
+      assert hash3.casted?(:z)
       assert !hash1.casted?(:z)
 
       assert_equal ["a", "b", "c", "d", "z"], hash3.keys.sort
-      assert !hash3.casted?(:a)
-      assert hash3.casted?(:b)
-      assert !hash3.casted?(:c)
-      assert hash3.casted?(:d) # already casted
+      assert !hash3.casted?(:a) # overwritten with uncasted value
+      assert hash3.casted?(:b) # not overwritten, still casted
+      assert !hash3.casted?(:c) # overwritten with uncasted value
+      assert hash3.casted?(:d) # overwritten with casted value
 
       assert_equal 12, hash3[:a]
       assert_equal 12, hash3[:b]
@@ -126,18 +127,13 @@ describe CastedHash do
     end
 
     it "doesn't uncast when merging same value" do
-      hash1 = CastedHash.new({:a => 1, :b => 2, :c => 3}, lambda {|x| x + 1})
-      hash2 = CastedHash.new({:a => 0, :b => 2, :c => 4}, lambda {|x| x + 2})
-
+      hash1 = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 1})
       assert_equal 2, hash1[:a]
-      assert_equal 3, hash1[:b]
-      assert_equal 4, hash1[:c]
 
-      hash3 = hash1.merge(hash2)
+      hash1.merge!(hash1)
 
-      assert !hash3.casted?(:a) # value is different
-      assert !hash3.casted?(:b)
-      assert  hash3.casted?(:c)
+      assert hash1.casted?(:a)
+      assert !hash1.casted?(:b)
     end
 
     it "does not cast all values when merging hashes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: casted_hash
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler