casted_hash 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f5d3ca34ab88a7b6456373f515b26493d47d77
-  data.tar.gz: ffe8dbdbcff47b7113471a73dfd9148d2db6aaa9
+  metadata.gz: b1524c82c2864754bdf75fd4845f8d2a1b4b829f
+  data.tar.gz: 343ee8b30f139c23502e7476019058185aac4629
 SHA512:
-  metadata.gz: 6541f82e40508c13111f9456f811efc3a7d6fea2d5ba53a90e0993f852f82f9d99bcb90aebd93d2eddbb4e77f396d5e5ca45389ca22db9ad0326988df9ca8426
-  data.tar.gz: f9be5b96e77e4a465609a27016888fa14c7a520c48d858895d96833bc0fa7f56bf5a5f8f0e113dac6533f194fe502bf077f09d1f9f6ecf478fec7d570a0f0ed2
+  metadata.gz: d5ba40da58b48bb4ce2b0b520720f914945686e1a8c91a9557f88d619fdd7a027509d36f6489e8c0790407ced3c1ad22fa0bedf471379c2aa061ec0411cb3ae3
+  data.tar.gz: aba92b626a9386e2451205b0ec99311b434f8ab33041ae6127aab6bd1d76e569b91f4fffe91ca98df043b17b19e5951eec1d67c38fbd24fb714a002a459df63a

data/lib/casted_hash/version.rb

@@ -1,3 +1,3 @@
 class CastedHash
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/casted_hash.rb

@@ -82,6 +82,7 @@ class CastedHash
 
     self
   end
+  alias_method :merge!, :update
 
   def merge(other)
     self.dup.update other

data/test/test_casted_hash.rb

@@ -86,64 +86,126 @@ class TestCastedHash < Minitest::Test
       assert_equal({"a" => 11}, hash.casted_hash)
     end
 
-    it "should merge values" do
-      hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
-      assert_equal 11, hash[:a]
-      assert_equal 12, hash[:b]
+    describe "merge" do
+      it "should merge values" do
+        hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+        assert_equal 11, hash[:a]
+        assert_equal 12, hash[:b]
 
-      hash = hash.merge({:a => 3})
+        hash = hash.merge({:a => 3})
 
-      assert_equal 13, hash[:a]
-      assert_equal 12, hash[:b]
+        assert_equal 13, hash[:a]
+        assert_equal 12, hash[:b]
 
-      assert_equal hash, hash.merge({})
-    end
+        assert_equal hash, hash.merge({})
+      end
+
+      it "should take over scope when merging two casted hashes" do
+        hash1 = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+        hash2 = CastedHash.new({:c => 3, :d => 4}, lambda {|x| x + 100 })
+
+        assert_equal 11, hash1[:a]
+        assert_equal 12, hash1[:b]
+        assert hash1.casted?(:a)
+        assert hash1.casted?(:b)
+
+        cast_proc1_object_id = hash1.cast_proc.object_id
+        assert_equal [hash1.object_id], hash1.send(:raw).values.map{|v|v.casted_hash.object_id}.uniq
+
+        hash3 = hash1.merge hash2
 
-    it "should take over scope when merging two casted hashes" do
-      hash1 = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
-      hash2 = CastedHash.new({:c => 3, :d => 4}, lambda {|x| x + 100 })
+        assert_equal [hash3.object_id], hash3.send(:raw).values.map{|v|v.casted_hash.object_id}.uniq
+        assert_equal hash3.cast_proc.object_id, cast_proc1_object_id
 
-      assert_equal 11, hash1[:a]
-      assert_equal 12, hash1[:b]
-      assert hash1.casted?(:a)
-      assert hash1.casted?(:b)
+        assert_equal ["a", "b", "c", "d"], hash3.keys
+        assert hash3.casted?(:a)
+        assert hash3.casted?(:b)
+        assert !hash3.casted?(:c)
+        assert !hash3.casted?(:d)
 
-      cast_proc1_object_id = hash1.cast_proc.object_id
-      assert_equal [hash1.object_id], hash1.send(:raw).values.map{|v|v.casted_hash.object_id}.uniq
+        assert_equal 11, hash3[:a]
+        assert_equal 12, hash3[:b]
+        assert_equal 13, hash3[:c]
+        assert_equal 14, hash3[:d]
+      end
 
