Changeset 7800

Timestamp:

10/08/07 06:05:44 (11 months ago)

Author:

nzkoz

Message:

* Add Range#overlaps?(range), Range#include?(range), and Range#step without a block. [brandon] Closes #9746

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/range.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/range/blockless_step.rb (added)
• trunk/activesupport/lib/active_support/core_ext/range/include_range.rb (added)
• trunk/activesupport/lib/active_support/core_ext/range/overlaps.rb (added)
• trunk/activesupport/test/core_ext/range_ext_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add Range#overlaps?(range), Range#include?(range), and Range#step without a block. [brandon]
-
-* Correct BufferedLogger#level? checks.  #9806 [wildchild, Johan Sorensen]

trunk/activesupport/lib/active_support/core_ext/range.rb

@@ -1 +1 @@
-require 'active_support/core_ext/range/conversions'
+require File.dirname(__FILE__) + '/range/overlaps'
+require File.dirname(__FILE__) + '/range/include_range'
+require File.dirname(__FILE__) + '/range/blockless_step'
-
-class Range #:nodoc:
-  include ActiveSupport::CoreExtensions::Range::Conversions
+  include ActiveSupport::CoreExtensions::Range::Overlaps
+  include ActiveSupport::CoreExtensions::Range::IncludeRange
+  include ActiveSupport::CoreExtensions::Range::BlocklessStep
-end

trunk/activesupport/test/core_ext/range_ext_test.rb

@@ -11 +11 @@
-    assert_equal "BETWEEN '2005-12-10 15:30:00' AND '2005-12-10 17:30:00'", date_range.to_s(:db)
-  end
+  
+  def test_overlaps_last_inclusive
+    assert((1..5).overlaps?(5..10))
+  end
+
+  def test_overlaps_last_exclusive
+    assert !(1...5).overlaps?(5..10)
+  end
+
+  def test_overlaps_first_inclusive
+    assert((5..10).overlaps?(1..5))
+  end
+  
+  def test_overlaps_first_exclusive
+    assert !(5..10).overlaps?(1...5)
+  end
+  
+  def test_should_include_identical_inclusive
+    assert((1..10).include?(1..10))
+  end
+
+  def test_should_include_identical_exclusive
+    assert((1...10).include?(1...10))
+  end
+
+  def test_should_include_other_with_exlusive_end
+    assert((1..10).include?(1...10))
+  end
+
+  def test_exclusive_end_should_not_include_identical_with_inclusive_end
+    assert !(1...10).include?(1..10)
+  end
+
+  def test_should_not_include_overlapping_first
+    assert !(2..8).include?(1..3)
+  end
+  
+  def test_should_not_include_overlapping_last
+    assert !(2..8).include?(5..9)
+  end
+  
+  def test_blockless_step
+    assert_equal [1,3,5,7,9], (1..10).step(2)
+  end
+
+  def test_original_step
+    array = []
+    (1..10).step(2) {|i| array << i }
+    assert_equal [1,3,5,7,9], array
+  end
+  
-end