1 files changed, 8 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index 87d4daa6d9..b30d1eb0a6 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -127,17 +127,17 @@ module ActiveRecord
     extend ActiveSupport::Concern
 
     module AssociationBuilderExtension #:nodoc:
-      def build
+      def self.build(model, reflection)
         model.send(:add_autosave_association_callbacks, reflection)
-        super
+      end
+
+      def self.valid_options
+        [ :autosave ]
       end
     end
 
     included do
-      Associations::Builder::Association.class_eval do
-        self.valid_options << :autosave
-        include AssociationBuilderExtension
-      end
+      Associations::Builder::Association.extensions << AssociationBuilderExtension
     end
 
     module ClassMethods
@@ -301,7 +301,7 @@ module ActiveRecord
     def association_valid?(reflection, record)
       return true if record.destroyed? || record.marked_for_destruction?
 
-      unless valid = record.valid?(validation_context)
+      unless valid = record.valid?
         if reflection.options[:autosave]
           record.errors.each do |attribute, message|
             attribute = "#{reflection.name}.#{attribute}"
@@ -343,6 +343,7 @@ module ActiveRecord
           end
 
           records.each do |record|
+            next if record.destroyed?
 
             saved = true