Merge pull request rails#5722 from kennyj/some_refactor_for_association

Some refactor for association.
kennyj · Apr 12, 2012 · 65be11f · 65be11f
2 parents eda65f3 + 1e417d5
commit 65be11f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
@@ -25,10 +25,7 @@ class Association #:nodoc:
       def initialize(owner, reflection)
         reflection.check_validity!
 
-        @target = nil
         @owner, @reflection = owner, reflection
-        @updated = false
-        @stale_state = nil
 
         reset
         reset_scope
@@ -46,6 +43,7 @@ def aliased_table_name
       def reset
         @loaded = false
         @target = nil
+        @stale_state = nil
       end
 
       # Reloads the \target and returns +self+ on success.
@@ -215,10 +213,6 @@ def invertible_for?(record)
         def stale_state
         end
 
-        def association_class
-          @reflection.klass
-        end
-
         def build_record(attributes, options)
           reflection.build_association(attributes, options) do |record|
             attributes = create_scope.except(*(record.changed - [reflection.foreign_key]))

diff --git a/activerecord/lib/active_record/associations/belongs_to_association.rb b/activerecord/lib/active_record/associations/belongs_to_association.rb
@@ -14,6 +14,11 @@ def replace(record)
         self.target = record
       end
 
+      def reset
+        super
+        @updated = false
+      end
+
       def updated?
         @updated
       end

diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
@@ -71,7 +71,7 @@ def ids_writer(ids)
       end
 
       def reset
-        @loaded = false
+        super
         @target = []
       end