kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

refactored ActiveModel::Validations::InclusionValidator#validate_each

Browse source 
[#6455 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
This commit is contained in:
Diego Carrion 2011-02-19 21:13:33 -02:00 committed by Santiago Pastorino
parent b0da0dd834
commit 511bf2a050
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
activemodel/lib/active_model/validations/inclusion.rb
View file

@ -1,3 +1,5 @@
require 'active_support/core_ext/range.rb'
module ActiveModel
# == Active Model Inclusion Validator
@ -8,27 +10,15 @@ module ActiveModel
":in option of the configuration hash" unless options[:in].respond_to?(:include?)
end
def validate_each(record, attribute, value)
record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value)) unless options[:in].send(include?, value)
end
# On Ruby 1.9 Range#include? checks all possible values in the range for equality,
# so it may be slow for large ranges. The new Range#cover? uses the previous logic
# of comparing a value with the range endpoints.
if (1..2).respond_to?(:cover?)
def validate_each(record, attribute, value)
included = if options[:in].is_a?(Range)
options[:in].cover?(value)
else
options[:in].include?(value)
end
unless included
record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
end
end
else
def validate_each(record, attribute, value)
unless options[:in].include?(value)
record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
end
end
def include?
options[:in].is_a?(Range) ? :cover? : :include?
end
end