Use method compilation for association methods

Method compilation provides better performance and I think the code
comes out cleaner as well.

A knock on effect is that methods that get redefined produce warnings. I
think this is a good thing. I had to deal with a bunch of warnings
coming from our tests, though.

5 files changed, 62 insertions, 64 deletions

diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index cae640648b..1df876bf62 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -63,17 +63,19 @@ module ActiveRecord::Associations::Builder
     end
 
     def define_readers
-      name = self.name
-      mixin.redefine_method(name) do |*params|
-        association(name).reader(*params)
-      end
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}(*args)
+          association(:#{name}).reader(*args)
+        end
+      CODE
     end
 
     def define_writers
-      name = self.name
-      mixin.redefine_method("#{name}=") do |value|
-        association(name).writer(value)
-      end
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}=(value)
+          association(:#{name}).writer(value)
+        end
+      CODE
     end
 
     def configure_dependency
@@ -88,10 +90,11 @@ module ActiveRecord::Associations::Builder
         )
       end
 
-      name = self.name
-      mixin.redefine_method("#{macro}_dependent_for_#{name}") do
-        association(name).handle_dependency
-      end
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{macro}_dependent_for_#{name}
+          association(:#{name}).handle_dependency
+        end
+      CODE
 
       model.before_destroy "#{macro}_dependent_for_#{name}"
     end
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb
index acfc3073a9..2f2600b7fb 100644
--- a/activerecord/lib/active_record/associations/builder/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -21,49 +21,42 @@ module ActiveRecord::Associations::Builder
 
     def add_counter_cache_callbacks(reflection)
       cache_column = reflection.counter_cache_column
-      name         = self.name
 
-      method_name = "belongs_to_counter_cache_after_create_for_#{name}"
-      mixin.redefine_method(method_name) do
-        record = send(name)
-        record.class.increment_counter(cache_column, record.id) unless record.nil?
-      end
-      model.after_create(method_name)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def belongs_to_counter_cache_after_create_for_#{name}
+          record = #{name}
+          record.class.increment_counter(:#{cache_column}, record.id) unless record.nil?
+        end
 
-      method_name = "belongs_to_counter_cache_before_destroy_for_#{name}"
-      mixin.redefine_method(method_name) do
-        unless marked_for_destruction?
-          record = send(name)
-          record.class.decrement_counter(cache_column, record.id) unless record.nil?
+        def belongs_to_counter_cache_before_destroy_for_#{name}
+          unless marked_for_destruction?
+            record = #{name}
+            record.class.decrement_counter(:#{cache_column}, record.id) unless record.nil?
+          end
         end
-      end
-      model.before_destroy(method_name)
+      CODE
 
-      model.send(:module_eval,
-        "#{reflection.class_name}.send(:attr_readonly,\"#{cache_column}\".intern) if defined?(#{reflection.class_name}) && #{reflection.class_name}.respond_to?(:attr_readonly)", __FILE__, __LINE__
-      )
+      model.after_create   "belongs_to_counter_cache_after_create_for_#{name}"
+      model.before_destroy "belongs_to_counter_cache_before_destroy_for_#{name}"
+
+      klass = reflection.class_name.safe_constantize
+      klass.attr_readonly cache_column if klass && klass.respond_to?(:attr_readonly)
     end
 
     def add_touch_callbacks(reflection)
-      name        = self.name
-      method_name = "belongs_to_touch_after_save_or_destroy_for_#{name}"
-      touch       = options[:touch]
-
-      mixin.redefine_method(method_name) do
-        record = send(name)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def belongs_to_touch_after_save_or_destroy_for_#{name}
+          record = #{name}
 
-        unless record.nil?
-          if touch == true
-            record.touch
-          else
-            record.touch(touch)
+          unless record.nil?
+            record.touch #{options[:touch].inspect if options[:touch] != true}
           end
         end
-      end
+      CODE
 
-      model.after_save(method_name)
-      model.after_touch(method_name)
-      model.after_destroy(method_name)
+      model.after_save    "belongs_to_touch_after_save_or_destroy_for_#{name}"
+      model.after_touch   "belongs_to_touch_after_save_or_destroy_for_#{name}"
+      model.after_destroy "belongs_to_touch_after_save_or_destroy_for_#{name}"
     end
 
     def valid_dependent_options
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb
index 40c13dae43..1b382f7285 100644
--- a/activerecord/lib/active_record/associations/builder/collection_association.rb
+++ b/activerecord/lib/active_record/associations/builder/collection_association.rb
@@ -65,19 +65,21 @@ module ActiveRecord::Associations::Builder
     def define_readers
       super
 
-      name = self.name
-      mixin.redefine_method("#{name.to_s.singularize}_ids") do
-        association(name).ids_reader
-      end
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name.to_s.singularize}_ids
+          association(:#{name}).ids_reader
+        end
+      CODE
     end
 
     def define_writers
       super
 
-      name = self.name
-      mixin.redefine_method("#{name.to_s.singularize}_ids=") do |ids|
-        association(name).ids_writer(ids)
-      end
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name.to_s.singularize}_ids=(ids)
+          association(:#{name}).ids_writer(ids)
+        end
+      CODE
     end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
index c2b53b9b2c..bdac02b5bf 100644
--- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
@@ -29,7 +29,7 @@ module ActiveRecord::Associations::Builder
       model.send(:include, Module.new {
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def destroy_associations
-            association(#{name.to_sym.inspect}).delete_all
+            association(:#{name}).delete_all
             super
           end
         RUBY
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb
index 0f96929a29..6a5830e57f 100644
--- a/activerecord/lib/active_record/associations/builder/singular_association.rb
+++ b/activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -14,19 +14,19 @@ module ActiveRecord::Associations::Builder
     end
 
     def define_constructors
-      name = self.name
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def build_#{name}(*args, &block)
+          association(:#{name}).build(*args, &block)
+        end
 
-      mixin.redefine_method("build_#{name}") do |*params, &block|
-        association(name).build(*params, &block)
-      end
+        def create_#{name}(*args, &block)
+          association(:#{name}).create(*args, &block)
+        end
 
-      mixin.redefine_method("create_#{name}") do |*params, &block|
-        association(name).create(*params, &block)
-      end
-
-      mixin.redefine_method("create_#{name}!") do |*params, &block|
-        association(name).create!(*params, &block)
-      end
+        def create_#{name}!(*args, &block)
+          association(:#{name}).create!(*args, &block)
+        end
+      CODE
     end
   end
 end