mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Avoid define_method if possible.
This commit is contained in:
parent
d24d938af4
commit
30472d4244
3 changed files with 41 additions and 14 deletions
|
@ -56,6 +56,8 @@ module ActiveModel
|
||||||
module AttributeMethods
|
module AttributeMethods
|
||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
|
COMPILABLE_REGEXP = /^[a-zA-Z_]\w*[!?=]?$/
|
||||||
|
|
||||||
included do
|
included do
|
||||||
class_attribute :attribute_method_matchers, :instance_writer => false
|
class_attribute :attribute_method_matchers, :instance_writer => false
|
||||||
self.attribute_method_matchers = []
|
self.attribute_method_matchers = []
|
||||||
|
@ -106,13 +108,16 @@ module ActiveModel
|
||||||
if block_given?
|
if block_given?
|
||||||
sing.send :define_method, name, &block
|
sing.send :define_method, name, &block
|
||||||
else
|
else
|
||||||
if name =~ /^[a-zA-Z_]\w*[!?=]?$/
|
# If we can compile the method name, do it. Otherwise use define_method.
|
||||||
sing.class_eval <<-eorb, __FILE__, __LINE__ + 1
|
# This is an important *optimization*, please don't change it. define_method
|
||||||
|
# has slower dispatch and consumes more memory.
|
||||||
|
if name =~ COMPILABLE_REGEXP
|
||||||
|
sing.class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
||||||
def #{name}; #{value.nil? ? 'nil' : value.to_s.inspect}; end
|
def #{name}; #{value.nil? ? 'nil' : value.to_s.inspect}; end
|
||||||
eorb
|
RUBY
|
||||||
else
|
else
|
||||||
value = value.to_s if value
|
value = value.to_s if value
|
||||||
sing.send(:define_method, name) { value }
|
sing.send(:define_method, name) { value && value.dup }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -232,8 +237,19 @@ module ActiveModel
|
||||||
|
|
||||||
def alias_attribute(new_name, old_name)
|
def alias_attribute(new_name, old_name)
|
||||||
attribute_method_matchers.each do |matcher|
|
attribute_method_matchers.each do |matcher|
|
||||||
define_method(matcher.method_name(new_name)) do |*args|
|
matcher_new = matcher.method_name(new_name).to_s
|
||||||
send(matcher.method_name(old_name), *args)
|
matcher_old = matcher.method_name(old_name).to_s
|
||||||
|
|
||||||
|
if matcher_new =~ COMPILABLE_REGEXP && matcher_old =~ COMPILABLE_REGEXP
|
||||||
|
module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
||||||
|
def #{matcher_new}(*args)
|
||||||
|
send(:#{matcher_old}, *args)
|
||||||
|
end
|
||||||
|
RUBY
|
||||||
|
else
|
||||||
|
define_method(matcher_new) do |*args|
|
||||||
|
send(matcher_old, *args)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -276,14 +292,25 @@ module ActiveModel
|
||||||
else
|
else
|
||||||
method_name = matcher.method_name(attr_name)
|
method_name = matcher.method_name(attr_name)
|
||||||
|
|
||||||
generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
|
generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
||||||
if method_defined?('#{method_name}')
|
if method_defined?('#{method_name}')
|
||||||
undef :'#{method_name}'
|
undef :'#{method_name}'
|
||||||
end
|
end
|
||||||
|
RUBY
|
||||||
|
|
||||||
|
if method_name.to_s =~ COMPILABLE_REGEXP
|
||||||
|
generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
||||||
|
def #{method_name}(*args)
|
||||||
|
send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
|
||||||
|
end
|
||||||
|
RUBY
|
||||||
|
else
|
||||||
|
generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
||||||
define_method('#{method_name}') do |*args|
|
define_method('#{method_name}') do |*args|
|
||||||
send('#{matcher.method_missing_target}', '#{attr_name}', *args)
|
send('#{matcher.method_missing_target}', '#{attr_name}', *args)
|
||||||
end
|
end
|
||||||
STR
|
RUBY
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -79,7 +79,7 @@ module ActiveRecord
|
||||||
#
|
#
|
||||||
# The second, slower, branch is necessary to support instances where the database
|
# The second, slower, branch is necessary to support instances where the database
|
||||||
# returns columns with extra stuff in (like 'my_column(omg)').
|
# returns columns with extra stuff in (like 'my_column(omg)').
|
||||||
if method_name =~ /^[a-zA-Z_]\w*[!?=]?$/
|
if method_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
|
||||||
generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__
|
generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__
|
||||||
def _#{method_name}
|
def _#{method_name}
|
||||||
#{access_code}
|
#{access_code}
|
||||||
|
|
|
@ -10,7 +10,7 @@ module ActiveRecord
|
||||||
module ClassMethods
|
module ClassMethods
|
||||||
protected
|
protected
|
||||||
def define_method_attribute=(attr_name)
|
def define_method_attribute=(attr_name)
|
||||||
if attr_name =~ /^[a-zA-Z_]\w*[!?=]?$/
|
if attr_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
|
||||||
generated_attribute_methods.module_eval("def #{attr_name}=(new_value); write_attribute('#{attr_name}', new_value); end", __FILE__, __LINE__)
|
generated_attribute_methods.module_eval("def #{attr_name}=(new_value); write_attribute('#{attr_name}', new_value); end", __FILE__, __LINE__)
|
||||||
else
|
else
|
||||||
generated_attribute_methods.send(:define_method, "#{attr_name}=") do |new_value|
|
generated_attribute_methods.send(:define_method, "#{attr_name}=") do |new_value|
|
||||||
|
|
Loading…
Reference in a new issue