opening_hours 0.0.6 → 0.0.7

data/lib/opening_hours.rb

@@ -99,16 +99,17 @@ class OpeningHours
     break_hours = get_break_hours(today)
     # here is possible to use strict greater operator if you want to stop on edge of previous business day.
     # see "BusinessHours schedule without exceptions should flip the edge" spec
-
-    if open_hours.open + job_duration >= break_hours.open
-      job_duration += break_hours_duration
-    end
-
-    while job_duration >= (open_hours.duration - break_hours_duration)
-      job_duration -= open_hours.duration + break_hours_duration
+    
+    while job_duration >= open_hours.duration
+      job_duration -= open_hours.duration
 
       today = today.next
       open_hours = get_open_hours(today)
+      break_hours = get_break_hours(today)
+    end
+
+    if (open_hours.open + job_duration).between?(break_hours.open, break_hours.close)
+      job_duration += break_hours_duration
     end
 
     Time.zone.local(today.year, today.month, today.day, *TimeUtils::time_from_midnight(open_hours.open + job_duration)).to_formatted_s(:rfc822)

data/lib/opening_hours/version.rb

@@ -1,3 +1,3 @@
 class OpeningHours
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/opening_hours_spec.rb

@@ -228,6 +228,8 @@ describe OpeningHours do
     before do
       @hours = OpeningHours.new("9:00 AM", "4:00 PM", "Europe/Moscow")
       @hours.break :fri, "01:00 PM", "01:30 PM"
+      @hours.break :sat, "01:00 PM", "01:30 PM"
+      @hours.break :sun, "01:25 PM", "01:55 PM"
     end
 
     it "should open at 1:30 pm after the break" do
@@ -241,6 +243,10 @@ describe OpeningHours do
     it "should open at 2:00 pm next day" do
       @hours.calculate_deadline(8*60*60, "Mar 22, 2013 01:00 PM +0400").should == Time.zone.parse("Mar 23, 2013 2:00 PM").to_formatted_s(:rfc822)
     end
+
+    it "should open at 1:30 pm next day" do
+      @hours.calculate_deadline(7*60*60, "Mar 22, 2013 01:00 PM +0400").should == Time.zone.parse("Mar 23, 2013 1:30 PM").to_formatted_s(:rfc822)
+    end
   end
 
   context "with breaks and now open" do
@@ -260,6 +266,21 @@ describe OpeningHours do
       end
     end
 
+    context "with currently not in break" do
+      before do
+        open_time = Time.local(Date.today.year, Date.today.month, Date.today.day, Time.now.hour-2).strftime("%I:%M %p")
+        close_time = Time.local(Date.today.year, Date.today.month, Date.today.day, Time.now.hour+5).strftime("%I:%M %p")
+        break_start_time = Time.local(Date.today.year, Date.today.month, Date.today.day, Time.now.hour-1).strftime("%I:%M %p")
+        break_end_time = Time.local(Date.today.year, Date.today.month, Date.today.day, Time.now.hour-1, 30).strftime("%I:%M %p")
+        @hours = OpeningHours.new(open_time, close_time, "Europe/Berlin")
+        @hours.break OpeningHours::WEEK_DAYS[Date.today.wday], break_start_time, break_end_time
+      end
+
+      it "should should be open" do
+        @hours.now_open?.should == true
+      end
+    end
+
     context "with currently in break" do
       before do
         open_time = Time.local(Date.today.year, Date.today.month, Date.today.day, Time.now.hour-2).strftime("%I:%M %p")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec