thefox-ext 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9d3e3cc6b4f95af03f5bb904259185b8b1a7a9
-  data.tar.gz: 1fa4937f167095f4990acdd2cd3283f873d873ee
+  metadata.gz: 05c9ab324e8e059c18d462f92ec460b1a199963f
+  data.tar.gz: 35c5a477858d7c6acd9f293605106b1ea420ffc9
 SHA512:
-  metadata.gz: d2eb87e909fe0a35dcaf14210f8438882c9021cbf2f1784687a0b4019082a0df6bcdd3b10be785b22dcca8c8851de12c0e9d0f583115efbec18ddd79f3c06c0e
-  data.tar.gz: 647ba64e5aba70994768e5ca3842a98954c5e2ae518218b34f034934461b8d7a406dca91a67955c7ae41dd9bce7025f388ce7d6e1c5dbefea4ab81bb38169714
+  metadata.gz: c99fe019c4277c64c723e706503ece8ade2cb25b8420ef16137d9656b374a284f9fce0ad02599e9d4aa7f34c877f62c5f23d87261fd1d5ed9c320dad41be8471
+  data.tar.gz: 16fadd3276e3cb8164ee74346f381ff82e1245f383a80238ee3c95f60a50039a99afe3c2ff98f0f6564aeb26b3b7168eebcb4f5981864fe162956099e630573e

data/lib/thefox-ext/ext/hash.rb

@@ -15,11 +15,14 @@ class Hash
 			if v.is_a?(Hash)
 				has_subhashes = true
 				
-				if h2.has_key?(k) && h2[k].is_a?(Hash)
-					# Inception! Go one level deeper.
-					h1[k] = v.merge_recursive(h2[k], level + 1)
-				else
-					h1[k] = h2[k]
+				# If Hash 2 also has the same key.
+				if h2.has_key?(k)
+					if h2[k].is_a?(Hash)
+						# Inception! Go one level deeper.
+						h1[k] = v.merge_recursive(h2[k], level + 1)
+					else
+						h1[k] = h2[k]
+					end
 				end
 			else
 				# Value of Hash 1 is no Subhash.

data/lib/thefox-ext/version.rb

@@ -1,7 +1,8 @@
 
 module TheFox
 	module Ext
-		VERSION = '1.4.0'
+		RELEASE_ID = 10
+		VERSION = '1.4.1'
 		DATE = '2016-02-13'
 	end
 end

data/tests/tc_hash.rb

@@ -26,13 +26,20 @@ class TestHash < MiniTest::Test
 		assert_equal({'k1' => 2, 'k2' => 2}, h1.merge_recursive(h2))
 	end
 	
-	def test_merge_recursive_clone4
+	def test_merge_recursive_clone4a
 		h1 = {'k1' => 1, 'k2' => 1}
 		h2 = {'k1' => 2, 'k2' => {'sk2' => 2}}
 		
 		assert_equal({'k1' => 2, 'k2' => {'sk2' => 2}}, h1.merge_recursive(h2))
 	end
 	
+	def test_merge_recursive_clone4b
+		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
+		h2 = {'k1' => 2, 'k2' => 1}
+		
+		assert_equal({'k1' => 2, 'k2' => 1}, h1.merge_recursive(h2))
+	end
+	
 	def test_merge_recursive_clone5
 		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
 		h2 = {'k1' => 2, 'k2' => {'sk2' => 2}}
@@ -47,6 +54,13 @@ class TestHash < MiniTest::Test
 		assert_equal({'k1' => 2, 'k2' => 1, 'k3' => 2, 'k4' => {'sk1' => 1, 'sk2' => 2}}, h1.merge_recursive(h2))
 	end
 	
+	def test_merge_recursive_clone7
+		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
+		h2 = {'k1' => 2}
+		
+		assert_equal({'k1' => 2, 'k2' => {'sk1' => 1}}, h1.merge_recursive(h2))
+	end
+	
 	def test_merge_recursive_self1
 		h1 = {'k1' => 1, 'k2' => 1}
 		h2 = {'k1' => 2, 'k2' => 2}
@@ -74,7 +88,7 @@ class TestHash < MiniTest::Test
 		assert_equal({'k1' => 2, 'k2' => 2}, h1)
 	end
 	
-	def test_merge_recursive_self4
+	def test_merge_recursive_self4a
 		h1 = {'k1' => 1, 'k2' => 1}
 		h2 = {'k1' => 2, 'k2' => {'sk2' => 2}}
 		
@@ -83,6 +97,15 @@ class TestHash < MiniTest::Test
 		assert_equal({'k1' => 2, 'k2' => {'sk2' => 2}}, h1)
 	end
 	
+	def test_merge_recursive_self4b
+		h1 = {'k1' => 1, 'k2' => {'sk2' => 1}}
+		h2 = {'k1' => 2, 'k2' => 1}
+		
+		h1.merge_recursive!(h2)
+		
+		assert_equal({'k1' => 2, 'k2' => 1}, h1)
+	end
+	
 	def test_merge_recursive_self5
 		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
 		h2 = {'k1' => 2, 'k2' => {'sk2' => 2}}
@@ -100,4 +123,13 @@ class TestHash < MiniTest::Test
 		
 		assert_equal({'k1' => 2, 'k2' => 1, 'k3' => 2, 'k4' => {'sk1' => 1, 'sk2' => 2}}, h1)
 	end
+	
+	def test_merge_recursive_self7
+		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
+		h2 = {'k1' => 2}
+		
+		h1.merge_recursive!(h2)
+		
+		assert_equal({'k1' => 2, 'k2' => {'sk1' => 1}}, h1)
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thefox-ext
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Christian Mayer