Skip to content

Prevent set_attrs deep merge from writing nested keys into top-level attrs #484

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
tabuchid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent set_attrs deep merge from writing nested keys into top-level attrs #484

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
1 change: 1 addition & 0 deletions lib/jira/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ def set_attrs(hash, clobber = true, target = nil)
else
hash.each do |k, v|
if v.is_a?(Hash)
target[k] = {} unless target[k].is_a?(Hash)
set_attrs(v, clobber, target[k])
else
target[k] = v
Expand Down
21 changes: 21 additions & 0 deletions spec/jira/base_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,27 @@ class HasManyExample < JIRA::Base # :nodoc:
subject.set_attrs({ 'foo' => { 'fum' => 'dum' } }, false)
expect(subject.foo).to eq('bar' => 'baz', 'fum' => 'dum')
end

it 'creates missing intermediate hashes instead of merging into the top level when clobber is false' do
subject.attrs = { 'id' => '10500', 'key' => 'REL-77', 'fields' => { 'summary' => 'x' } }
subject.set_attrs({ 'fields' => { 'project' => { 'key' => 'REL' } } }, false)
expect(subject.attrs['key']).to eq('REL-77')
expect(subject.attrs['fields']['project']['key']).to eq('REL')
expect(subject.attrs['fields']['summary']).to eq('x')
end

it 'deeply merges into an existing nested hash when clobber is false' do
subject.attrs = { 'fields' => { 'project' => { 'id' => '10000' }, 'summary' => 'x' } }
subject.set_attrs({ 'fields' => { 'project' => { 'key' => 'REL' } } }, false)
expect(subject.attrs['fields']['project']).to eq('id' => '10000', 'key' => 'REL')
expect(subject.attrs['fields']['summary']).to eq('x')
end

it 'replaces a non-hash value with the new hash when clobber is false' do
subject.attrs = { 'fields' => { 'project' => 'REL' } }
subject.set_attrs({ 'fields' => { 'project' => { 'key' => 'REL' } } }, false)
expect(subject.attrs['fields']['project']).to eq('key' => 'REL')
end
end

describe 'delete' do
Expand Down