-      hash3 = hash1.merge hash2
+      it "should not cast all values when merging hashes" do
+        hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+        hash = hash.merge :c => 3
 
-      assert_equal [hash3.object_id], hash3.send(:raw).values.map{|v|v.casted_hash.object_id}.uniq
-      assert_equal hash3.cast_proc.object_id, cast_proc1_object_id
+        assert !hash.casted?(:a)
+        assert !hash.casted?(:b)
+        assert !hash.casted?(:c)
 
-      assert_equal ["a", "b", "c", "d"], hash3.keys
-      assert hash3.casted?(:a)
-      assert hash3.casted?(:b)
-      assert !hash3.casted?(:c)
-      assert !hash3.casted?(:d)
+        other_hash = CastedHash.new({:c => 1, :d => 2}, lambda {|x| x + 10 })
+        hash = hash.merge other_hash
 
-      assert_equal 11, hash3[:a]
-      assert_equal 12, hash3[:b]
-      assert_equal 13, hash3[:c]
-      assert_equal 14, hash3[:d]
+        assert !hash.casted?(:a)
+        assert !hash.casted?(:b)
+        assert !hash.casted?(:c)
+        assert !other_hash.casted?(:c)
+        assert !other_hash.casted?(:d)
+      end
     end
 
-    it "should not cast all values when merging hashes" do
-      hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
-      hash = hash.merge :c => 3
+    describe "merge!" do
+      it "should merge! values" do
+        hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+        assert_equal 11, hash[:a]
+        assert_equal 12, hash[:b]
 
-      assert !hash.casted?(:a)
-      assert !hash.casted?(:b)
-      assert !hash.casted?(:c)
+        hash.merge!({:a => 3})
 
-      other_hash = CastedHash.new({:c => 1, :d => 2}, lambda {|x| x + 10 })
-      hash = hash.merge other_hash
+        assert_equal 13, hash[:a]
+        assert_equal 12, hash[:b]
+      end
 
-      assert !hash.casted?(:a)
-      assert !hash.casted?(:b)
-      assert !hash.casted?(:c)
-      assert !other_hash.casted?(:c)
-      assert !other_hash.casted?(:d)
+      it "should take over scope when merging two casted hashes" do
+        hash1 = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+        hash2 = CastedHash.new({:c => 3, :d => 4}, lambda {|x| x + 100 })
+
+        assert_equal 11, hash1[:a]
+        assert_equal 12, hash1[:b]
+        assert hash1.casted?(:a)
+        assert hash1.casted?(:b)
+
+        cast_proc1_object_id = hash1.cast_proc.object_id
+        assert_equal [hash1.object_id], hash1.send(:raw).values.map{|v|v.casted_hash.object_id}.uniq
+
+        hash1.merge! hash2
+
+        assert_equal [hash1.object_id], hash1.send(:raw).values.map{|v|v.casted_hash.object_id}.uniq
+        assert_equal hash1.cast_proc.object_id, cast_proc1_object_id
+
+        assert_equal ["a", "b", "c", "d"], hash1.keys
+        assert hash1.casted?(:a)
+        assert hash1.casted?(:b)
+        assert !hash1.casted?(:c)
+        assert !hash1.casted?(:d)
+
+        assert_equal 11, hash1[:a]
+        assert_equal 12, hash1[:b]
+        assert_equal 13, hash1[:c]
+        assert_equal 14, hash1[:d]
+      end
+
+      it "should not cast all values when merging hashes" do
+        hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+        hash.merge! :c => 3
+
+        assert !hash.casted?(:a)
+        assert !hash.casted?(:b)
+        assert !hash.casted?(:c)
+
+        other_hash = CastedHash.new({:c => 1, :d => 2}, lambda {|x| x + 10 })
+        hash.merge! other_hash
+
+        assert !hash.casted?(:a)
+        assert !hash.casted?(:b)
+        assert !hash.casted?(:c)
+        assert !other_hash.casted?(:c)
+        assert !other_hash.casted?(:d)
+      end
     end
 
     it "should define a hash method" do

metadata

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