From 26cdd01eab5daf9ae17544ef44d3830dadeb8d23 Mon Sep 17 00:00:00 2001 From: wilddima Date: Sun, 21 Oct 2018 10:05:48 +0200 Subject: Add new exception message to datetime from hash cast --- activemodel/lib/active_model/type/date_time.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/type/date_time.rb b/activemodel/lib/active_model/type/date_time.rb index 9641bf45ee..d48598376e 100644 --- a/activemodel/lib/active_model/type/date_time.rb +++ b/activemodel/lib/active_model/type/date_time.rb @@ -39,9 +39,9 @@ module ActiveModel end def value_from_multiparameter_assignment(values_hash) - missing_parameter = (1..3).detect { |key| !values_hash.key?(key) } - if missing_parameter - raise ArgumentError, missing_parameter + missing_parameters = (1..3).select { |key| !values_hash.key?(key) } + if missing_parameters.any? + raise ArgumentError, "Provided hash #{values_hash} doesn't contain necessary keys: #{missing_parameters}" end super end -- cgit v1.2.3 From 8d54f3ebaa8aef554280241159c4ab3cb4da73c8 Mon Sep 17 00:00:00 2001 From: Alberto Almagro Date: Sun, 28 Oct 2018 17:20:27 +0100 Subject: Fix grammar in changed? docs [ci skip] See https://english.stackexchange.com/questions/23218/anyone-has-or-anyone-have-seen-them --- activemodel/lib/active_model/dirty.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb index 093052a70c..f0e1242554 100644 --- a/activemodel/lib/active_model/dirty.rb +++ b/activemodel/lib/active_model/dirty.rb @@ -151,7 +151,7 @@ module ActiveModel @mutations_from_database = nil end - # Returns +true+ if any of the attributes have unsaved changes, +false+ otherwise. + # Returns +true+ if any of the attributes has unsaved changes, +false+ otherwise. # # person.changed? # => false # person.name = 'bob' -- cgit v1.2.3 From b63701e272f3dc932ba7a20127f6dc82b567cfb4 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Tue, 30 Oct 2018 12:52:23 -0600 Subject: `update_columns` raises if the column is unknown Previosly, `update_columns` would just take whatever keys you gave it and tried to run the update query. Most likely this would result in an error from the database. However, if the column actually did exist, but was in `ignored_columns`, this would result in the method returning successfully when it should have raised, and an attribute that should not exist written to `@attributes`. --- activemodel/lib/active_model/attribute.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/attribute.rb b/activemodel/lib/active_model/attribute.rb index 3f19cda07b..75f60d205e 100644 --- a/activemodel/lib/active_model/attribute.rb +++ b/activemodel/lib/active_model/attribute.rb @@ -206,6 +206,7 @@ module ActiveModel raise ActiveModel::MissingAttributeError, "can't write unknown attribute `#{name}`" end alias_method :with_value_from_user, :with_value_from_database + alias_method :with_cast_value, :with_value_from_database end class Uninitialized < Attribute # :nodoc: -- cgit v1.2.3 From a741208f80dd33420a56486bd9ed2b0b9862234a Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Mon, 12 Nov 2018 03:39:28 +0900 Subject: Ensure casting by decimal attribute when querying Related 34cc301f03aea2e579d6687a9ea9782afc1089a0. `QueryAttribute#value_for_database` calls only `type.serialize`, and `Decimal#serialize` is a no-op unlike other attribute types. Whether or not `serialize` will invoke `cast` is undefined in our test cases, but it actually does not work properly unless it does so for now. --- activemodel/lib/active_model/type/decimal.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/type/decimal.rb b/activemodel/lib/active_model/type/decimal.rb index e8ee18c00e..b37dad1c41 100644 --- a/activemodel/lib/active_model/type/decimal.rb +++ b/activemodel/lib/active_model/type/decimal.rb @@ -12,6 +12,10 @@ module ActiveModel :decimal end + def serialize(value) + cast(value) + end + def type_cast_for_schema(value) value.to_s.inspect end -- cgit v1.2.3 From 13b77fa1cb49495f1da79fec6f06475d5dd29af7 Mon Sep 17 00:00:00 2001 From: Ronan Limon Duparcmeur Date: Fri, 9 Nov 2018 16:45:18 +0100 Subject: Fix ignored options in the `#added?` method Fixes #34416 --- activemodel/lib/active_model/errors.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index af94d52d45..9de6b609a3 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -327,11 +327,11 @@ module ActiveModel # person.errors.added? :name, :too_long # => false # person.errors.added? :name, "is too long" # => false def added?(attribute, message = :invalid, options = {}) + message = message.call if message.respond_to?(:call) + if message.is_a? Symbol - self.details[attribute.to_sym].map { |e| e[:error] }.include? message + details[attribute.to_sym].include? normalize_detail(message, options) else - message = message.call if message.respond_to?(:call) - message = normalize_message(attribute, message, options) self[attribute].include? message end end -- cgit v1.2.3 From 5fb432e9c25ed97531400ab4793007df0e87a4e6 Mon Sep 17 00:00:00 2001 From: Gannon McGibbon Date: Fri, 16 Nov 2018 11:13:38 -0500 Subject: Re-add changes_applied doc [ci skip] --- activemodel/lib/active_model/dirty.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb index f0e1242554..0d9e761b1e 100644 --- a/activemodel/lib/active_model/dirty.rb +++ b/activemodel/lib/active_model/dirty.rb @@ -141,7 +141,9 @@ module ActiveModel @mutations_from_database = nil end - def changes_applied # :nodoc: + # Clears dirty data and moves +changes+ to +previously_changed+ and + # +mutations_from_database+ to +mutations_before_last_save+ respectively. + def changes_applied unless defined?(@attributes) @previously_changed = changes end -- cgit v1.2.3 From ee2b84f3cbd97d8116467ea0d44b8182824c83ab Mon Sep 17 00:00:00 2001 From: Daniel Lopez Prat Date: Wed, 21 Nov 2018 08:54:22 +0900 Subject: Add slice! method to ActiveModel::Errors --- activemodel/lib/active_model/errors.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index 9de6b609a3..969effdc20 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -112,6 +112,17 @@ module ActiveModel @details.merge!(other.details) { |_, ary1, ary2| ary1 + ary2 } end + # Removes all errors except the given keys. Returns a hash containing the removed errors. + # + # person.errors.keys # => [:name, :age, :gender, :city] + # person.errors.slice!(:age, :gender) # => { :name=>["cannot be nil"], :city=>["cannot be nil"] } + # person.errors.keys # => [:age, :gender] + def slice!(*keys) + keys = keys.map(&:to_sym) + @details.slice!(*keys) + @messages.slice!(*keys) + end + # Clear the error messages. # # person.errors.full_messages # => ["name cannot be nil"] -- cgit v1.2.3 From db080527a4b6915b1ae7d9bc678467990ecece61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 26 Nov 2018 15:09:19 -0500 Subject: Do not use deprecated Object#!~ in Ruby 2.6 Closes #34530. --- activemodel/lib/active_model/validations/numericality.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb index 126a87ac6e..b9ae42fd39 100644 --- a/activemodel/lib/active_model/validations/numericality.rb +++ b/activemodel/lib/active_model/validations/numericality.rb @@ -86,13 +86,17 @@ module ActiveModel def parse_raw_value_as_a_number(raw_value) return raw_value.to_i if is_integer?(raw_value) - Kernel.Float(raw_value) if raw_value !~ /\A0[xX]/ + Kernel.Float(raw_value) unless is_hexadecimal_literal?(raw_value) end def is_integer?(raw_value) /\A[+-]?\d+\z/ === raw_value.to_s end + def is_hexadecimal_literal?(raw_value) + /\A0[xX]/ === raw_value + end + def filtered_options(value) filtered = options.except(*RESERVED_OPTIONS) filtered[:value] = value -- cgit v1.2.3