kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Extract `read_attribute_for_validation` for per-validator customization 

The model global `read_attribute_for_validation` is not fit for some
validators (specifically for numericality validator).

To allow per-validator customization for attribute value, it extracts
`read_attribute_for_validation` in `EachValidator`.
This commit is contained in:
Ryuta Kamizono 2020-07-29 18:11:49 +09:00
parent 4560c36da2
commit 4cc438a1df
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
activemodel/lib/active_model/validations/numericality.rb
View File

@ -25,37 +25,17 @@ module ActiveModel
end
def validate_each(record, attr_name, value, precision: Float::DIG, scale: nil)
came_from_user = :"#{attr_name}_came_from_user?"
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
if record_attribute_changed_in_place?(record, attr_name)
raw_value = value
end
unless is_number?(raw_value, precision, scale)
record.errors.add(attr_name, :not_a_number, **filtered_options(raw_value))
unless is_number?(value, precision, scale)
record.errors.add(attr_name, :not_a_number, **filtered_options(value))
return
end
if allow_only_integer?(record) && !is_integer?(raw_value)
record.errors.add(attr_name, :not_an_integer, **filtered_options(raw_value))
if allow_only_integer?(record) && !is_integer?(value)
record.errors.add(attr_name, :not_an_integer, **filtered_options(value))
return
end
value = parse_as_number(raw_value, precision, scale)
value = parse_as_number(value, precision, scale)
options.slice(*CHECKS.keys).each do |option, option_value|
case option
@ -128,6 +108,27 @@ module ActiveModel
end
end
def read_attribute_for_validation(record, attr_name)
return super if record_attribute_changed_in_place?(record, attr_name)
came_from_user = :"#{attr_name}_came_from_user?"
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 || super
end
def record_attribute_changed_in_place?(record, attr_name)
record.respond_to?(:attribute_changed_in_place?) &&
record.attribute_changed_in_place?(attr_name.to_s)

7
activemodel/lib/active_model/validator.rb
View File

@ -147,7 +147,7 @@ module ActiveModel
# override +validate_each+ with validation logic.
def validate(record)
attributes.each do |attribute|
value = record.read_attribute_for_validation(attribute)
value = read_attribute_for_validation(record, attribute)
next if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
validate_each(record, attribute, value)
end
@ -164,6 +164,11 @@ module ActiveModel
# +ArgumentError+ when invalid options are supplied.
def check_validity!
end
private
def read_attribute_for_validation(record, attr_name)
record.read_attribute_for_validation(attr_name)
end
end
# +BlockValidator+ is a special +EachValidator+ which receives a block on initialization