Restore changed_attributes method in ActiveModel::Dirty and loosen expectation on including class' initialize method.

[#4308 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Sam Pohlenz 2010-04-01 21:16:03 +10:30 committed by Jeremy Kemper
parent dc5300adb6
commit 3adaef8ae7
2 changed files with 12 additions and 13 deletions

@ -91,17 +91,12 @@ module Dirty
attribute_method_affix :prefix => 'reset_', :suffix => '!'
end
def initialize(*)
@changed_attributes = {}
super
end
# Do any attributes have unsaved changes?
# person.changed? # => false
# person.name = 'bob'
# person.changed? # => true
def changed?
!@changed_attributes.empty?
!changed_attributes.empty?
end
# List of attributes with unsaved changes.
@ -109,7 +104,7 @@ def changed?
# person.name = 'bob'
# person.changed # => ['name']
def changed
@changed_attributes.keys
changed_attributes.keys
end
# Map of changed attrs => [original value, new value].
@ -130,19 +125,24 @@ def previous_changes
end
private
# Map of change <tt>attr => original value</tt>.
def changed_attributes
@changed_attributes ||= {}
end
# Handle <tt>*_changed?</tt> for +method_missing+.
def attribute_changed?(attr)
@changed_attributes.include?(attr)
changed_attributes.include?(attr)
end
# Handle <tt>*_change</tt> for +method_missing+.
def attribute_change(attr)
[@changed_attributes[attr], __send__(attr)] if attribute_changed?(attr)
[changed_attributes[attr], __send__(attr)] if attribute_changed?(attr)
end
# Handle <tt>*_was</tt> for +method_missing+.
def attribute_was(attr)
attribute_changed?(attr) ? @changed_attributes[attr] : __send__(attr)
attribute_changed?(attr) ? changed_attributes[attr] : __send__(attr)
end
# Handle <tt>*_will_change!</tt> for +method_missing+.
@ -153,12 +153,12 @@ def attribute_will_change!(attr)
rescue TypeError, NoMethodError
end
@changed_attributes[attr] = value
changed_attributes[attr] = value
end
# Handle <tt>reset_*!</tt> for +method_missing+.
def reset_attribute!(attr)
__send__("#{attr}=", @changed_attributes[attr]) if attribute_changed?(attr)
__send__("#{attr}=", changed_attributes[attr]) if attribute_changed?(attr)
end
end
end

@ -6,7 +6,6 @@ class DirtyModel
define_attribute_methods [:name]
def initialize
super
@name = nil
end