RubyRanges 0.0.2 → 0.0.3

data/lib/ruby_ranges/range.rb

@@ -21,14 +21,14 @@ module RubyRanges
 
     def include_range?(range)
       case
+      when self.include?(range.begin) && self.end <= range.end # upload inclusive
+        RubyRanges::UpwardIncluded
+      when self.include?(range.end) && self.begin >= range.begin # downward inclusive
+        RubyRanges::DownwardIncluded
       when self.include?(range.begin) && self.include?(range.end) # wholly inclusive
         RubyRanges::WhollyIncluded
       when range.include?(self.begin) && range.include?(self.end) # inverse wholly inclusive
         RubyRanges::InverseWhollyIncluded
-      when self.include?(range.begin) && self.end < range.end # upload inclusive
-        RubyRanges::UpwardIncluded
-      when self.include?(range.end) && self.begin > range.begin # downward inclusive
-        RubyRanges::DownwardIncluded
       else # exclusive range
         RubyRanges::MutuallyExcluded
       end
@@ -56,7 +56,7 @@ module RubyRanges
         nil
       when TrueClass # self split by wholly inclusive range
         RubyRanges::Array.new(self.begin..range.begin, range.end..self.end)
-      when 1 # self shortened by upload inclusive range
+      when 1 # self shortened by upward inclusive range
         self.begin..range.begin
       when -1 # self shortened by downward inclusive range
         range.end..self.end

data/lib/ruby_ranges/version.rb

@@ -1,3 +1,3 @@
 module RubyRanges
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/ruby_ranges_test.rb

@@ -60,6 +60,16 @@ class RubyRanges::RangeTest < Test::Unit::TestCase
     assert_equal RubyRanges::Array.new((1..4), (8..9)), output
   end
 
+  def test_subtracting_range_with_common_least_value
+    output = (1..10) - (1..10)
+    assert_equal (1..9), output
+  end
+
+  def test_subtracting_range_with_common_greatest_value
+    output = (1..10) - (9..10)
+    assert_equal (1..9), output
+  end
+
   def test_subtracting_wholly_included_range
     output = (1..9) - (5..7)
     assert_equal RubyRanges::Array.new(1..5, 7..9), output

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyRanges
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Chris Winslett