Skip to content

Commit c69bc84

Browse files
committed
remove confusing deep_merge
1 parent 17f1b9d commit c69bc84

File tree

5 files changed

+3
-15
lines changed

5 files changed

+3
-15
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* removed deep_merge and deeper_merge, if you used them replace with `!` variant with `preserve_unmergeables: true`
2+
13
2022-01-07 Jason Frey <[email protected]>
24
* Ship version 1.2.2
35

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ In a Gemfile:
174174

175175
The deep_merge methods will then be defined as
176176

177-
Hash#deeper_merge
178177
Hash#deeper_merge!
179178
Hash#ko_deeper_merge!
180179

lib/deep_merge/deep_merge_hash.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ def deep_merge!(source, options = {})
1313
default_opts = {:preserve_unmergeables => false}
1414
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
1515
end
16-
17-
# deep_merge will merge and skip any unmergeables in destination hash
18-
def deep_merge(source, options = {})
19-
default_opts = {:preserve_unmergeables => true}
20-
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
21-
end
22-
2316
end # DeepMergeHashExt
2417
end
2518

lib/deep_merge/rails_compat.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ def deeper_merge!(source, options = {})
1313
default_opts = {:preserve_unmergeables => false}
1414
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
1515
end
16-
17-
# deeper_merge will merge and skip any unmergeables in destination hash
18-
def deeper_merge(source, options = {})
19-
default_opts = {:preserve_unmergeables => true}
20-
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
21-
end
2216
end
2317
end
2418

test/test_deep_merge.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_hash_deep_merge
3535

3636
hash_src = {'id' => 'xxx'}
3737
hash_dest = {'id' => [1,2,3]}
38-
assert hash_dest.deep_merge(hash_src)
38+
assert hash_dest.deep_merge!(hash_src, preserve_unmergeables: true)
3939
assert_equal({'id' => [1,2,3]}, hash_dest)
4040
end
4141

0 commit comments

Comments
 (0)