summaryrefslogtreecommitdiff
path: root/lib/hashie/extensions/indifferent_access.rb
diff options
context:
space:
mode:
authorDaniel Doubrovkine (dB.) @dblockdotorg <dblock@dblock.org>2020-06-10 09:40:10 -0400
committerdblock <dblock@dblock.org>2020-06-11 07:36:57 -0400
commit1f1efdb14cf586880e7fd1b6ed1d608256889c30 (patch)
treeff7b6e80f8ab7e708d22883bb288c34532c5d618 /lib/hashie/extensions/indifferent_access.rb
parent694f2e7e3899330b3a699ae8188c6f34ff75ba20 (diff)
parentb206fb8a79b626d8c4f6edf15caf0eda37e6845c (diff)
downloadhashie-1f1efdb14cf586880e7fd1b6ed1d608256889c30.tar.gz
Merge pull request #525 from yogeshjain999/indifferent-convert-change
Small amendments for Hash#merge with IndifferentAccess
Diffstat (limited to 'lib/hashie/extensions/indifferent_access.rb')
-rw-r--r--lib/hashie/extensions/indifferent_access.rb4
1 files changed, 2 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