From b5eb3215a68f94bb8cb20739366232c415744b83 Mon Sep 17 00:00:00 2001 From: bogdanvlviv Date: Tue, 4 Apr 2017 20:23:51 +0300 Subject: Fix inconsistency with changed attributes when overriding AR attribute reader --- activemodel/lib/active_model/dirty.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb index 6e0af99ad7..37b51ad354 100644 --- a/activemodel/lib/active_model/dirty.rb +++ b/activemodel/lib/active_model/dirty.rb @@ -179,13 +179,13 @@ module ActiveModel # Handles *_changed? for +method_missing+. def attribute_changed?(attr, from: OPTION_NOT_GIVEN, to: OPTION_NOT_GIVEN) # :nodoc: !!changes_include?(attr) && - (to == OPTION_NOT_GIVEN || to == __send__(attr)) && + (to == OPTION_NOT_GIVEN || to == _attributes(attr)) && (from == OPTION_NOT_GIVEN || from == changed_attributes[attr]) end # Handles *_was for +method_missing+. def attribute_was(attr) # :nodoc: - attribute_changed?(attr) ? changed_attributes[attr] : __send__(attr) + attribute_changed?(attr) ? changed_attributes[attr] : _attributes(attr) end # Handles *_previously_changed? for +method_missing+. @@ -226,7 +226,7 @@ module ActiveModel # Handles *_change for +method_missing+. def attribute_change(attr) - [changed_attributes[attr], __send__(attr)] if attribute_changed?(attr) + [changed_attributes[attr], _attributes(attr)] if attribute_changed?(attr) end # Handles *_previous_change for +method_missing+. @@ -239,7 +239,7 @@ module ActiveModel return if attribute_changed?(attr) begin - value = __send__(attr) + value = _attributes(attr) value = value.duplicable? ? value.clone : value rescue TypeError, NoMethodError end @@ -268,5 +268,9 @@ module ActiveModel def clear_attribute_changes(attributes) # :doc: attributes_changed_by_setter.except!(*attributes) end + + def _attributes(attr) + __send__(attr) + end end end -- cgit v1.2.3