timerage 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ae2f36b387f927aad57a86abc300ed3465782a0
-  data.tar.gz: 8aa0c202c8cf41e5c1be6650c476a3b32a05a7f0
+  metadata.gz: 40613d0f6bc616f4623f8978981997ca2d67ffeb
+  data.tar.gz: 287598ce1d9d8cb045f57a5921cbdaa083186af9
 SHA512:
-  metadata.gz: 9f1762d865597b9f4c3604e8135bb2abb3bf4ce7cf6f75c7a4c0cfb02052044046394e6afaf57b919cb5e6c39a16620627556b7065607685878f5ce7ac5a704e
-  data.tar.gz: f144b3fbd7133e7194460e8a21a1bf1d4b47c9d3e3cbbecb4e376e556aa45c044fdb7b1164e14ebe6a52a21e242234345bcaff0e5607253a1354c7cf234bbe8a
+  metadata.gz: d2eaa461baf4a4a4dbcded999f71a9b622934c58021c19fb127c1fc66a5c8c38741dabdeaa8a1a70a7e74fcaab6056dab8bf56ea9a2c7794ee5a423300786286
+  data.tar.gz: c9d95fa2485232f2dc1da1d9b70ba056a5ca0877dbc2800e6f16e67b00beb834f6052262d80ecfd1f61a5ceb824c26020605b486e33a86f05a2fa00811c402fe

data/lib/timerage/time_interval.rb

@@ -15,6 +15,11 @@ module Timerage
 
     alias_method :to_time, :begin
 
+    # Returns number of seconds in this interval
+    def duration
+      self.end - self.begin
+    end
+
     def step(n, &blk)
       if block_given?
         time_enumerator(n).each(&blk)
@@ -27,19 +32,10 @@ module Timerage
       time_enumerator(seconds)
         .map{|t|
           end_time = [t+seconds, self.end].min
-          inclusive = (self.end == t && !exclude_end?) || t+seconds > self.end
+          inclusive = (t == end_time || t+seconds > self.end) && !exclude_end?
           TimeInterval.new(t, end_time, !inclusive) }
     end
 
-    def ==(other)
-      self.begin == other.begin &&
-        self.end == other.end &&
-        self.exclude_end? == other.exclude_end?
-
-    rescue NoMethodError
-      false
-    end
-
     # Return new TimeInterval that is the concatenation of self and
     # other (if possible).
     #

data/lib/timerage/version.rb

@@ -1,3 +1,3 @@
 module Timerage
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/spec/timerage/time_interval_spec.rb

@@ -33,6 +33,7 @@ describe Timerage::TimeInterval do
             .to eq "#{interval.begin.iso8601}/#{interval.end.iso8601}" }
   specify { expect(interval.iso8601(3))
             .to eq "#{interval.begin.iso8601(3)}/#{interval.end.iso8601(3)}" }
+  specify { expect( interval.duration).to eq duration  }
 
   specify { expect(interval.cover? interval.begin+1..interval.end-1).to be_truthy }
   specify { expect(interval.cover? interval.begin...interval.end).to be_truthy }
@@ -77,19 +78,6 @@ describe Timerage::TimeInterval do
     specify { expect{ interval + nonadjacent_time_range }.to raise_error ArgumentError }
   end
 
-
-  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}
@@ -103,15 +91,28 @@ describe Timerage::TimeInterval do
     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.cover? interval.begin+1..interval.end-1).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..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(interval.overlap? interval.begin-2..interval.begin-1).to be_falsy }
+    specify { expect(interval.overlap? interval.end+1..interval.end+2).to be_falsy }
+    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.begin+1..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 }
 
+    specify { expect( interval.slice(duration/2) )
+              .to eq [now-duration...now-duration/2, now-duration/2...now, now..now] }
+    specify { expect( interval.slice(duration/2 + 1) )
+              .to eq [now-duration...((now-duration/2)+1), (now-duration/2)+1..now] }
+
     context "duration of non-integer steps" do
       specify { expect{|b| interval.step(1000, &b) }
           .to yield_successive_args now-duration, now-(duration-1000), now-(duration-2000), now-(duration-3000) }
@@ -139,6 +140,11 @@ describe Timerage::TimeInterval do
     specify { expect{|b| interval.step(1200, &b) }
         .to yield_successive_args now-duration, now-(duration-1200), now-(duration-2400) }
 
+    specify { expect( interval.slice(duration/2) )
+              .to eq [now-duration...now-duration/2, now-duration/2...now] }
+    specify { expect( interval.slice((duration/2) + 1) )
+              .to eq [now-duration...((now-duration/2)+1), (now-duration/2)+1...now] }
+    specify { expect( interval.duration).to eq duration }
   end
 
   matcher :behave_like_a do |expected|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerage
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Peter Williams