timerage 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9c4a01a7d8ba83c2829e4bec7eaf00e33ae4beb
-  data.tar.gz: b60764ca0beb7a138de33035b849cd2ac132adf2
+  metadata.gz: 9622b03dc29826d6fd62282884dc1de42fb7bd04
+  data.tar.gz: 8c1c012b9584779d84822c8f6a2358f1a1daaeff
 SHA512:
-  metadata.gz: 9eac547686f938795999e6d02220917a4ac884a45f9a1c6bdef6473a8529a07ba65ead34bafd28cdd67bf6b081e3917f9f7b2e3ecc6ba17ee9f8390f1a9ff0e6
-  data.tar.gz: d4cb8f8dbd21380b4da2ce7d7ba9d8f8e426b8053101738b4f45c8d4b0936fe4be261e06a9fbc758ed119119e34d7d2927446c35649f32d777661fbd9a3ebdc1
+  metadata.gz: b876dde86b6aa1542e29a80f46e59a9b24de9a7b72255ac5772e7ec1de61430001a76ad1874eaee071a0bcfe37dd85b838c392dc331c9b148948e420a6d63f7a
+  data.tar.gz: 62bc60b3fb6b6e5c5e3d1234139ba5fc270856dfa824f643b22cb4c9b5e01aba0256e8e1150cb3776310312af06953f1a19aa4b6b0fbf6731e524aa5d47ae1e4

data/lib/timerage/time_interval.rb

@@ -44,6 +44,42 @@ module Timerage
       other.begin == self.end || other.end == self.begin
     end
 
+
+    def cover?(time_or_interval)
+      return super unless rangeish?(time_or_interval)
+
+      other = time_or_interval
+
+      self.begin <= other.begin &&
+        if self.exclude_end? && other.exclude_end?
+          self.end > other.begin && self.begin < other.end && other.end <= self.end
+
+        elsif self.exclude_end?
+          self.end > other.begin && self.begin <= other.end && other.end < self.end
+
+        elsif other.exclude_end?
+          self.end >= other.begin && self.begin < other.end && other.end <= self.end
+
+        else
+          self.end >= other.begin && self.begin <= other.end && other.end <= self.end
+        end
+    end
+
+    def overlap?(other)
+      cover?(other) ||
+        other.cover?(self) ||
+        cover?(other.begin) ||
+        other.cover?(self.begin) ||
+        cover?(other.end) && (!other.exclude_end? || other.end != self.begin) ||
+        other.cover?(self.end) && (!self.exclude_end? || other.begin != self.end)
+    end
+
+    def <=>(other)
+      return super unless rangeish?(other)
+
+      self.begin <=> other.begin
+    end
+
     protected
 
     def rangeish?(an_obj)

data/lib/timerage/version.rb

@@ -1,3 +1,3 @@
 module Timerage
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/spec/timerage/time_interval_spec.rb

@@ -34,6 +34,22 @@ describe Timerage::TimeInterval do
   specify { expect(interval.iso8601(3))
             .to eq "#{interval.begin.iso8601(3)}/#{interval.end.iso8601(3)}" }
 
+  specify { expect(interval.cover? interval.begin+1..interval.end-1).to be_truthy }
+  specify { expect(interval.cover? interval.begin...interval.end).to be_truthy }
+  specify { expect(interval.cover? interval.begin-1..interval.end-1).to be_falsy }
+  specify { expect(interval.cover? interval.begin+1..interval.end+1).to be_falsy }
+
+  specify { expect(interval.overlap? interval.begin+1..interval.end-1).to be_truthy }
+  specify { expect(interval.overlap? interval.begin...interval.end).to be_truthy }
+  specify { expect(interval.overlap? interval.begin-1..interval.end-1).to be_truthy }
+  specify { expect(interval.overlap? interval.begin+1..interval.end+1).to be_truthy }
+  specify { expect(interval.overlap? interval.end+1..interval.end+2).to be_falsy }
+  specify { expect(interval.overlap? interval.begin-2..interval.begin-1).to be_falsy }
+
+  specify { expect(interval <=> (interval.begin-2..interval.begin-1)).to eq 1}
+  specify { expect(interval <=> (interval.end+1..interval.end+2)).to eq -1}
+  specify { expect(interval <=> interval).to eq 0}
+
   describe "+" do
     let(:adjacent_preceding_time_range) { interval.begin-42..interval.begin }
     let(:adjacent_following_time_range) { interval.end..interval.end+42 }
@@ -56,6 +72,7 @@ describe Timerage::TimeInterval do
     specify { expect{ interval + nonadjacent_time_range }.to raise_error ArgumentError }
   end
 
+
   context "inclusive end" do
     specify { expect(interval.exclude_end?).to be false }
     specify { expect(interval.cover? now).to be true }
@@ -63,6 +80,13 @@ describe Timerage::TimeInterval do
     specify { expect(interval.cover? now - (duration/2)).to be true }
     specify { expect(interval.cover? now + 1).to be false }
     specify { expect(interval.cover? now - (duration + 1)).to be false }
+    specify { expect(interval.cover? interval.begin..interval.end).to be_truthy }
+    specify { expect(interval.cover? interval.begin...interval.end).to be_truthy}
+
+    specify { expect(interval.overlap? interval.begin..interval.end).to be_truthy }
+    specify { expect(interval.overlap? interval.begin...interval.end).to be_truthy }
+    specify { expect(interval.overlap? interval.end-1..interval.end+1).to be_truthy }
+    specify { expect(interval.overlap? interval.end..interval.end+1).to be_truthy }
 
     specify { expect{|b| interval.step(1200, &b) }
         .to yield_successive_args now-duration, now-(duration-1200), now-(duration-2400), now }
@@ -82,6 +106,14 @@ describe Timerage::TimeInterval do
     specify { expect(interval.cover? now - (duration/2)).to be true }
     specify { expect(interval.cover? now + 1).to be false }
     specify { expect(interval.cover? now - (duration + 1)).to be false }
+    specify { expect(interval.cover? interval.end).to be false }
+    specify { expect(interval.cover? interval.begin..interval.end).to be_falsy }
+    specify { expect(interval.cover? interval.begin...interval.end).to be_truthy}
+
+    specify { expect(interval.overlap? interval.begin..interval.end).to be_truthy }
+    specify { expect(interval.overlap? interval.begin...interval.end).to be_truthy }
+    specify { expect(interval.overlap? interval.end-1..interval.end+1).to be_truthy }
+    specify { expect(interval.overlap? interval.end..interval.end+1).to be_falsy }
 
     specify { expect{|b| interval.step(1200, &b) }
         .to yield_successive_args now-duration, now-(duration-1200), now-(duration-2400) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerage
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Peter Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler