time_frame 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e147ffd05688d225d98d98b03df2055f8705fa
-  data.tar.gz: 52ce6f9719d59c49101b5eae4c25efa6f6bb90af
+  metadata.gz: 956de9d650db7ad301e9b4b903cd330b0630d866
+  data.tar.gz: 32c2a3d2249e19ee5ac6ad6335d15952c9278816
 SHA512:
-  metadata.gz: 8324b87fa0ad4685d2d793922f2a45923f16bad5fd2582534ad0df5ad9fa4bb77669cb79521836506c79e17b9dad0fc74a1af8e822c5e28fcb30a13fbc07042a
-  data.tar.gz: 3ffca269f990f2ecfe62d2beed4ac25bf5592b749ff0e71fb4aef019ff24741f6b25f231edde6c89ffc55d70abcc903b69e1a229db0c44084012d56522f584a8
+  metadata.gz: 0b1fe690605128abd552bb893a6e4176343c453738f92efa9c935b8e7876d89ed358ca8ecf155f0af8ddd2d1e6b23ec712a5a778b0fd3c3700645eeab2cf8845
+  data.tar.gz: 92c452c7bcd63b6651d545a3d41ea15b11e48d575b02899a54ebe0726d0668fee25d54a0ecb6c2e79fbbd6f06b277fd26818ee4eff896f521f573c2d048308b0

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 group :development, :test do
   gem 'geminabox'
+  gem 'byebug'
 end

data/lib/time_frame/time_frame_uniter.rb

@@ -10,12 +10,13 @@ class TimeFrame
 
     def unite
       frames = @sorted ? @time_frames : @time_frames.sort_by(&:min)
-      frames.each_with_object([]) do |frame, result|
-        last_frame = result.last
-        if last_frame && last_frame.cover?(frame.min)
-          result[-1] = TimeFrame.new(min: last_frame.min, max: frame.max)
+      frames.each_with_object([]) do |next_time_frame, result|
+        last_time_frame = result.last
+        if last_time_frame && last_time_frame.cover?(next_time_frame.min)
+          max = [last_time_frame.max, next_time_frame.max].max
+          result[-1] = TimeFrame.new(min: last_time_frame.min, max: max)
         else
-          result << frame
+          result << next_time_frame
         end
       end
     end

data/lib/time_frame/version.rb

@@ -1,5 +1,5 @@
 # Encoding: utf-8
 # gem version
 class TimeFrame
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/time_frame_spec.rb

@@ -395,6 +395,15 @@ describe TimeFrame do
             subject { TimeFrame.union([time_frame1, time_frame2]) }
             it { should eq expected }
           end
+          context 'that are overlapping and first contains the second' do
+            let(:time_frame1) { TimeFrame.new(min: time, duration: 3.hours) }
+            let(:time_frame2) do
+              TimeFrame.new(min: time + 1.hour, duration: 1.hour)
+            end
+            let(:expected) { [time_frame1] }
+            subject { TimeFrame.union([time_frame1, time_frame2]) }
+            it { should eq expected }
+          end
           context 'that are disjoint' do
             let(:time_frame1) { TimeFrame.new(min: time, duration: 2.hours) }
             let(:time_frame2) { time_frame1.shift_by(3.hours) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_frame
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Patrick Derichs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake