1 files changed, 28 insertions, 28 deletions

diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index f86d975592..3973570da4 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -15,23 +15,26 @@ module ActiveRecord::Associations::Builder
   class Association #:nodoc:
     class << self
       attr_accessor :extensions
+      # TODO: This class accessor is needed to make activerecord-deprecated_finders work.
+      # We can move it to a constant in 5.0.
+      attr_accessor :valid_options
     end
     self.extensions = []
 
-    # TODO: This class accessor is needed to make activerecord-deprecated_finders work.
-    # We can move it to a constant in 5.0.
-    cattr_accessor :valid_options, instance_accessor: false
     self.valid_options = [:class_name, :class, :foreign_key, :validate]
 
+    attr_reader :name, :scope, :options
+
     def self.build(model, name, scope, options, &block)
-      extension = define_extensions model, name, &block
-      reflection = create_reflection model, name, scope, options, extension
+      builder = create_builder model, name, scope, options, &block
+      reflection = builder.build(model)
       define_accessors model, reflection
       define_callbacks model, reflection
+      builder.define_extensions model
       reflection
     end
 
-    def self.create_reflection(model, name, scope, options, extension = nil)
+    def self.create_builder(model, name, scope, options, &block)
       raise ArgumentError, "association names must be a Symbol" unless name.kind_of?(Symbol)
 
       if scope.is_a?(Hash)
@@ -39,44 +42,39 @@ module ActiveRecord::Associations::Builder
         scope   = nil
       end
 
-      validate_options(options)
-
-      scope = build_scope(scope, extension)
-
-      ActiveRecord::Reflection.create(macro, name, scope, options, model)
+      new(model, name, scope, options, &block)
     end
 
-    def self.build_scope(scope, extension)
-      new_scope = scope
+    def initialize(model, name, scope, options)
+      # TODO: Remove this model argument as soon we drop support to activerecord-deprecated_finders.
+      @name    = name
+      @scope   = scope
+      @options = options
 
-      if scope && scope.arity == 0
-        new_scope = proc { instance_exec(&scope) }
-      end
+      validate_options
 
-      if extension
-        new_scope = wrap_scope new_scope, extension
+      if scope && scope.arity == 0
+        @scope = proc { instance_exec(&scope) }
       end
-
-      new_scope
     end
 
-    def self.wrap_scope(scope, extension)
-      scope
+    def build(model)
+      ActiveRecord::Reflection.create(macro, name, scope, options, model)
     end
 
-    def self.macro
+    def macro
       raise NotImplementedError
     end
 
-    def self.build_valid_options(options)
-      self.valid_options + Association.extensions.flat_map(&:valid_options)
+    def valid_options
+      Association.valid_options + Association.extensions.flat_map(&:valid_options)
     end
 
-    def self.validate_options(options)
-      options.assert_valid_keys(build_valid_options(options))
+    def validate_options
+      options.assert_valid_keys(valid_options)
     end
 
-    def self.define_extensions(model, name)
+    def define_extensions(model)
     end
 
     def self.define_callbacks(model, reflection)
@@ -119,6 +117,8 @@ module ActiveRecord::Associations::Builder
       raise NotImplementedError
     end
 
+    private
+
     def self.add_before_destroy_callbacks(model, reflection)
       unless valid_dependent_options.include? reflection.options[:dependent]
         raise ArgumentError, "The :dependent option must be one of #{valid_dependent_options}, but is :#{reflection.options[:dependent]}"