activemodel 5.2.1.1 → 5.2.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 438f3bd0d6ca0a2a05a7e99d66000d8b0d98a950bb9b9d0b0dfb0844fae7f31b
-  data.tar.gz: 06d4aa63a3080ed7921ce864b2f298df2515df8a1bbf852fbf014b9679373d15
+  metadata.gz: 337a43f3957744aee93260ae4f6fd4ae69f6ee02ce3d6bec715704f328e2e65a
+  data.tar.gz: db21100aba18efbf69894d52b19df6a0480d0b540f12e4d2d0f1b016415e4b66
 SHA512:
-  metadata.gz: 7be0ecf7935a31d50e9da140c0fc3fc4a237b38f286d43d059fd110291dc77d219bd7d6b7cc43dd50ee1cd1800b18087acb4c486a11ba5c59df82c0f06fc7bdf
-  data.tar.gz: 65a2bef63659b87ca1af453b1dee8bb7937fef7640660c938b3b75081f73399ecd7d6c3297a7990ae9f182244d2e570a76fa98469926c2c7f053e8d21ef267ac
+  metadata.gz: 3620ed5a6213e665798c3c0f3c2685396921f5c5fbafecff19c6e6cffc19acc49df9fc690674da35833c08732f21f6fb109254128f89b0d5c62c512fd3c91cae
+  data.tar.gz: 7f9a71461be3a394d7513431e6e67ccf084fc6911cfd737f74457d9278f64773d167d5dde7dce38b2a8fa47d792dbba4718c7e11f48c13cbde7ef1071c22152d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Rails 5.2.2.rc1 (November 28, 2018) ##
+
+*   Fix numericality validator to still use value before type cast except Active Record.
+
+    Fixes #33651, #33686.
+
+    *Ryuta Kamizono*
+
+
 ## Rails 5.2.1.1 (November 27, 2018) ##
 
 *   No changes.

data/lib/active_model/attribute.rb

@@ -207,6 +207,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:

data/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

data/lib/active_model/errors.rb

@@ -322,11 +322,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

data/lib/active_model/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveModel
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 1
-    PRE   = "1"
+    TINY  = 2
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/type/helpers/numeric.rb

@@ -29,7 +29,7 @@ module ActiveModel
             # 'wibble'.to_i will give zero, we want to make sure
             # that we aren't marking int zero to string zero as
             # changed.
-            value.to_s !~ /\A-?\d+\.?\d*\z/
+            !/\A[-+]?\d+/.match?(value.to_s)
           end
       end
     end

data/lib/active_model/validations/numericality.rb

@@ -21,8 +21,17 @@ module ActiveModel
       def validate_each(record, attr_name, value)
         came_from_user = :"#{attr_name}_came_from_user?"
 
-        if record.respond_to?(came_from_user) && record.public_send(came_from_user)
-          raw_value = record.read_attribute_before_type_cast(attr_name)
+        if record.respond_to?(came_from_user)
+          if record.public_send(came_from_user)
+            raw_value = record.read_attribute_before_type_cast(attr_name)
+          elsif record.respond_to?(:read_attribute)
+            raw_value = record.read_attribute(attr_name)
+          end
+        else
+          before_type_cast = :"#{attr_name}_before_type_cast"
+          if record.respond_to?(before_type_cast)
+            raw_value = record.public_send(before_type_cast)
+          end
         end
         raw_value ||= value
 
@@ -77,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 5.2.1.1
+  version: 5.2.2.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.1.1
+        version: 5.2.2.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.1.1
+        version: 5.2.2.rc1
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -100,8 +100,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.1.1/activemodel
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.1.1/activemodel/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.2.rc1/activemodel
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.2.rc1/activemodel/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -113,9 +113,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6