remove confusing deep_merge

danielsdeleo · May 9, 2024 · 1e0d09a · 1e0d09a
1 parent 17f1b9d
commit 1e0d09a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/README.md b/README.md
@@ -174,7 +174,6 @@ In a Gemfile:
 
 The deep_merge methods will then be defined as
 
-    Hash#deeper_merge
     Hash#deeper_merge!
     Hash#ko_deeper_merge!
 

diff --git a/lib/deep_merge/deep_merge_hash.rb b/lib/deep_merge/deep_merge_hash.rb
@@ -13,13 +13,6 @@ def deep_merge!(source, options = {})
       default_opts = {:preserve_unmergeables => false}
       DeepMerge::deep_merge!(source, self, default_opts.merge(options))
     end
-
-    # deep_merge will merge and skip any unmergeables in destination hash
-    def deep_merge(source, options = {})
-      default_opts = {:preserve_unmergeables => true}
-      DeepMerge::deep_merge!(source, self, default_opts.merge(options))
-    end
-
   end # DeepMergeHashExt
 end
 

diff --git a/lib/deep_merge/rails_compat.rb b/lib/deep_merge/rails_compat.rb
@@ -13,12 +13,6 @@ def deeper_merge!(source, options = {})
       default_opts = {:preserve_unmergeables => false}
       DeepMerge::deep_merge!(source, self, default_opts.merge(options))
     end
-
-    # deeper_merge will merge and skip any unmergeables in destination hash
-    def deeper_merge(source, options = {})
-      default_opts = {:preserve_unmergeables => true}
-      DeepMerge::deep_merge!(source, self, default_opts.merge(options))
-    end
   end
 end
 

diff --git a/test/test_deep_merge.rb b/test/test_deep_merge.rb
@@ -35,7 +35,7 @@ def test_hash_deep_merge
 
     hash_src  = {'id' => 'xxx'}
     hash_dest = {'id' => [1,2,3]}
-    assert hash_dest.deep_merge(hash_src)
+    assert hash_dest.deep_merge!(hash_src, preserve_unmergeables: true)
     assert_equal({'id' => [1,2,3]}, hash_dest)
   end