Split the options checks from read_attribute_for_validation

rails · Dec 9, 2020 · 720a60e · 720a60e
1 parent 1dee499
commit 720a60e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb
@@ -108,9 +108,7 @@ def allow_only_integer?(record)
         end
       end
 
-      def read_attribute_for_validation(record, attr_name)
-        value = super
-
+      def read_attribute_for_validation(record, attr_name, value)
         return value if record_attribute_changed_in_place?(record, attr_name)
 
         came_from_user = :"#{attr_name}_came_from_user?"

diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
@@ -147,10 +147,10 @@ def initialize(options)
     # override +validate_each+ with validation logic.
     def validate(record)
       attributes.each do |attribute|
-        catch(:allowed) do
-          value = read_attribute_for_validation(record, attribute)
-          validate_each(record, attribute, value)
-        end
+        value = record.read_attribute_for_validation(attribute)
+        next if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
+        value = read_attribute_for_validation(record, attribute, value)
+        validate_each(record, attribute, value)
       end
     end
 
@@ -167,9 +167,7 @@ def check_validity!
     end
 
     private
-      def read_attribute_for_validation(record, attr_name)
-        value = record.read_attribute_for_validation(attr_name)
-        throw(:allowed) if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
+      def read_attribute_for_validation(record, attr_name, value)
         value
       end
   end