Permalink
Browse files

refactored ActiveModel::Validations::InclusionValidator#validate_each

[#6455 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  • Loading branch information...
1 parent b0da0dd commit 511bf2a0505309c65bbf2ad9394e3c548762ea5d @dcrec1 dcrec1 committed with spastorino Feb 19, 2011
Showing with 8 additions and 18 deletions.
  1. +8 −18 activemodel/lib/active_model/validations/inclusion.rb
View
26 activemodel/lib/active_model/validations/inclusion.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/range.rb'
+
module ActiveModel
# == Active Model Inclusion Validator
@@ -8,27 +10,15 @@ def check_validity!
":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

0 comments on commit 511bf2a

Please sign in to comment.