Browse files

Removed warnings about method redefining

  • Loading branch information...
1 parent fc71d59 commit 010eda2eb516d237a7b5cf022b7dd2213ff77bc3 @lukaszx0 lukaszx0 committed with tenderlove Jul 17, 2010
Showing with 24 additions and 9 deletions.
  1. +24 −9 activerecord/lib/active_record/associations.rb
View
33 activerecord/lib/active_record/associations.rb
@@ -1354,6 +1354,7 @@ def join_table_name(first_table_name, second_table_name)
end
def association_accessor_methods(reflection, association_proxy_class)
+ remove_possible_method(reflection.name)
define_method(reflection.name) do |*params|
force_reload = params.first unless params.empty?
association = association_instance_get(reflection.name)
@@ -1371,12 +1372,16 @@ def association_accessor_methods(reflection, association_proxy_class)
association.target.nil? ? nil : association
end
- define_method("loaded_#{reflection.name}?") do
+ method = "loaded_#{reflection.name}?"
+ remove_possible_method(method)
+ define_method(method) do
association = association_instance_get(reflection.name)
association && association.loaded?
end
- define_method("#{reflection.name}=") do |new_value|
+ method = "#{reflection.name}="
+ remove_possible_method(method)
+ define_method(method) do |new_value|
association = association_instance_get(reflection.name)
if association.nil? || association.target != new_value
@@ -1386,8 +1391,10 @@ def association_accessor_methods(reflection, association_proxy_class)
association.replace(new_value)
association_instance_set(reflection.name, new_value.nil? ? nil : association)
end
-
- define_method("set_#{reflection.name}_target") do |target|
+
+ method = "set_#{reflection.name}_target"
+ remove_possible_method(method)
+ define_method(method) do |target|
return if target.nil? and association_proxy_class == BelongsToAssociation
association = association_proxy_class.new(self, reflection)
association.target = target
@@ -1396,6 +1403,7 @@ def association_accessor_methods(reflection, association_proxy_class)
end
def collection_reader_method(reflection, association_proxy_class)
+ remove_possible_method(reflection.name)
define_method(reflection.name) do |*params|
force_reload = params.first unless params.empty?
association = association_instance_get(reflection.name)
@@ -1409,8 +1417,10 @@ def collection_reader_method(reflection, association_proxy_class)
association
end
-
- define_method("#{reflection.name.to_s.singularize}_ids") do
+
+ method = "#{reflection.name.to_s.singularize}_ids"
+ remove_possible_method(method)
+ define_method(method) do
if send(reflection.name).loaded? || reflection.options[:finder_sql]
send(reflection.name).map(&:id)
else
@@ -1436,16 +1446,20 @@ def collection_accessor_methods(reflection, association_proxy_class, writer = tr
association.replace(new_value)
association
end
-
- define_method("#{reflection.name.to_s.singularize}_ids=") do |new_value|
+
+ method = "#{reflection.name.to_s.singularize}_ids="
+ remove_possible_method(method)
+ define_method(method) do |new_value|
ids = (new_value || []).reject { |nid| nid.blank? }.map(&:to_i)
send("#{reflection.name}=", reflection.klass.find(ids).index_by(&:id).values_at(*ids))
end
end
end
def association_constructor_method(constructor, reflection, association_proxy_class)
- define_method("#{constructor}_#{reflection.name}") do |*params|
+ method = "#{constructor}_#{reflection.name}"
+ remove_possible_method(method)
+ define_method(method) do |*params|
attributees = params.first unless params.empty?
replace_existing = params[1].nil? ? true : params[1]
association = association_instance_get(reflection.name)
@@ -1487,6 +1501,7 @@ def add_counter_cache_callbacks(reflection)
def add_touch_callbacks(reflection, touch_attribute)
method_name = "belongs_to_touch_after_save_or_destroy_for_#{reflection.name}".to_sym
+ remove_possible_method(method_name)
define_method(method_name) do
association = send(reflection.name)

0 comments on commit 010eda2

Please sign in to comment.