activemodel 6.1.0.rc2 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73897389085a337d37fd217732c23d639014f9ef7bba9928553000d40826838c
-  data.tar.gz: 1451352712ab5c35dc23e010aa7cd6eeb4aa720966a9632b738a2840f3215b74
+  metadata.gz: 0c76c877a2ad6e39c8f29713e55c598f757347ba5ba9fe3df8ac63478107bca6
+  data.tar.gz: d21f47ccc1141993b518fcd4a0ee209d435d8d4cca9e97857c70307de66e2d8c
 SHA512:
-  metadata.gz: f60de09baec917855aef1dbb43cd18aa50c79ef1ce1a7984a585677a9b13dba4aa5305eb7404db02076b6dd4189364d20ac0025084927544a1fea7e945d1cd3b
-  data.tar.gz: 186b7fa9b0cf4c20777ffcafefba10372d7a919a5b33df2e650cfae6febee16a9031b0bdacd39b2cfd5d1c388644fee41cb8d6e587b20dbfa896a424466c33e1
+  metadata.gz: 4ae9b75bb64cd8956d2399952b9ed053c8aff744a885d61d3039cf1bccec1b40bdd02a50a6bb79203d0c85c01d8b3abb8f04eaeca7f12380c75733853042414f
+  data.tar.gz: 39b87488692438059cce4e0490269820fd940783287ab5e5a3b9b14207314063b7b4fa65c9a060863ae1def760b83e28ecfeff7734c02b10d4b356b2096a17d7

data/CHANGELOG.md

@@ -1,9 +1,24 @@
-## Rails 6.1.0.rc2 (December 01, 2020) ##
+## Rails 6.1.3 (February 17, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.1.0.rc1 (November 02, 2020) ##
+## Rails 6.1.2.1 (February 10, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.2 (February 09, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.1 (January 07, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.0 (December 09, 2020) ##
 
 *   Pass in `base` instead of `base_class` to Error.human_attribute_name
 

data/README.rdoc

@@ -241,7 +241,7 @@ The latest version of Active Model can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/activemodel
+* https://github.com/rails/rails/tree/main/activemodel
 
 
 == License

data/lib/active_model/attribute.rb

@@ -164,10 +164,10 @@ module ActiveModel
           type.deserialize(value)
         end
 
-        def _original_value_for_database
-          value_before_type_cast
-        end
-        private :_original_value_for_database
+        private
+          def _original_value_for_database
+            value_before_type_cast
+          end
       end
 
       class FromUser < Attribute # :nodoc:

data/lib/active_model/callbacks.rb

@@ -147,7 +147,7 @@ module ActiveModel
           conditional = ActiveSupport::Callbacks::Conditionals::Value.new { |v|
             v != false
           }
-          options[:if] = Array(options[:if]) << conditional
+          options[:if] = Array(options[:if]) + [conditional]
           set_callback(:"#{callback}", :after, *args, options, &block)
         end
       end

data/lib/active_model/error.rb

@@ -119,11 +119,11 @@ module ActiveModel
     attr_reader :base
     # The attribute of +base+ which the error belongs to
     attr_reader :attribute
-    # The type of error, defaults to `:invalid` unless specified
+    # The type of error, defaults to +:invalid+ unless specified
     attr_reader :type
-    # The raw value provided as the second parameter when calling `errors#add`
+    # The raw value provided as the second parameter when calling +errors#add+
     attr_reader :raw_type
-    # The options provided when calling `errors#add`
+    # The options provided when calling +errors#add+
     attr_reader :options
 
     # Returns the error message.

data/lib/active_model/errors.rb

@@ -110,7 +110,7 @@ module ActiveModel
     # Imports one error
     # Imported errors are wrapped as a NestedError,
     # providing access to original error object.
-    # If attribute or type needs to be overridden, use `override_options`.
+    # If attribute or type needs to be overridden, use +override_options+.
     #
     # override_options - Hash
     # @option override_options [Symbol] :attribute Override the attribute the error belongs to

