timerage 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40613d0f6bc616f4623f8978981997ca2d67ffeb
-  data.tar.gz: 287598ce1d9d8cb045f57a5921cbdaa083186af9
+  metadata.gz: a516908d80d7444bc7558fe488fe546aba2d123f
+  data.tar.gz: d3ca42c6b1190a24c9030f6e91cebb5844447c05
 SHA512:
-  metadata.gz: d2eaa461baf4a4a4dbcded999f71a9b622934c58021c19fb127c1fc66a5c8c38741dabdeaa8a1a70a7e74fcaab6056dab8bf56ea9a2c7794ee5a423300786286
-  data.tar.gz: c9d95fa2485232f2dc1da1d9b70ba056a5ca0877dbc2800e6f16e67b00beb834f6052262d80ecfd1f61a5ceb824c26020605b486e33a86f05a2fa00811c402fe
+  metadata.gz: aca0bf8520121da781d8e28a0f80974d619feba6f1e1a2f6b15055ff83e09489fc138a8dabfb47b594b43b738650294ed63ad089f9c2630e17a4467fc3c874d4
+  data.tar.gz: b73c86c3d951f1cd9571b63015647e67635d45a1cef8bec33d2794a213e08154765a0ea74575c7399a4e0dfd3522f5b0e651ef660b90624d0560233a25bfd6ba

data/lib/timerage/time_interval.rb

@@ -101,6 +101,24 @@ module Timerage
       false
     end
 
+    # Returns a new TimeInterval that is the intersection of `self` and `other`.
+    def &(other)
+      fail ArgumentError, "#{other} does not overlap #{self}" unless self.overlap? other
+
+      new_begin = [self.begin, other.begin].max
+      new_end,ex_end = if self.end > other.end
+                         [other.end, other.exclude_end?]
+                       elsif self.end < other.end
+                         [self.end, self.exclude_end?]
+                       elsif self.exclude_end? || other.exclude_end?
+                         [self.end, true]
+                       else
+                         [self.end, false]
+                       end
+
+      self.class.new(new_begin, new_end, ex_end)
+    end
+
     protected
 
     def rangeish?(an_obj)

data/lib/timerage/version.rb

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

data/spec/timerage/time_interval_spec.rb

@@ -51,6 +51,20 @@ describe Timerage::TimeInterval do
   specify { expect(interval <=> (interval.end+1..interval.end+2)).to eq -1}
   specify { expect(interval <=> interval).to eq 0}
 
+  describe "#&" do
+    specify { expect( interval & interval ).to eq interval }
+    specify { expect( interval & (interval.begin-1..interval.end+1) ).to eq interval }
+    specify { expect( interval & (interval.begin+1..interval.end+1) )
+              .to eq interval.begin+1..interval.end }
+    specify { expect( interval & (interval.begin-1..interval.end-1) )
+              .to eq interval.begin..interval.end-1 }
+    specify { expect( interval & (interval.begin...interval.end) ).to eq interval.begin...interval.end }
+    specify { expect( interval & (interval.begin...interval.end-1) )
+              .to eq interval.begin...interval.end-1 }
+    specify { expect( described_class.new(interval.begin...interval.end-1) & interval )
+              .to eq described_class.new(interval.begin...interval.end-1) }
+  end
+
   describe "==" do
     specify { expect( described_class.new(interval) == interval ).to be true }
     specify { expect( described_class.new(interval.begin, interval.end) == interval ).to be true }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerage
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Peter Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple refinement to Range to allow Time or Date as arguments
@@ -106,3 +106,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/timerage/time_interval_spec.rb
 - spec/timerage_spec.rb
+has_rdoc: