1 files changed, 48 insertions, 44 deletions

diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index 6b6a088806..34de1a1f32 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -13,52 +13,44 @@
 module ActiveRecord::Associations::Builder
   class Association #:nodoc:
     class << self
-      attr_accessor :valid_options
       attr_accessor :extensions
     end
+    self.extensions = []
 
-    self.valid_options = [:class_name, :foreign_key, :validate]
-    self.extensions    = []
+    VALID_OPTIONS = [:class_name, :foreign_key, :validate]
 
-    attr_reader :model, :name, :scope, :options
+    attr_reader :name, :scope, :options
 
-    def self.build(*args, &block)
-      new(*args, &block).build
-    end
-
-    def initialize(model, name, scope, options)
+    def self.build(model, name, scope, options, &block)
       raise ArgumentError, "association names must be a Symbol" unless name.kind_of?(Symbol)
 
-      @model   = model
-      @name    = name
-
       if scope.is_a?(Hash)
-        @scope   = nil
-        @options = scope
-      else
-        @scope   = scope
-        @options = options
+        options = scope
+        scope   = nil
       end
 
-      if @scope && @scope.arity == 0
-        prev_scope = @scope
-        @scope = proc { instance_exec(&prev_scope) }
-      end
+      builder = new(name, scope, options, &block)
+      reflection = builder.build(model)
+      builder.define_accessors model
+      builder.define_callbacks model, reflection
+      builder.define_extensions model
+      reflection
     end
 
-    def mixin
-      @model.generated_feature_methods
-    end
+    def initialize(name, scope, options)
+      @name    = name
+      @scope   = scope
+      @options = options
 
-    def build
       validate_options
-      define_accessors
-      configure_dependency if options[:dependent]
-      reflection = ActiveRecord::Reflection.create(macro, name, scope, options, model)
-      Association.extensions.each do |extension|
-        extension.build @model, reflection
+
+      if scope && scope.arity == 0
+        @scope = proc { instance_exec(&scope) }
       end
-      reflection
+    end
+
+    def build(model)
+      ActiveRecord::Reflection.create(macro, name, scope, options, model)
     end
 
     def macro
@@ -66,13 +58,23 @@ module ActiveRecord::Associations::Builder
     end
 
     def valid_options
-      Association.valid_options + Association.extensions.flat_map(&:valid_options)
+      VALID_OPTIONS + Association.extensions.flat_map(&:valid_options)
     end
 
     def validate_options
       options.assert_valid_keys(valid_options)
     end
 
+    def define_extensions(model)
+    end
+
+    def define_callbacks(model, reflection)
+      add_before_destroy_callbacks(model, name) if options[:dependent]
+      Association.extensions.each do |extension|
+        extension.build model, reflection
+      end
+    end
+
     # Defines the setter and getter methods for the association
     # class Post < ActiveRecord::Base
     #   has_many :comments
@@ -80,12 +82,13 @@ module ActiveRecord::Associations::Builder
     #
     # Post.first.comments and Post.first.comments= methods are defined by this method...
 
-    def define_accessors
-      define_readers
-      define_writers
+    def define_accessors(model)
+      mixin = model.generated_feature_methods
+      define_readers(mixin)
+      define_writers(mixin)
     end
 
-    def define_readers
+    def define_readers(mixin)
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}(*args)
           association(:#{name}).reader(*args)
@@ -93,7 +96,7 @@ module ActiveRecord::Associations::Builder
       CODE
     end
 
-    def define_writers
+    def define_writers(mixin)
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}=(value)
           association(:#{name}).writer(value)
@@ -101,17 +104,18 @@ module ActiveRecord::Associations::Builder
       CODE
     end
 
-    def configure_dependency
+    def valid_dependent_options
+      raise NotImplementedError
+    end
+
+    private
+
+    def add_before_destroy_callbacks(model, name)
       unless valid_dependent_options.include? options[:dependent]
         raise ArgumentError, "The :dependent option must be one of #{valid_dependent_options}, but is :#{options[:dependent]}"
       end
 
-      n = name
-      model.before_destroy lambda { |o| o.association(n).handle_dependency }
-    end
-
-    def valid_dependent_options
-      raise NotImplementedError
+      model.before_destroy lambda { |o| o.association(name).handle_dependency }
     end
   end
 end