data/lib/active_model/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveModel
   module VERSION
     MAJOR = 6
     MINOR = 1
-    TINY  = 0
-    PRE   = "rc2"
+    TINY  = 3
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/validations/callbacks.rb

@@ -56,14 +56,7 @@ module ActiveModel
         def before_validation(*args, &block)
           options = args.extract_options!
 
-          if options.key?(:on)
-            options = options.dup
-            options[:on] = Array(options[:on])
-            options[:if] = Array(options[:if])
-            options[:if].unshift ->(o) {
-              !(options[:on] & Array(o.validation_context)).empty?
-            }
-          end
+          set_options_for_callback(options)
 
           set_callback(:validation, :before, *args, options, &block)
         end
@@ -99,16 +92,23 @@ module ActiveModel
           options = options.dup
           options[:prepend] = true
 
-          if options.key?(:on)
-            options[:on] = Array(options[:on])
-            options[:if] = Array(options[:if])
-            options[:if].unshift ->(o) {
-              !(options[:on] & Array(o.validation_context)).empty?
-            }
-          end
+          set_options_for_callback(options)
 
           set_callback(:validation, :after, *args, options, &block)
         end
+
+        private
+          def set_options_for_callback(options)
+            if options.key?(:on)
+              options[:on] = Array(options[:on])
+              options[:if] = [
+                ->(o) {
+                  !(options[:on] & Array(o.validation_context)).empty?
+                },
+                *options[:if]
+              ]
+            end
+          end
       end
 
     private

data/lib/active_model/validations/numericality.rb

@@ -64,6 +64,8 @@ module ActiveModel
       def parse_as_number(raw_value, precision, scale)
         if raw_value.is_a?(Float)
           parse_float(raw_value, precision, scale)
+        elsif raw_value.is_a?(BigDecimal)
+          round(raw_value, scale)
         elsif raw_value.is_a?(Numeric)
           raw_value
         elsif is_integer?(raw_value)
@@ -74,7 +76,11 @@ module ActiveModel
       end
 
       def parse_float(raw_value, precision, scale)
-        (scale ? raw_value.truncate(scale) : raw_value).to_d(precision)
+        round(raw_value, scale).to_d(precision)
+      end
+
+      def round(raw_value, scale)
+        scale ? raw_value.round(scale) : raw_value
       end
 
       def is_number?(raw_value, precision, scale)
@@ -108,8 +114,8 @@ module ActiveModel
         end
       end
 
-      def read_attribute_for_validation(record, attr_name)
-        return super if record_attribute_changed_in_place?(record, attr_name)
+      def prepare_value_for_validation(value, record, attr_name)
+        return value if record_attribute_changed_in_place?(record, attr_name)
 
         came_from_user = :"#{attr_name}_came_from_user?"
 
@@ -126,7 +132,7 @@ module ActiveModel
           end
         end
 
-        raw_value || super
+        raw_value || value
       end
 
       def record_attribute_changed_in_place?(record, attr_name)

data/lib/active_model/validator.rb

@@ -147,8 +147,9 @@ module ActiveModel
     # override +validate_each+ with validation logic.
     def validate(record)
       attributes.each do |attribute|
-        value = read_attribute_for_validation(record, attribute)
+        value = record.read_attribute_for_validation(attribute)
         next if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
+        value = prepare_value_for_validation(value, record, attribute)
         validate_each(record, attribute, value)
       end
     end
@@ -166,8 +167,8 @@ module ActiveModel
     end
 
     private
-      def read_attribute_for_validation(record, attr_name)
-        record.read_attribute_for_validation(attr_name)
+      def prepare_value_for_validation(value, record, attr_name)
+        value
       end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 6.1.0.rc2
+  version: 6.1.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.3
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -104,11 +104,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.0.rc2/activemodel/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.0.rc2/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.3/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.3/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.0.rc2/activemodel
-post_install_message: 
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.3/activemodel
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,12 +119,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).
 test_files: []