workhours 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c7f5dee953a61e1d670526c3088081f16f453c
-  data.tar.gz: 74efe9fef0d7f6499bf3041bc8965aba35da3bd0
+  metadata.gz: 6d67eead1df1869383adbbfee6573fed2b608d90
+  data.tar.gz: 7a24c465191919e9565d5a65d43f7af9286ba565
 SHA512:
-  metadata.gz: 8f138d644b682e8dc032de679f4742ac68764f0385fb24ce988b01d73b1c64a130164f37ab906eae55071e62a3bf605fc8ca052c59c44561e1ab38c058b1685f
-  data.tar.gz: b8fb21d8d847938d684b5e918c6876de77e11bcd91fd8f5294580028f76207cc78c4df64f959dfd59782b88fb25131167e9396e3d62bef7a9ff6e19c26363f94
+  metadata.gz: e0afdb28e9b70515ba5492cbf7853bf510289d71dd119042166ee5289d5efc2b869833512d4ba505f67e61f603de1f05359784738553634d38c44257eb802de5
+  data.tar.gz: 1a53f9dc9acb22a73a2d5ad3b11d9e6d3e1f88c91efbeacabe79f609b6ddc232e115ad08391bd4d2242ea057902efcc8bb2bab19652efd91fdd0ad85cefabb59

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    workhours (0.2.0)
+    workhours (0.2.1)
       tod (~> 2.0)
 
 GEM
@@ -9,28 +9,28 @@ GEM
   specs:
     diff-lcs (1.2.5)
     docile (1.1.5)
-    json (1.8.2)
+    json (1.8.3)
     rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    timecop (0.7.3)
-    tod (2.0.0)
+    timecop (0.7.4)
+    tod (2.0.2)
 
 PLATFORMS
   ruby
@@ -42,3 +42,6 @@ DEPENDENCIES
   simplecov
   timecop
   workhours!
+
+BUNDLED WITH
+   1.10.5

data/lib/workhours/period.rb

@@ -68,12 +68,14 @@ module Workhours
     def to_s
       "#{wday} #{beginning.to_s}-#{ending.to_s}"
     end
-    
+
     def overlaps?(other_day)
       if wday != other_day.wday
-        return false 
+        return false
       end
-      
+
+      return true if other_day.shift.beginning.second_of_day == 0 && other_day.shift.ending.second_of_day == 0
+
       open_inside = beginning > other_day.beginning && beginning < other_day.ending
       close_inside = ending > other_day.beginning && ending < other_day.ending
       outside = beginning < other_day.beginning && ending > other_day.ending

data/lib/workhours/version.rb

@@ -1,3 +1,3 @@
 module Workhours
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/workhours_spec.rb

@@ -91,6 +91,15 @@ describe 'Workhours' do
         week = Workhours::Week.new(hours: ['mon 15:00-16:00', 'mon 12:00-15:10'])
         week.hours_overlap?.length.should eq(2)
         week.hours_overlap?.should be_truthy
+        week = Workhours::Week.new(hours: ['mon 15:00-16:00', 'mon 00:00-00:00'])
+        week.hours_overlap?.length.should eq(2)
+        week.hours_overlap?.should be_truthy
+        week = Workhours::Week.new(hours: ['mon 00:00-00:00', 'mon 15:00-16:00'])
+        week.hours_overlap?.length.should eq(2)
+        week.hours_overlap?.should be_truthy
+        week = Workhours::Week.new(hours: ['mon 00:00-00:00', 'mon 00:00-00:00'])
+        week.hours_overlap?.length.should eq(2)
+        week.hours_overlap?.should be_truthy
 
         week = Workhours::Week.new(hours: ['mon 12:00-15:00', 'mon 15:00-16:00'])
         week.hours_overlap?.should eq(false)
@@ -259,6 +268,7 @@ describe 'Workhours' do
         holidays: [],
         week: %w(mon tue wed thu fri)
       })
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workhours
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tod