casted_hash 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d0e1bf59f7f60cbc0ade6d0845c3e5dac3cad7
-  data.tar.gz: 44f2485a4e0c2a5a686ac72f025e638240be5e34
+  metadata.gz: b6f21e00d6939ee05431e9cd4a91d3a05a3a0cb8
+  data.tar.gz: 2795940878a1721f5e08f76c0e89d33af294a9ca
 SHA512:
-  metadata.gz: b706bb8d8e5d4efbe59a633c075776938198bd0d00a50951500fda289d30f003b376e94ab5b12d364df7c199ded8fb0ce78180b37b92039bfe670aca8c45526f
-  data.tar.gz: 3d65221300c869f5670b4757bf1c9471056f8fec2607f0889978394eb5aef9e582c2a465085c65f1c680dd459e1fe6c803614fda43a6ea7c4fa3defce6dc31a8
+  metadata.gz: 99487582e081aeb4d5f81edbe97a926f58909dfae05d4925e4a825292aa6d9b1c314590f2465e5fc1936f5f927471da4ba131f5e602d0d84ae1cf9eba72c4425
+  data.tar.gz: 63ab1e583432fd53eae7c04ef525971765b4786d128e7203bf4b3e46c86acefb7233bab665877b638e0f1a2259de4cec044095dc92eccc969db830dbad8baf26

data/lib/casted_hash.rb

@@ -1,5 +1,5 @@
 class CastedHash < Hash
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 
   def initialize(constructor = {}, cast_proc = nil)
     raise ArgumentError, "`cast_proc` required" unless cast_proc
@@ -54,7 +54,13 @@ class CastedHash < Hash
     return self if other_hash.empty?
 
     if other_hash.is_a? CastedHash
-      other_hash.keys.each{|key| uncast! key}
+      other_hash.keys.each do |key|
+        if other_hash.casted?(key)
+          casted!(key)
+        elsif casted?(key)
+          uncast!(key)
+        end
+      end
       super(other_hash)
     else
       other_hash.each_pair { |key, value| self[key] = value }
@@ -121,7 +127,9 @@ class CastedHash < Hash
   end
 
   def casted!(*keys)
-    @casted_keys.concat keys.map(&:to_s)
+    keys.map(&:to_s).each do |key|
+      @casted_keys << key if key?(key)
+    end
   end
 
 protected

data/test/test_casted_hash.rb

@@ -105,9 +105,11 @@ describe CastedHash do
       assert_equal 104, hash2[:d]
       assert hash1.casted?(:a)
       assert hash1.casted?(:b)
+      assert hash2.casted?(:d)
 
-      hash3 = hash1.merge hash2
+      assert !hash2.casted?(:a)
 
+      hash3 = hash1.merge hash2
       assert_equal 10, hash3[:z]
       assert !hash1.casted?(:z)
 
@@ -115,12 +117,27 @@ describe CastedHash do
       assert !hash3.casted?(:a)
       assert hash3.casted?(:b)
       assert !hash3.casted?(:c)
-      assert !hash3.casted?(:d)
+      assert hash3.casted?(:d) # already casted
 
       assert_equal 12, hash3[:a]
       assert_equal 12, hash3[:b]
       assert_equal 13, hash3[:c]
-      assert_equal 114, hash3[:d] # casted twice
+      assert_equal 104, hash3[:d] # already casted
+    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})
+
+      assert_equal 2, hash1[:a]
+      assert_equal 3, hash1[:b]
+      assert_equal 4, hash1[:c]
+
+      hash3 = hash1.merge(hash2)
+
+      assert !hash3.casted?(:a) # value is different
+      assert !hash3.casted?(:b)
+      assert  hash3.casted?(:c)
     end
 
     it "does not cast all values when merging hashes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casted_hash
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Stephan Kaag