Merge pull request #4229 from lest/range-include

refactor Range#include? to handle ranges with floats
This commit is contained in:
Xavier Noria 2011-12-30 02:13:37 -08:00
commit edfe7d8013
2 changed files with 6 additions and 1 deletions

@ -9,7 +9,8 @@ class Range
# (5..9).include?(11) # => false
def include_with_range?(value)
if value.is_a?(::Range)
min <= value.min && max >= value.max
operator = exclude_end? && !value.exclude_end? ? :< : :<=
include_without_range?(value.first) && value.last.send(operator, last)
else
include_without_range?(value)
end

@ -53,6 +53,10 @@ def test_should_not_include_overlapping_last
assert !(2..8).include?(5..9)
end
def test_should_include_identical_exclusive_with_floats
assert (1.0...10.0).include?(1.0...10.0)
end
def test_blockless_step
assert_equal [1,3,5,7,9], (1..10).step(2)
end