diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2017-04-14 13:06:26 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-14 13:06:26 -0700 |
commit | e7f45d370ab10ad86a748ff2ec8b34c54d87b0bf (patch) | |
tree | abde4f8ae9236998c617aa1ccfb31e72665a8960 /activemodel | |
parent | e447c8c80a3f99a29286661eb47762535c249181 (diff) | |
parent | 83d6cc4815debe2086073387ecbf38c0f47cfec5 (diff) | |
download | rails-e7f45d370ab10ad86a748ff2ec8b34c54d87b0bf.tar.gz rails-e7f45d370ab10ad86a748ff2ec8b34c54d87b0bf.tar.bz2 rails-e7f45d370ab10ad86a748ff2ec8b34c54d87b0bf.zip |
Merge pull request #28760 from rails/fix-attributes_name
Move around AR::Dirty and fix _attribute method
Diffstat (limited to 'activemodel')
-rw-r--r-- | activemodel/lib/active_model/attribute_methods.rb | 4 | ||||
-rw-r--r-- | activemodel/lib/active_model/dirty.rb | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb index 166c6ac21f..b5c0b43b61 100644 --- a/activemodel/lib/active_model/attribute_methods.rb +++ b/activemodel/lib/active_model/attribute_methods.rb @@ -472,5 +472,9 @@ module ActiveModel def missing_attribute(attr_name, stack) raise ActiveModel::MissingAttributeError, "missing attribute: #{attr_name}", stack end + + def _read_attribute(attr) + __send__(attr) + end end end diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb index 37b51ad354..dc81f74779 100644 --- a/activemodel/lib/active_model/dirty.rb +++ b/activemodel/lib/active_model/dirty.rb @@ -179,13 +179,13 @@ module ActiveModel # Handles <tt>*_changed?</tt> for +method_missing+. def attribute_changed?(attr, from: OPTION_NOT_GIVEN, to: OPTION_NOT_GIVEN) # :nodoc: !!changes_include?(attr) && - (to == OPTION_NOT_GIVEN || to == _attributes(attr)) && + (to == OPTION_NOT_GIVEN || to == _read_attribute(attr)) && (from == OPTION_NOT_GIVEN || from == changed_attributes[attr]) end # Handles <tt>*_was</tt> for +method_missing+. def attribute_was(attr) # :nodoc: - attribute_changed?(attr) ? changed_attributes[attr] : _attributes(attr) + attribute_changed?(attr) ? changed_attributes[attr] : _read_attribute(attr) end # Handles <tt>*_previously_changed?</tt> for +method_missing+. @@ -226,7 +226,7 @@ module ActiveModel # Handles <tt>*_change</tt> for +method_missing+. def attribute_change(attr) - [changed_attributes[attr], _attributes(attr)] if attribute_changed?(attr) + [changed_attributes[attr], _read_attribute(attr)] if attribute_changed?(attr) end # Handles <tt>*_previous_change</tt> for +method_missing+. @@ -239,7 +239,7 @@ module ActiveModel return if attribute_changed?(attr) begin - value = _attributes(attr) + value = _read_attribute(attr) value = value.duplicable? ? value.clone : value rescue TypeError, NoMethodError end @@ -268,9 +268,5 @@ module ActiveModel def clear_attribute_changes(attributes) # :doc: attributes_changed_by_setter.except!(*attributes) end - - def _attributes(attr) - __send__(attr) - end end end |