Merge pull request #4197 from nashby/refactor-range-include

refactor Range#include? for range value
2011-12-26 12:23:36 -08:00 · 2011-12-26 12:23:36 -08:00 · 28b008bae3
commit 28b008bae3
parent 160f07fe8f 3f642c9d18
1 changed files with 1 additions and 3 deletions
--- 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,7 @@ 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)
+      min <= value.min && max >= value.max
    else
      include_without_range?(value)
    end