opening_hours 0.0.2 → 0.0.3

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 Init new hours object:
 ```ruby
-hours = OpeningHours.new("9:00 AM", "3:00 PM", "Berlin")
+hours = OpeningHours.new("9:00 AM", "3:00 PM", "Europe/Berlin")
 ```
 
 Methods to set the hours, closed times or holidays:
@@ -34,11 +34,11 @@ Calculate the deadline (next available working hour)
 ```ruby
 # offset and time
 hours.calculate_deadline(4*60*60, "Dec 23, 2010 8:00 PM")
- => "Fri, 24 Dec 2010 12:00:00 +0100" 
+  => "Fri, 24 Dec 2010 13:00:00 +0100" 
 
 # now with timezone
 hours.calculate_deadline(0, "Dec 23, 2010 9:00 AM -0400")
- => "Thu, 23 Dec 2010 14:00:00 +0100"
+  => "Thu, 23 Dec 2010 14:00:00 +0100" 
 ```
 
 Check if business is open right now:
@@ -46,6 +46,22 @@ Check if business is open right now:
 hours.now_open?
 ```
 
+And get all week days with values:
+```ruby
+hours.week.each do |day|
+  puts day[1].open
+end
+```
+
+Get human readable opening/close hours
+```ruby
+hours.week[:mon].open.to_human_readable_hours
+ => "09:00 AM" 
+
+hours.week[:mon].close.to_human_readable_hours
+ => "03:00 PM" 
+```
+
 ## Contributing
 
 1. Fork it

data/lib/opening_hours.rb

@@ -20,9 +20,9 @@ class OpeningHours
     CLOSED = new(0, 0)
 
     def self.parse(open, close)
-      open  = Time.parse(open)
-      close = Time.parse(close)
-    
+      open  = Time.zone.parse(open)
+      close = Time.zone.parse(close)
+
       open  = TimeUtils::seconds_from_midnight(open)
       close = TimeUtils::seconds_from_midnight(close)
     
@@ -58,10 +58,10 @@ class OpeningHours
 
   WEEK_DAYS = Time::RFC2822_DAY_NAME.map { |m| m.downcase.to_sym }
 
-  def initialize(start_time, end_time, time_zone = Time.now.gmt_offset)
-    open_hours = OpenHours.parse(start_time, end_time)
+  def initialize(start_time, end_time, time_zone = 'Europe/London')
+    Time.zone = time_zone
 
-    @time_zone = time_zone
+    open_hours = OpenHours.parse(start_time, end_time)
 
     @week = {}
     WEEK_DAYS.each do |day|
@@ -71,10 +71,7 @@ class OpeningHours
     @specific_days = {}
   end
 
-  def update(day, start_time, end_time, time_zone = Time.now.zone)
-
-    @time_zone = time_zone
-
+  def update(day, start_time, end_time)
     set_open_hours day, OpenHours.parse(start_time, end_time)
   end
 
@@ -89,7 +86,6 @@ class OpeningHours
   end
 
   def calculate_deadline(job_duration, start_date_time)
-    Time.zone = @time_zone
     start_date_time = Time.zone.parse(start_date_time)
 
     today = Date.civil(start_date_time.year, start_date_time.month, start_date_time.day)
@@ -124,10 +120,10 @@ class OpeningHours
 
 end
 
-class Time
-  class << self
-    def parse_rfc822(date, now=self.now)
-      parse(date, now).to_formatted_s(:rfc822)
-    end
+class Fixnum
+  def to_human_readable_hours
+    t = Time.local(Date.today.year, Date.today.month, Date.today.day)
+    t += self.seconds
+    t.strftime("%I:%M %p")
   end
-end
+end

data/lib/opening_hours/version.rb

@@ -1,3 +1,3 @@
 class OpeningHours
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/opening_hours_spec.rb

@@ -14,30 +14,30 @@ describe OpeningHours do
   it { should respond_to(:week) }
 
   context "schedule without exceptions" do
-    before { @hours = OpeningHours.new("9:00 AM", "3:00 PM") }
+    before { @hours = OpeningHours.new("9:00 AM", "3:00 PM", "Europe/Berlin") }
 
     it "should handle start time during open hours" do
-      @hours.calculate_deadline(1*60*60, "Jun 7, 2010 9:10 AM").should == Time.parse_rfc822("Jun 7, 2010 10:10 AM")
+      @hours.calculate_deadline(1*60*60, "Jun 7, 2010 9:10 AM").should == Time.zone.parse("Jun 7, 2010 10:10 AM").to_formatted_s(:rfc822)
     end
 
     it "should handle start time before open hours" do
-      @hours.calculate_deadline(2*60*60, "Jun 7, 2010 8:45 AM").should == Time.parse_rfc822("Jun 7, 2010 11:00 AM")
+      @hours.calculate_deadline(2*60*60, "Jun 7, 2010 8:45 AM").should == Time.zone.parse("Jun 7, 2010 11:00 AM").to_formatted_s(:rfc822)
     end
 
     it "should handle start time after open hours" do
-      @hours.calculate_deadline(2*60*60, "Jun 7, 2010 10:45 PM").should == Time.parse_rfc822("Jun 8, 2010 11:00 AM")
+      @hours.calculate_deadline(2*60*60, "Jun 7, 2010 10:45 PM").should == Time.zone.parse("Jun 8, 2010 11:00 AM").to_formatted_s(:rfc822)
     end
 
     it "should finish job next day if not enough time left" do
-      @hours.calculate_deadline(2*60*60, "Jun 7, 2010 2:45 PM").should == Time.parse_rfc822("Jun 8, 2010 10:45 AM")
+      @hours.calculate_deadline(2*60*60, "Jun 7, 2010 2:45 PM").should == Time.zone.parse("Jun 8, 2010 10:45 AM").to_formatted_s(:rfc822)
     end
 
     it "should process huge job for several days" do
-      @hours.calculate_deadline(20*60*60, "Jun 7, 2010 10:45 AM").should == Time.parse_rfc822("Jun 10, 2010 12:45 PM")
+      @hours.calculate_deadline(20*60*60, "Jun 7, 2010 10:45 AM").should == Time.zone.parse("Jun 10, 2010 12:45 PM").to_formatted_s(:rfc822)
     end
 
     it "should flip the edge" do
-      @hours.calculate_deadline(6*60*60, "Jun 7, 2010 9:00 AM").should == Time.parse_rfc822("Jun 8, 2010 9:00 AM")
+      @hours.calculate_deadline(6*60*60, "Jun 7, 2010 9:00 AM").should == Time.zone.parse("Jun 8, 2010 9:00 AM").to_formatted_s(:rfc822)
     end
 
     # this is also possible, but I prefer previous variant
@@ -49,19 +49,19 @@ describe OpeningHours do
     context "on dst changes" do
 
       it "should respect changing to dst" do
-        @hours.calculate_deadline(8*60*60, "March 27, 2010 2:00 PM").should == Time.parse_rfc822("March 29, 2010 10:00 AM")
+        @hours.calculate_deadline(8*60*60, "March 27, 2010 2:00 PM").should == Time.zone.parse("March 29, 2010 10:00 AM").to_formatted_s(:rfc822)
       end
 
       it "should respect changing to dst" do
-        @hours.calculate_deadline(2*60*60, "March 27, 2010 2:00 PM").should == Time.parse_rfc822("March 28, 2010 10:00 AM")
+        @hours.calculate_deadline(2*60*60, "March 27, 2010 2:00 PM").should == Time.zone.parse("March 28, 2010 10:00 AM").to_formatted_s(:rfc822)
       end
 
       it "should respect changing from dst" do
-        @hours.calculate_deadline(8*60*60, "October 31, 2010 2:00 PM").should == Time.parse_rfc822("November 2, 2010 10:00 AM")
+        @hours.calculate_deadline(8*60*60, "October 31, 2010 2:00 PM").should == Time.zone.parse("November 2, 2010 10:00 AM").to_formatted_s(:rfc822)
       end
 
       it "should respect changing from dst" do
-        @hours.calculate_deadline(2*60*60, "October 31, 2010 2:00 PM").should == Time.parse_rfc822("November 1, 2010 10:00 AM")
+        @hours.calculate_deadline(2*60*60, "October 31, 2010 2:00 PM").should == Time.zone.parse("November 1, 2010 10:00 AM").to_formatted_s(:rfc822)
       end
 
     end
@@ -75,11 +75,11 @@ describe OpeningHours do
     end
 
     it "should skip closed days" do
-      @hours.calculate_deadline(2*60*60, "Jun 5, 2010 2:45 PM").should == Time.parse_rfc822("Jun 7, 2010 10:45 AM")
+      @hours.calculate_deadline(2*60*60, "Jun 5, 2010 2:45 PM").should == Time.zone.parse("Jun 7, 2010 10:45 AM").to_formatted_s(:rfc822)
     end
 
     it "should skip closed days even if work scheduled to closed day" do
-      @hours.calculate_deadline(2*60*60, "Jun 6, 2010 11:45 AM").should == Time.parse_rfc822("Jun 7, 2010 11:00 AM")
+      @hours.calculate_deadline(2*60*60, "Jun 6, 2010 11:45 AM").should == Time.zone.parse("Jun 7, 2010 11:00 AM").to_formatted_s(:rfc822)
     end
   end
 
@@ -91,11 +91,11 @@ describe OpeningHours do
     end
 
     it "should skip closed days" do
-      @hours.calculate_deadline(2*60*60, "Dec 24, 2010 2:45 PM").should == Time.parse_rfc822("Dec 26, 2010 10:45 AM")
+      @hours.calculate_deadline(2*60*60, "Dec 24, 2010 2:45 PM").should == Time.zone.parse("Dec 26, 2010 10:45 AM").to_formatted_s(:rfc822)
     end
 
     it "should skip closed days even if work scheduled to closed day" do
-      @hours.calculate_deadline(2*60*60, "Dec 25, 2010 11:45 AM").should == Time.parse_rfc822("Dec 26, 2010 11:00 AM")
+      @hours.calculate_deadline(2*60*60, "Dec 25, 2010 11:45 AM").should == Time.zone.parse("Dec 26, 2010 11:00 AM").to_formatted_s(:rfc822)
     end
 
   end
@@ -108,7 +108,7 @@ describe OpeningHours do
     end
 
     it "should skip closed days" do
-      @hours.calculate_deadline(2*60*60, "Dec 24, 2010 2:45 PM").should == Time.parse_rfc822("Dec 27, 2010 10:45 AM")
+      @hours.calculate_deadline(2*60*60, "Dec 24, 2010 2:45 PM").should == Time.zone.parse("Dec 27, 2010 10:45 AM").to_formatted_s(:rfc822)
     end
   end
 
@@ -119,7 +119,7 @@ describe OpeningHours do
     end
 
     it "should spend open hours" do
-      @hours.calculate_deadline(14*60*60, "Jun 3, 2010 9:00 AM").should == Time.parse_rfc822("Jun 5, 2010 10:00 AM")
+      @hours.calculate_deadline(14*60*60, "Jun 3, 2010 9:00 AM").should == Time.zone.parse("Jun 5, 2010 10:00 AM").to_formatted_s(:rfc822)
     end
 
   end
@@ -131,11 +131,11 @@ describe OpeningHours do
     end
 
     it "should spend open hours" do
-      @hours.calculate_deadline(12*60*60, "Dec 23, 2010 9:00 AM").should == Time.parse_rfc822("Dec 25, 2010 10:00 AM")
+      @hours.calculate_deadline(12*60*60, "Dec 23, 2010 9:00 AM").should == Time.zone.parse("Dec 25, 2010 10:00 AM").to_formatted_s(:rfc822)
     end
 
     it "should spend open hours if started at the day" do
-      @hours.calculate_deadline(6*60*60, "Dec 24, 2010 12:00 PM").should == Time.parse_rfc822("Dec 25, 2010 2:00 PM")
+      @hours.calculate_deadline(6*60*60, "Dec 24, 2010 12:00 PM").should == Time.zone.parse("Dec 25, 2010 2:00 PM").to_formatted_s(:rfc822)
     end
 
   end
@@ -150,29 +150,32 @@ describe OpeningHours do
     end
 
     it "should pass test #1" do
-      @hours.calculate_deadline(2*60*60, "Jun 7, 2010 9:10 AM").should == Time.parse_rfc822("Mon Jun 07 11:10:00 2010")
+      @hours.calculate_deadline(2*60*60, "Jun 7, 2010 9:10 AM").should == Time.zone.parse("Mon Jun 07 11:10:00 2010").to_formatted_s(:rfc822)
     end
 
     it "should pass test #2" do
-      @hours.calculate_deadline(15*60, "Jun 8, 2010 2:48 PM").should == Time.parse_rfc822("Thu Jun 10 09:03:00 2010")
+      @hours.calculate_deadline(15*60, "Jun 8, 2010 2:48 PM").should == Time.zone.parse("Thu Jun 10 09:03:00 2010").to_formatted_s(:rfc822)
     end
 
     it "should pass test #3" do
-      @hours.calculate_deadline(7*60*60, "Dec 24, 2010 6:45 AM").should == Time.parse_rfc822("Mon Dec 27 11:00:00 2010")
+      @hours.calculate_deadline(7*60*60, "Dec 24, 2010 6:45 AM").should == Time.zone.parse("Mon Dec 27 11:00:00 2010").to_formatted_s(:rfc822)
     end
 
   end
 
   context "timezone checks" do
     before do
-      Time.zone = "Moscow"
-      @hours = OpeningHours.new("9:00 AM", "3:00 PM", "Moscow")
+      @hours = OpeningHours.new("9:00 AM", "3:00 PM", "Europe/Moscow")
     end
 
     it "should spend open hours in the right time zone" do
       @hours.calculate_deadline(2*60*60, "Dec 23, 2010 9:00 AM").should == Time.zone.parse("Dec 23, 2010 11:00 AM").to_formatted_s(:rfc822)
     end
 
+    it "should spend open hours in the right time zone" do
+      @hours.calculate_deadline(2*60*60, "Dec 23, 2010 2:00 PM").should == Time.zone.parse("Dec 24, 2010 10:00 AM").to_formatted_s(:rfc822)
+    end
+
     it "should spend open hours in the right time zone" do
       @hours.calculate_deadline(4*60*60, "Dec 23, 2010 8:00 PM -0900").should == Time.zone.parse("Dec 24, 2010 01:00 PM").to_formatted_s(:rfc822)
     end
@@ -183,4 +186,15 @@ describe OpeningHours do
 
   end
 
+  context "check accessors" do
+    before do
+      @hours = OpeningHours.new("9:00 AM", "3:00 PM", "Europe/Moscow")
+    end
+
+    it "should respond to human readable times" do
+      @hours.week[:mon].open.to_human_readable_hours == "09:00 AM"      
+      @hours.week[:mon].close.to_human_readable_hours == "03:00 PM"      
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: