Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deep duplicate in deep_merge so no references remain to the original hash in the result #41931

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
* Fix issue in `Hash#deep_merge` where it did not properly duplicate a nested `Hash`

*Marcel Eeken*

* Add `expires_at` argument to `ActiveSupport::Cache` `write` and `fetch` to set a cache entry TTL as an absolute time.

```ruby
Expand Down
Expand Up @@ -16,7 +16,7 @@ class Hash
# h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
# # => { a: 100, b: 450, c: { c1: 300 } }
def deep_merge(other_hash, &block)
dup.deep_merge!(other_hash, &block)
deep_dup.deep_merge!(other_hash, &block)
end

# Same as +deep_merge+, but modifies +self+.
Expand Down
10 changes: 10 additions & 0 deletions activesupport/test/core_ext/hash_ext_test.rb
Expand Up @@ -300,6 +300,16 @@ def test_deep_merge_with_falsey_values
assert_equal expected, hash_1
end

def test_deep_merge_with_nested_hash_returning_full_new_hash
hash_1 = { a: { b: "foo" } }
hash_2 = { d: "bar" }

new_hash = hash_1.deep_merge(hash_2)
new_hash[:a][:b] = "baz"

assert_equal("foo", hash_1[:a][:b])
end

def test_reverse_merge
defaults = { d: 0, a: "x", b: "y", c: 10 }.freeze
options = { a: 1, b: 2 }
Expand Down