epitools 0.5.94 → 0.5.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d01371fe8e7b1abdb22e2f34fa33972aa7b58ef
-  data.tar.gz: cd1b1caf85ea32aeec4ebcc4caf2e0dae2459c59
+  metadata.gz: '09ec6a706e691b75f78ba25055e8c79b2beb3944'
+  data.tar.gz: 4ebd4dad0730f0ff7434583261d45e50a7427320
 SHA512:
-  metadata.gz: d45da94f1c6618763d097c779df99d4c5144e2678d6a2da89a76d3f26a535146057ada16f2c2e179a2a3ccdf8968609d77918fb212cc487b6fa26bce60d787f9
-  data.tar.gz: 419827e53335a23f21b69988b255811aae29f762c2490bfd8b7a793a2e29cf5cfc9adf8257f944b7a672da92e53456effbbb0373d754ea8d3345b320e88131a9
+  metadata.gz: 2c43291944e5e7c7e1d409e9df8e33d30d9ff02cfcc1d29b478f231476b8c1d4fa72edae5219f63bad5bbd7da4e4d2aee50794b1b3b1977fbfae3bcc10f0db71
+  data.tar.gz: 78595a9e4d78eea0f8b626827dd14dddd4a4c29f4c6b286ca50def65aeeaa778f51fdbb26713ec80f3d908239c70c4d245602fac969757a6ac69d91e83bbf229

data/VERSION

@@ -1 +1 @@
-0.5.94
+0.5.95

data/lib/epitools/core_ext/range.rb

@@ -23,14 +23,32 @@ class Range
 
     (mins.max..maxes.min)
   end
-  
+
   #
   # Return a new range which is the union of the two ranges
   #
   def |(other)
     mins, maxes = minmax.zip(other.minmax)
-
     (mins.min..maxes.max)
   end
-  
+
+  #
+  # Merge two ranges
+  #
+  def merge(other)
+    if self.overlaps?(other)
+      [self | other]
+    else
+      [self, other]
+    end
+  end
+
+  #
+  # Test if this range overlaps the other
+  #
+  def overlaps?(other)
+    # overlap == start < finish' AND start' < finish
+    self.first <= other.last and other.first <= self.last
+  end
+
 end

data/spec/core_ext_spec.rb

@@ -831,10 +831,24 @@ describe Range do
   end
 
   it "does | and &" do
-    a = (1..10)
-    b = (5...21)
-    a & b == (5..10)
-    a | b == (1..20)
+    a = 1..10
+    b = 5...21
+    (a & b).should == (5..10)
+    (a | b).should == (1..20)
+
+    c = 1..2
+    d = 5..6
+
+    (c | d).should == (c.first..d.last)
+    a.merge(b).should == [a.first..b.last-1]
+    c.merge(d).should == [c, d]
+  end
+
+  it "overlaps?" do
+    (1..10).overlaps?(20..30).should == false
+    (1..10).overlaps?(10..30).should == true
+    (10..30).overlaps?(1..10).should == true
+    (10..30).overlaps?(1..15).should == true
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.94
+  version: 0.5.95
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec