kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

cleaning up a bunch of method already defined warnings [#4209 state:resolved]

Browse source 
Signed-off-by: wycats <wycats@gmail.com>
This commit is contained in:
Aaron Patterson 2010-03-17 13:30:17 -07:00 committed by wycats
parent db2d96a6ba
commit b652aa8121
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
activemodel/lib/active_model/attribute_methods.rb
View file

@ -90,13 +90,20 @@ module ActiveModel
# # => 'address_id'
def define_attr_method(name, value=nil, &block)
sing = singleton_class
sing.send :alias_method, "original_#{name}", name
sing.class_eval <<-eorb, __FILE__, __LINE__ + 1
if method_defined?(:original_#{name})
undef :original_#{name}
end
alias_method :original_#{name}, :#{name}
eorb
if block_given?
sing.send :define_method, name, &block
else
# use eval instead of a block to work around a memory leak in dev
# mode in fcgi
sing.class_eval "def #{name}; #{value.to_s.inspect}; end"
sing.class_eval <<-eorb, __FILE__, __LINE__ + 1
def #{name}; #{value.to_s.inspect}; end
eorb
end
end
@ -257,8 +264,13 @@ module ActiveModel
if respond_to?(generate_method)
send(generate_method, attr_name)
else
method_name = matcher.method_name(attr_name)
generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__+1
def #{matcher.method_name(attr_name)}(*args)
if method_defined?(:#{method_name})
undef :#{method_name}
end
def #{method_name}(*args)
send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
end
STR

3
activerecord/lib/active_record/nested_attributes.rb
View file

@ -244,6 +244,9 @@ module ActiveRecord
# assign_nested_attributes_for_one_to_one_association(:pirate, attributes)
# end
class_eval <<-eoruby, __FILE__, __LINE__ + 1
if method_defined?(:#{association_name}_attributes=)
remove_method(:#{association_name}_attributes=)
end
def #{association_name}_attributes=(attributes)
assign_nested_attributes_for_#{type}_association(:#{association_name}, attributes)
end