opening_hours 0.0.5 → 0.0.6

data/README.md

@@ -26,6 +26,7 @@ hours = OpeningHours.new("9:00 AM", "3:00 PM", "Europe/Berlin")
 Methods to set the hours, closed times or holidays:
 ```ruby
 hours.update :fri, "10:00 AM", "5:00 PM"
+hours.break :fri, "01:00 PM", "1:30 PM"
 hours.update "Dec 24, 2010", "8:00 AM", "1:00 PM"
 hours.closed :sun, :wed, "Dec 25, 2010"
 ```
@@ -62,6 +63,15 @@ hours.week[:mon].close.to_human_readable_hours
  => "03:00 PM" 
 ```
 
+You can fetch breaks also. Sorry for confusion... but i used same OpeningHour class for breaks as for the original hours.. thats why the attributes here are open and close too. But actually .open and .close means when break starts and ends.
+```ruby
+hours.breaks[:fri].open.to_human_readable_hours
+ => "01:00 AM" 
+
+hours.breaks[:fri].close.to_human_readable_hours
+ => "01:30 PM" 
+```
+
 ## Contributing
 
 1. Fork it

data/lib/opening_hours/version.rb

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

data/lib/opening_hours.rb

@@ -54,7 +54,7 @@ class OpeningHours
   end
 
   # makes it possible to access each day like: b.week[:sun].open, or iterate through all weekdays
-  attr_reader :week
+  attr_reader :week, :breaks
 
   WEEK_DAYS = Time::RFC2822_DAY_NAME.map { |m| m.downcase.to_sym }
 
@@ -69,6 +69,7 @@ class OpeningHours
     end
 
     @specific_days = {}
+    @breaks = {}
   end
 
   def update(day, start_time, end_time)
@@ -81,6 +82,10 @@ class OpeningHours
     end
   end
 
+  def break(day, start_time, end_time)
+    set_break_hours day, OpenHours.parse(start_time, end_time)
+  end
+
   def now_open?
     calculate_deadline(0, Time.zone.now.to_s) == Time.zone.now.to_formatted_s(:rfc822)
   end
@@ -90,11 +95,17 @@ class OpeningHours
 
     today = Date.civil(start_date_time.year, start_date_time.month, start_date_time.day)
     open_hours = get_open_hours(today).offset(TimeUtils::seconds_from_midnight(start_date_time))
-
+    break_hours_duration = get_break_duration(today)
+    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
-    while job_duration >= open_hours.duration
-      job_duration -= open_hours.duration
+
+    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
 
       today = today.next
       open_hours = get_open_hours(today)
@@ -118,6 +129,24 @@ class OpeningHours
     end
   end
 
+  def get_break_hours(date)
+    @breaks[WEEK_DAYS[date.wday]] ||= OpenHours.new(0, 0)
+  end
+
+  def set_break_hours(day, break_hours)
+    case day
+    when Symbol
+      @breaks[day] = break_hours
+    end
+  end
+
+  def get_break_duration(date)
+    bhours = get_break_hours(date)
+    if bhours
+      bhours.close - bhours.open
+    end
+  end
+
 end
 
 Fixnum.class_eval do

data/spec/opening_hours_spec.rb

@@ -223,4 +223,58 @@ describe OpeningHours do
     end
   end
 
+  context "with breaks" do
+
+    before do
+      @hours = OpeningHours.new("9:00 AM", "4:00 PM", "Europe/Moscow")
+      @hours.break :fri, "01:00 PM", "01:30 PM"
+    end
+
+    it "should open at 1:30 pm after the break" do
+      @hours.calculate_deadline(0, "Mar 22, 2013 01:00 PM +0400").should == Time.zone.parse("Mar 22, 2013 1:30 PM").to_formatted_s(:rfc822)
+    end
+
+    it "should open at 9:00 am next day" do
+      @hours.calculate_deadline(3*60*60, "Mar 22, 2013 01:00 PM +0400").should == Time.zone.parse("Mar 23, 2013 9:00 AM").to_formatted_s(:rfc822)
+    end
+
+    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
+  end
+
+  context "with breaks and now open" do
+
+    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+2).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")
+        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).strftime("%I:%M %p")
+        break_end_time = Time.local(Date.today.year, Date.today.month, Date.today.day, Time.now.hour+1).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 be closed" do
+        @hours.now_open?.should == false
+      end
+    end
+
+  end
+
 end

metadata

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