Skip to content

deep merge blocks #286

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

deep merge blocks #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/jbuilder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ def _merge_values(current_value, updates)
elsif ::Array === current_value && ::Array === updates
current_value + updates
elsif ::Hash === current_value && ::Hash === updates
current_value.merge(updates)
current_value.merge(updates) do |key, sub_current_value, sub_updates|
_merge_values(sub_current_value, sub_updates)
end
else
raise MergeError.build(current_value, updates)
end
Expand Down
16 changes: 16 additions & 0 deletions test/jbuilder_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,22 @@ class JbuilderTest < ActiveSupport::TestCase
assert_equal 32, result['author']['age']
end

test 'inner blocks merge arrays' do
result = jbuild do |json|
json.inner { json.foo [1, 2] }
json.inner { json.foo [3, 4] }
end
assert_equal [1, 2, 3, 4], result['inner']['foo']
end

test 'inner blocks merge hashes' do
result = jbuild do |json|
json.inner { json.foo { json.bar 1 } }
json.inner { json.foo { json.baz 2 } }
end
assert_equal({ 'bar' => 1, 'baz' => 2 }, result['inner']['foo'])
end

test 'support merge! method' do
result = jbuild do |json|
json.merge! 'foo' => 'bar'
Expand Down