Permalink
Browse files

Merge pull request #5722 from kennyj/some_refactor_for_association

Some refactor for association.
  • Loading branch information...
2 parents eda65f3 + 1e417d5 commit 65be11ffecdf58e6b69fa84ea3547cd3201d2329 @jonleighton jonleighton committed Apr 12, 2012
@@ -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]))
@@ -14,6 +14,11 @@ def replace(record)
self.target = record
end
+ def reset
+ super
+ @updated = false
+ end
+
def updated?
@updated
end
@@ -71,7 +71,7 @@ def ids_writer(ids)
end
def reset
- @loaded = false
+ super
@target = []
end

0 comments on commit 65be11f

Please sign in to comment.