From 71f59b72fec12834645d9cc0d6dc61f15dcfde68 Mon Sep 17 00:00:00 2001 From: Sergey Nartimov Date: Thu, 29 Dec 2011 10:50:15 +0300 Subject: refactor Range#include? to handle ranges with floats Conflicts: activesupport/lib/active_support/core_ext/range/include_range.rb --- activesupport/lib/active_support/core_ext/range/include_range.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'activesupport/lib/active_support/core_ext') diff --git a/activesupport/lib/active_support/core_ext/range/include_range.rb b/activesupport/lib/active_support/core_ext/range/include_range.rb index 0246627467..38a90490e6 100644 --- a/activesupport/lib/active_support/core_ext/range/include_range.rb +++ b/activesupport/lib/active_support/core_ext/range/include_range.rb @@ -9,9 +9,8 @@ class Range # (5..9).include?(11) # => false def include_with_range?(value) if value.is_a?(::Range) - operator = exclude_end? ? :< : :<= - end_value = value.exclude_end? ? last.succ : last - include_without_range?(value.first) && (value.last <=> end_value).send(operator, 0) + operator = exclude_end? && !value.exclude_end? ? :< : :<= + include_without_range?(value.first) && value.last.send(operator, last) else include_without_range?(value) end -- cgit v1.2.3