timerage 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2ce967a8b55c69a7296b30f83b8e4cbf187926
-  data.tar.gz: fac80cd77fdacd79a53c76f54c7c15943da8b932
+  metadata.gz: d9c4a01a7d8ba83c2829e4bec7eaf00e33ae4beb
+  data.tar.gz: b60764ca0beb7a138de33035b849cd2ac132adf2
 SHA512:
-  metadata.gz: a4eafa5361792a724815d1c90a1c44f7f63b37bfe82ee08015310c98205bb87bbb6d5984802372b8c2adfedd3d5feafc711ea5a9f29437fc8fb4eed692540465
-  data.tar.gz: 9049a7ddff2190f712eadea970f727fa0d9ca9fcd4c1e04f65d37d7a82506e56b2b8ef97ee874c4b40e7961466062ab2c89ba27f94483df4e9d878a9107e43f0
+  metadata.gz: 9eac547686f938795999e6d02220917a4ac884a45f9a1c6bdef6473a8529a07ba65ead34bafd28cdd67bf6b081e3917f9f7b2e3ecc6ba17ee9f8390f1a9ff0e6
+  data.tar.gz: d4cb8f8dbd21380b4da2ce7d7ba9d8f8e426b8053101738b4f45c8d4b0936fe4be261e06a9fbc758ed119119e34d7d2927446c35649f32d777661fbd9a3ebdc1

data/lib/timerage/time_interval.rb

@@ -23,12 +23,27 @@ module Timerage
       end
     end
 
+    # Return new TimeInterval that is the concatenation of self and
+    # other (if possible).
+    #
+    # Raises ArgumentError if other is not adjacent to self
+    # chronologically.
+    def +(other)
+      fail ArgumentError, "other must be adjacent to self" unless adjacent_to?(other)
+
+      self.class.new([self.begin, other.begin].min, [self.end, other.end].max)
+    end
+
     # Returns an ISO8601 interval representation of self
     # Takes same args as Time#iso8601
     def iso8601(*args)
       "#{self.begin.iso8601(*args)}/#{self.end.iso8601(*args)}"
     end
 
+    def adjacent_to?(other)
+      other.begin == self.end || other.end == self.begin
+    end
+
     protected
 
     def rangeish?(an_obj)

data/lib/timerage/version.rb

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

data/spec/timerage/time_interval_spec.rb

@@ -34,7 +34,29 @@ describe Timerage::TimeInterval do
   specify { expect(interval.iso8601(3))
             .to eq "#{interval.begin.iso8601(3)}/#{interval.end.iso8601(3)}" }
 
-  context "interval include end" do
+  describe "+" do
+    let(:adjacent_preceding_time_range) { interval.begin-42..interval.begin }
+    let(:adjacent_following_time_range) { interval.end..interval.end+42 }
+    let(:nonadjacent_time_range) { interval.end+1..interval.end+42 }
+
+    specify { expect( interval + adjacent_following_time_range  )
+              .to be_kind_of described_class }
+    specify { expect( interval + adjacent_following_time_range  )
+              .to end_at adjacent_following_time_range.end }
+    specify { expect( interval + adjacent_following_time_range )
+              .to begin_at interval.begin }
+
+    specify { expect( interval + adjacent_preceding_time_range )
+              .to be_kind_of described_class }
+    specify { expect( interval + adjacent_preceding_time_range  )
+              .to end_at interval.end }
+    specify { expect( interval + adjacent_preceding_time_range  )
+              .to begin_at adjacent_preceding_time_range.begin }
+
+    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 }
     specify { expect(interval.cover? now - duration).to be true }
@@ -51,7 +73,7 @@ describe Timerage::TimeInterval do
     end
   end
 
-  context "interval exclude end" do
+  context "exclusive end" do
     subject(:interval) { described_class.new(now-duration...now) }
 
     specify { expect(interval.exclude_end?).to be true }
@@ -71,4 +93,16 @@ describe Timerage::TimeInterval do
       Set[*expected.instance_methods].subset? Set[*actual.methods]
     end
   end
+
+  matcher :begin_at do |expected|
+    match do |actual|
+      expect( actual.begin ).to eq expected
+    end
+  end
+
+  matcher :end_at do |expected|
+    match do |actual|
+      expect( actual.end ).to eq expected
+    end
+  end
 end

metadata

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