TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #37870 from Shopify/revert-binding-access-in-convert-value

Browse Source 
Avoid allocating Binding instance in HWIA#convert_value
This commit is contained in:
Rafael França 2019-12-03 14:22:40 -03:00 committed by GitHub
commit cf27cfa18b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activesupport/lib/active_support/hash_with_indifferent_access.rb
View File

@ -91,7 +91,7 @@ def self.[](*args)
#
# This value can be later fetched using either +:key+ or <tt>'key'</tt>.
def []=(key, value)
regular_writer(convert_key(key), convert_value(value, for: :assignment))
regular_writer(convert_key(key), convert_value(value, conversion: :assignment))
end
alias_method :store, :[]=
@ -357,7 +357,7 @@ def to_hash
set_defaults(_new_hash)
each do |key, value|
_new_hash[key] = convert_value(value, for: :to_hash)
_new_hash[key] = convert_value(value, conversion: :to_hash)
end
_new_hash
end
@ -367,9 +367,7 @@ def convert_key(key) # :doc:
key.kind_of?(Symbol) ? key.to_s : key
end
def convert_value(value, for: nil) # :doc:
conversion = binding.local_variable_get(:for)
def convert_value(value, conversion: nil) # :doc:
if value.is_a? Hash
if conversion == :to_hash
value.to_hash
@ -380,7 +378,7 @@ def convert_value(value, for: nil) # :doc:
if conversion != :assignment || value.frozen?
value = value.dup
end
value.map! { |e| convert_value(e, for: conversion) }
value.map! { |e| convert_value(e, conversion: conversion) }
else
value
end