aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/validations/clusivity.rb
diff options
context:
space:
mode:
authorCharles Bergeron <chuck.bergeron@gmail.com>2013-05-27 23:07:05 -0700
committerCharles Bergeron <chuck.bergeron@gmail.com>2013-05-27 23:54:25 -0700
commit0317b93c17a46d7663a8c36edc26ad0ba3d75f85 (patch)
tree3fcfde93ff1081fd53b8453f8cdd2b95dc42b3cd /activemodel/lib/active_model/validations/clusivity.rb
parent5a687e930ffd4785be7af4816f97000fc3e948b3 (diff)
downloadrails-0317b93c17a46d7663a8c36edc26ad0ba3d75f85.tar.gz
rails-0317b93c17a46d7663a8c36edc26ad0ba3d75f85.tar.bz2
rails-0317b93c17a46d7663a8c36edc26ad0ba3d75f85.zip
Use Range#cover? for Numeric ranges (tests via endpoints) and use Range#include? for non-numeric ranges
added changelog message
Diffstat (limited to 'activemodel/lib/active_model/validations/clusivity.rb')
-rw-r--r--activemodel/lib/active_model/validations/clusivity.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/validations/clusivity.rb b/activemodel/lib/active_model/validations/clusivity.rb
index 49df98d6c1..c5aacb010a 100644
--- a/activemodel/lib/active_model/validations/clusivity.rb
+++ b/activemodel/lib/active_model/validations/clusivity.rb
@@ -31,10 +31,11 @@ module ActiveModel
end
# In Ruby 1.9 <tt>Range#include?</tt> on non-numeric ranges checks all possible values in the
- # range for equality, so it may be slow for large ranges. The new <tt>Range#cover?</tt>
- # uses the previous logic of comparing a value with the range endpoints.
+ # range for equality, which is slower but more accurate. <tt>Range#cover?</tt> uses
+ # the previous logic of comparing a value with the range endpoints, which is fast
+ # but is only accurate on numeric ranges.
def inclusion_method(enumerable)
- enumerable.is_a?(Range) ? :cover? : :include?
+ (enumerable.is_a?(Range) && enumerable.first.is_a?(Numeric)) ? :cover? : :include?
end
end
end