diff options
| -rw-r--r-- | lib/hashie/extensions/indifferent_access.rb | 4 | ||||
| -rw-r--r-- | spec/hashie/extensions/indifferent_access_spec.rb | 39 |
2 files changed, 41 insertions, 2 deletions
diff --git a/lib/hashie/extensions/indifferent_access.rb b/lib/hashie/extensions/indifferent_access.rb index e3d2d63..f8176f5 100644 --- a/lib/hashie/extensions/indifferent_access.rb +++ b/lib/hashie/extensions/indifferent_access.rb @@ -74,7 +74,7 @@ module Hashie # is injecting itself into member hashes. def convert! keys.each do |k| # rubocop:disable Performance/HashEachMethods - regular_writer convert_key(k), indifferent_value(regular_delete(k)) + indifferent_writer k, regular_delete(k) end self end @@ -133,7 +133,7 @@ module Hashie def merge(*args) result = super - IndifferentAccess.inject!(result) if hash_lacking_indifference?(result) + return IndifferentAccess.inject!(result) if hash_lacking_indifference?(result) result.convert! end diff --git a/spec/hashie/extensions/indifferent_access_spec.rb b/spec/hashie/extensions/indifferent_access_spec.rb index fc03bc2..612f276 100644 --- a/spec/hashie/extensions/indifferent_access_spec.rb +++ b/spec/hashie/extensions/indifferent_access_spec.rb @@ -86,6 +86,45 @@ describe Hashie::Extensions::IndifferentAccess do end end + describe 'when overriding indifferent methods' do + let(:indifferent_hash) do + Class.new(::Hash) do + include Hashie::Extensions::IndifferentAccess + + ALIASES = { cat: :grumpy }.freeze + + # Override writer to maintain alias of the given key + def indifferent_writer(key, value) + indifferent_value = indifferent_value(value) + + regular_writer convert_key(key), indifferent_value + regular_writer convert_key(ALIASES[key]), indifferent_value + end + alias_method :[]=, :indifferent_writer + end.new + end + + it '#indifferent_writer' do + indifferent_hash[:cat] = 'meow' + + expect(indifferent_hash[:cat]).to eq('meow') + expect(indifferent_hash['cat']).to eq('meow') + + expect(indifferent_hash[:grumpy]).to eq('meow') + expect(indifferent_hash['grumpy']).to eq('meow') + end + + it '#merge' do + merged_hash = indifferent_hash.merge(cat: 'meow') + + expect(merged_hash[:cat]).to eq('meow') + expect(merged_hash['cat']).to eq('meow') + + expect(merged_hash[:grumpy]).to eq('meow') + expect(merged_hash['grumpy']).to eq('meow') + end + end + describe 'when translating properties and ignoring undeclared' do let(:value) { 'baz' } |