Make association builder methods private

activerecord/lib/active_record/associations/builder/association.rb

@@ -128,5 +128,9 @@ def self.add_destroy_callbacks(model, reflection)
       name = reflection.name
       model.before_destroy lambda { |o| o.association(name).handle_dependency }
     end
+
+    private_class_method :build_scope, :macro, :valid_options, :validate_options, :define_extensions,
+      :define_callbacks, :define_accessors, :define_readers, :define_writers, :define_validations,
+      :valid_dependent_options, :check_dependent_options, :add_destroy_callbacks
   end
 end

activerecord/lib/active_record/associations/builder/belongs_to.rb

@@ -123,5 +123,8 @@ def self.define_validations(model, reflection)
         model.validates_presence_of reflection.name, message: :required
       end
     end
+
+    private_class_method :macro, :valid_options, :valid_dependent_options, :define_callbacks, :define_validations,
+      :add_counter_cache_callbacks, :add_touch_callbacks, :add_default_callbacks, :add_destroy_callbacks
   end
 end

activerecord/lib/active_record/associations/builder/collection_association.rb

@@ -66,5 +66,7 @@ def #{name.to_s.singularize}_ids=(ids)
         end
       CODE
     end
+
+    private_class_method :valid_options, :define_callback, :define_extensions, :define_readers, :define_writers
   end
 end

activerecord/lib/active_record/associations/builder/has_many.rb

@@ -13,5 +13,7 @@ def self.valid_options(options)
     def self.valid_dependent_options
       [:destroy, :delete_all, :nullify, :restrict_with_error, :restrict_with_exception]
     end
+
+    private_class_method :macro, :valid_options, :valid_dependent_options
   end
 end

activerecord/lib/active_record/associations/builder/has_one.rb

@@ -26,5 +26,7 @@ def self.define_validations(model, reflection)
         model.validates_presence_of reflection.name, message: :required
       end
     end
+
+    private_class_method :macro, :valid_options, :valid_dependent_options, :add_destroy_callbacks, :define_validations
   end
 end

activerecord/lib/active_record/associations/builder/singular_association.rb

@@ -38,5 +38,7 @@ def create_#{name}!(*args, &block)
         end
       CODE
     end
+
+    private_class_method :valid_options, :define_accessors, :define_constructors
   end
 end

activerecord/test/cases/associations/extension_test.rb

@@ -89,6 +89,6 @@ def test_association_with_default_scope
   private
 
     def extend!(model)
-      ActiveRecord::Associations::Builder::HasMany.define_extensions(model, :association_name) { }
+      ActiveRecord::Associations::Builder::HasMany.send(:define_extensions, model, :association_name) { }
     end
 end