business_time 0.2.2 → 0.3.0

data/README.rdoc

@@ -92,9 +92,20 @@ The generator will add a /config/business_time.yml and a /config/initializers/bu
 == Outside of Rails
 This code does depend on ActiveSupport, but nothing else within rails.  Even then, it would be pretty easy to break that dependency as well (but would add some code bloat and remove some clarity).  Feel free to use it on any ruby project you'd like!
 
+== Timezone support
+This gem strives to be timezone-agnostic.  Due to some complications in the handling of timezones in the built in Time class, and some complexities (bugs?) in the timeWithZone class, this was harder than expected... but here's the idea:
+ * When you configure the gem with something like 9:00am as the start time, this is agnostic of time zone.
+ * When you are dealing with a Time or TimeWithZone class, the timezone is preserved and the beginning and end of times for the business day are referenced in that time zone.
+ 
+This can lead to some wierd looking effects if, say, you are in the Eastern time zone but doing everything in UTC times...  Your business day will appear to start and end at 9:00 and 5:00 UTC.  If this seems perplexing to you, I can almost guarantee you are in over your head with timezones in other ways too, this is just the first place you encountered it.  Timezone relative date handling gets more and more complicated every time you look at it and takes a long time before it starts to seem simple again.  I'm hoping Arild and I write some good blog entries on the subject at http://blog.codesherpas.com.
+
 == Contributors
  * David Bock  http://github.com/bokmann
  * Enrico Bianco  http://github.com/enricob
+ * Arild Shirazi  http://github.com/ashirazi
+ 
+ (Special thanks for Arild on the complexities of dealing with TimeWithZone)
+ 
 == Note on Patches/Pull Requests
  
 * Fork the project.
@@ -108,7 +119,6 @@ This code does depend on ActiveSupport, but nothing else within rails.  Even the
 == TODO
 * I'd like to return ActiveSupport::TimeWithZone just like the equivalent ActiveSupport helpers do.
 * if it doesn't pollute the logic too much, I'd like to vary the days counted as 'business days'.  Bakers often don't work on Mondays, for instance.
-* We don't care much about timezones.  Dunno if thats an issue.
 
 == Copyright
 

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "dbock@codesherpas.com"
     gem.homepage = "http://github.com/bokmann/business_time"
     gem.authors = ["bokmann"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "shoulda", ">= 0"
     gem.add_dependency('activesupport','>= 2.0.0')
     gem.files += FileList['lib/generators/**/*.rb']
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/business_time/business_days.rb

@@ -6,10 +6,11 @@ module BusinessTime
     end
 
     def after(time = Time.now)
+      time = Time.zone ? Time.zone.parse(time.to_s) : Time.parse(time.to_s)
       @days.times do
         begin
           time = time + 1.day
-        end until time.workday?
+        end until Time.workday?(time)
       end
       time
     end
@@ -18,10 +19,11 @@ module BusinessTime
     alias_method :since, :after
     
     def before(time = Time.now)
+      time = Time.zone ? Time.zone.parse(time.to_s) : Time.parse(time.to_s)
       @days.times do
         begin
           time = time - 1.day
-        end until time.workday?
+        end until Time.workday?(time)
       end
       time
     end
@@ -31,4 +33,4 @@ module BusinessTime
   
   end  
   
-end
+end

data/lib/business_time/business_hours.rb

@@ -4,53 +4,66 @@ module BusinessTime
     def initialize(hours)
       @hours = hours
     end
-    
+
     def ago
-      before(Time.now)
+      Time.zone ? before(Time.zone.now) : before(Time.now)
     end
-    
+
     def from_now
-      after(Time.now)
+      Time.zone ?  after(Time.zone.now) : after(Time.now)
     end
-     
+
     def after(time)
-      time = time.roll_forward
-      @hours.times do 
-        time = time + 1.hour  #add an hour
-        
-        if (time > time.end_of_workday)
-          time = time + off_hours  # if that pushes us past business hours,
-        end                        # roll into the next day
-        
-        while !time.workday?
-          time = time + 1.day      # if that pushes us into a non-business day,
-        end                        # find the next business day
+      after_time = Time.roll_forward(time)
+      # Step through the hours, skipping over non-business hours
+      @hours.times do
+        after_time = after_time + 1.hour
+
+        # Ignore hours before opening and after closing
+        if (after_time > Time.end_of_workday(after_time))
+          after_time = after_time + off_hours
+        end
+
+        # Ignore weekends and holidays
+        while !Time.workday?(after_time)
+          after_time = after_time + 1.day
+        end
       end
-      time
+      after_time
     end
-            
+
     def before(time)
-      time = time.roll_forward
-      @hours.times do 
-        time = time - 1.hour  #subtract an hour
-        
-        if (time < time.beginning_of_workday)
-          time = time - off_hours  # if that pushes us before business hours,
-        end                        # roll into the previous day
-        
-        while !time.workday?
-          time = time - 1.day      # if that pushes us into a non-business day,
-        end                        # find the previous business day
+      before_time = Time.roll_forward(time)
+      # Step through the hours, skipping over non-business hours
+      @hours.times do
+        before_time = before_time - 1.hour
+
+        # Ignore hours before opening and after closing
+        if (before_time < Time.beginning_of_workday(before_time))
+          before_time = before_time - off_hours
+        end
+
+        # Ignore weekends and holidays
+        while !Time.workday?(before_time)
+          before_time = before_time - 1.day
+        end
       end
-      time
+      before_time
     end
-    
+
     private
-    
+
     def off_hours
-      @gap ||= Time.parse(BusinessTime::Config.beginning_of_workday) - 
-              (Time.parse(BusinessTime::Config.end_of_workday) - 1.day)
+      return @gap if @gap
+      if Time.zone
+        gap_end = Time.zone.parse(BusinessTime::Config.beginning_of_workday)
+        gap_begin = (Time.zone.parse(BusinessTime::Config.end_of_workday)-1.day)
+      else
+        gap_end = Time.parse(BusinessTime::Config.beginning_of_workday)
+        gap_begin = (Time.parse(BusinessTime::Config.end_of_workday) - 1.day)
+      end
+      @gap = gap_end - gap_begin
     end
   end
-  
-end
+
+end

data/lib/business_time/config.rb

@@ -22,6 +22,7 @@ module BusinessTime
       #   BusinessTime::Config.holidays << my_holiday_date_object
       # someplace in the initializers of your application.
       attr_accessor :holidays
+
     end
     
     def self.reset
@@ -45,7 +46,8 @@ module BusinessTime
       self.beginning_of_workday = data["business_time"]["beginning_of_workday"]
       self.end_of_workday = data["business_time"]["end_of_workday"]
       data["business_time"]["holidays"].each do |holiday|
-        self.holidays << Date.parse(holiday)
+        self.holidays <<
+          Time.zone ? Time.zone.parse(holiday) : Time.parse(holiday)
       end
       
     end

data/lib/extensions/time.rb

@@ -1,54 +1,66 @@
 # Add workday and weekday concepts to the Time class
 class Time
-  def end_of_workday
-    Time.parse self.strftime("%B %d %Y #{BusinessTime::Config.end_of_workday}")  
-  end
-  
-  def beginning_of_workday
-    Time.parse self.strftime("%B %d %Y #{BusinessTime::Config.beginning_of_workday}")
-  end
-  
-  def workday?
-    self.weekday? && !BusinessTime::Config.holidays.include?(self.to_date)
-  end
-  
-  def weekday?
-    [1,2,3,4,5].include? self.wday
-  end
-  
+  class << self
 
-  def outsize_business_hours?
-    before_business_hours? || after_business_hours? || !workday?
-  end
-  
-  # rolls forward to the next beginning_of_workday
-  # when the time is outside of business hours
-  def roll_forward
-    next_business_time = self
-  
-    if (before_business_hours? || !workday?)
-      next_business_time = beginning_of_workday
+    # Gives the time at the end of the workday, assuming that this time falls on a
+    # workday.
+    # Note: It pretends that this day is a workday whether or not it really is a
+    # workday.
+    def end_of_workday(day)
+      format = "%B %d %Y #{BusinessTime::Config.end_of_workday}"
+      Time.zone ? Time.zone.parse(day.strftime(format)) :
+          Time.parse(day.strftime(format))
     end
-    
-    if after_business_hours?
-      next_business_time = beginning_of_workday + 1.day
+
+    # Gives the time at the beginning of the workday, assuming that this time
+    # falls on a workday.
+    # Note: It pretends that this day is a workday whether or not it really is a
+    # workday.
+    def beginning_of_workday(day)
+      format = "%B %d %Y #{BusinessTime::Config.beginning_of_workday}"
+      Time.zone ? Time.zone.parse(day.strftime(format)) :
+          Time.parse(day.strftime(format))
+    end
+
+    # True if this time is on a workday (between 00:00:00 and 23:59:59), even if
+    # this time falls outside of normal business hours.
+    def workday?(day)
+      Time.weekday?(day) &&
+          !BusinessTime::Config.holidays.include?(day.to_date)
+    end
+
+    # True if this time falls on a weekday.
+    def weekday?(day)
+      # TODO AS: Internationalize this!
+      [1,2,3,4,5].include? day.wday
+    end
+
+    def before_business_hours?(time)
+      time < beginning_of_workday(time)
+    end
+
+    def after_business_hours?(time)
+      time > end_of_workday(time)
+    end
+
+    # Rolls forward to the next beginning_of_workday
+    # when the time is outside of business hours
+    def roll_forward(time)
+
+      if (Time.before_business_hours?(time) || !Time.workday?(time))
+        next_business_time = Time.beginning_of_workday(time)
+      elsif Time.after_business_hours?(time)
+        next_business_time = Time.beginning_of_workday(time) + 1.day
+      else
+        next_business_time = time.clone
+      end
+
+      while !Time.workday?(next_business_time)
+        next_business_time += 1.day
+      end
+
+      next_business_time
     end
-    
-    while !next_business_time.workday?
-      next_business_time = next_business_time + 1.day      
-    end    
 
-    next_business_time
-  end
-  
-  private
-  
-  def before_business_hours?
-    (self < self.beginning_of_workday)
-  end
-  
-  def after_business_hours?
-    (self > self.end_of_workday)
   end
-  
-end
+end

data/test/helper.rb

@@ -6,6 +6,7 @@ if RUBY_VERSION >= '1.9'
   require 'active_support/time'
 else
   require 'active_support'
+  require 'active_support/core_ext'
 end
 
 require 'test/unit'

data/test/test_business_days.rb

@@ -2,66 +2,68 @@ require 'helper'
 
 class TestBusinessDays < Test::Unit::TestCase
   
-  should "move to tomorrow if we add a business day" do
-    first = Time.parse("April 13th, 2010, 11:00 am")
-    later = 1.business_day.after(first)
-    expected = Time.parse("April 14th, 2010, 11:00 am")
-    assert expected == later
-  end
+  context "with a standard Time object" do
+
+    should "move to tomorrow if we add a business day" do
+      first = Time.parse("April 13th, 2010, 11:00 am")
+      later = 1.business_day.after(first)
+      expected = Time.parse("April 14th, 2010, 11:00 am")
+      assert_equal expected, later
+    end
   
-  should "move to yesterday is we subtract a business day" do
-    first = Time.parse("April 13th, 2010, 11:00 am")
-    before = 1.business_day.before(first)
-    expected = Time.parse("April 12th, 2010, 11:00 am")
-    assert expected == before
-  end
+    should "move to yesterday is we subtract a business day" do
+      first = Time.parse("April 13th, 2010, 11:00 am")
+      before = 1.business_day.before(first)
+      expected = Time.parse("April 12th, 2010, 11:00 am")
+      assert_equal expected, before
+    end
   
-  should "take into account the weekend when adding a day" do
-    first = Time.parse("April 9th, 2010, 12:33 pm")
-    after = 1.business_day.after(first)
-    expected = Time.parse("April 12th, 2010, 12:33 pm")
-    assert expected == after
-  end
+    should "take into account the weekend when adding a day" do
+      first = Time.parse("April 9th, 2010, 12:33 pm")
+      after = 1.business_day.after(first)
+      expected = Time.parse("April 12th, 2010, 12:33 pm")
+      assert_equal expected, after
+    end
   
-  should "take into account the weekend when subtracting a day" do
-    first = Time.parse("April 12th, 2010, 12:33 pm")
-    before = 1.business_day.before(first)
-    expected = Time.parse("April 9th, 2010, 12:33 pm")
-    assert expected == before
-  end
+    should "take into account the weekend when subtracting a day" do
+      first = Time.parse("April 12th, 2010, 12:33 pm")
+      before = 1.business_day.before(first)
+      expected = Time.parse("April 9th, 2010, 12:33 pm")
+      assert_equal expected, before
+    end
   
-  should "move forward one week when adding 5 business days" do
-    first = Time.parse("April 9th, 2010, 12:33 pm")
-    after = 5.business_days.after(first)
-    expected = Time.parse("April 16th, 2010, 12:33 pm")
-    assert expected == after
-  end
-  
-  should "move backward one week when subtracting 5 business days" do
-    first = Time.parse("April 16th, 2010, 12:33 pm")
-    before = 5.business_days.before(first)
-    expected = Time.parse("April 9th, 2010, 12:33 pm")
-    assert expected == before
-  end
+    should "move forward one week when adding 5 business days" do
+      first = Time.parse("April 9th, 2010, 12:33 pm")
+      after = 5.business_days.after(first)
+      expected = Time.parse("April 16th, 2010, 12:33 pm")
+      assert_equal expected, after
+    end
   
-  should "take into account a holiday when adding a day" do
-    three_day_weekend = Date.parse("July 5th, 2010")
-    BusinessTime::Config.holidays << three_day_weekend
-    friday_afternoon = Time.parse("July 2nd, 2010, 4:50 pm")
-    tuesday_afternoon = 1.business_day.after(friday_afternoon)
-    expected = Time.parse("July 6th, 2010, 4:50 pm")
-    assert expected == tuesday_afternoon
-  end
+    should "move backward one week when subtracting 5 business days" do
+      first = Time.parse("April 16th, 2010, 12:33 pm")
+      before = 5.business_days.before(first)
+      expected = Time.parse("April 9th, 2010, 12:33 pm")
+      assert_equal expected, before
+    end
   
+    should "take into account a holiday when adding a day" do
+      three_day_weekend = Date.parse("July 5th, 2010")
+      BusinessTime::Config.holidays << three_day_weekend
+      friday_afternoon = Time.parse("July 2nd, 2010, 4:50 pm")
+      tuesday_afternoon = 1.business_day.after(friday_afternoon)
+      expected = Time.parse("July 6th, 2010, 4:50 pm")
+      assert_equal expected, tuesday_afternoon
+    end
   
-  should "take into account a holiday on a weekend" do
-    BusinessTime::Config.reset
-    july_4 = Date.parse("July 4th, 2010")
-    BusinessTime::Config.holidays << july_4
-    friday_afternoon = Time.parse("July 2nd, 2010, 4:50 pm")
-    monday_afternoon = 1.business_day.after(friday_afternoon)
-    expected = Time.parse("July 5th, 2010, 4:50 pm")
-    assert expected == monday_afternoon
+    should "take into account a holiday on a weekend" do
+      BusinessTime::Config.reset
+      july_4 = Date.parse("July 4th, 2010")
+      BusinessTime::Config.holidays << july_4
+      friday_afternoon = Time.parse("July 2nd, 2010, 4:50 pm")
+      monday_afternoon = 1.business_day.after(friday_afternoon)
+      expected = Time.parse("July 5th, 2010, 4:50 pm")
+      assert_equal expected, monday_afternoon
+    end
   end
   
-end
+end

data/test/test_business_days_eastern.rb

@@ -0,0 +1,75 @@
+require 'helper'
+
+class TestBusinessDays < Test::Unit::TestCase
+  
+  context "with a TimeWithZone object set to the Eastern timezone" do
+    setup do
+      Time.zone = 'Eastern Time (US & Canada)'
+    end
+    teardown do
+      Time.zone = nil
+    end
+    
+    should "move to tomorrow if we add a business day" do
+      first = Time.zone.parse("April 13th, 2010, 11:00 am")
+      later = 1.business_day.after(first)
+      expected = Time.zone.parse("April 14th, 2010, 11:00 am")
+      assert_equal expected, later
+    end
+
+    should "move to yesterday is we subtract a business day" do
+      first = Time.zone.parse("April 13th, 2010, 11:00 am")
+      before = 1.business_day.before(first)
+      expected = Time.zone.parse("April 12th, 2010, 11:00 am")
+      assert_equal expected, before
+    end
+
+    should "take into account the weekend when adding a day" do
+      first = Time.zone.parse("April 9th, 2010, 12:33 pm")
+      after = 1.business_day.after(first)
+      expected = Time.zone.parse("April 12th, 2010, 12:33 pm")
+      assert_equal expected, after
+    end
+
+    should "take into account the weekend when subtracting a day" do
+      first = Time.zone.parse("April 12th, 2010, 12:33 pm")
+      before = 1.business_day.before(first)
+      expected = Time.zone.parse("April 9th, 2010, 12:33 pm")
+      assert_equal expected, before
+    end
+
+    should "move forward one week when adding 5 business days" do
+      first = Time.zone.parse("April 9th, 2010, 12:33 pm")
+      after = 5.business_days.after(first)
+      expected = Time.zone.parse("April 16th, 2010, 12:33 pm")
+      assert_equal expected, after
+    end
+
+    should "move backward one week when subtracting 5 business days" do
+      first = Time.zone.parse("April 16th, 2010, 12:33 pm")
+      before = 5.business_days.before(first)
+      expected = Time.zone.parse("April 9th, 2010, 12:33 pm")
+      assert_equal expected, before
+    end
+
+    should "take into account a holiday when adding a day" do
+      three_day_weekend = Date.parse("July 5th, 2010")
+      BusinessTime::Config.holidays << three_day_weekend
+      friday_afternoon = Time.zone.parse("July 2nd, 2010, 4:50 pm")
+      tuesday_afternoon = 1.business_day.after(friday_afternoon)
+      expected = Time.zone.parse("July 6th, 2010, 4:50 pm")
+      assert_equal expected, tuesday_afternoon
+    end
+
+    should "take into account a holiday on a weekend" do
+      BusinessTime::Config.reset
+      july_4 = Date.parse("July 4th, 2010")
+      BusinessTime::Config.holidays << july_4
+      friday_afternoon = Time.zone.parse("July 2nd, 2010, 4:50 pm")
+      monday_afternoon = 1.business_day.after(friday_afternoon)
+      expected = Time.zone.parse("July 5th, 2010, 4:50 pm")
+      assert_equal expected, monday_afternoon
+    end
+  end
+  
+end

data/test/test_business_days_utc.rb

@@ -0,0 +1,75 @@
+require 'helper'
+
+class TestBusinessDays < Test::Unit::TestCase
+  
+  context "with a TimeWithZone object set to UTC" do
+    setup do
+      Time.zone = 'UTC'
+    end
+    teardown do
+      Time.zone = nil
+    end
+    
+    should "move to tomorrow if we add a business day" do
+      first = Time.zone.parse("April 13th, 2010, 11:00 am")
+      later = 1.business_day.after(first)
+      expected = Time.zone.parse("April 14th, 2010, 11:00 am")
+      assert_equal expected, later
+    end
+
+    should "move to yesterday is we subtract a business day" do
+      first = Time.zone.parse("April 13th, 2010, 11:00 am")
+      before = 1.business_day.before(first)
+      expected = Time.zone.parse("April 12th, 2010, 11:00 am")
+      assert_equal expected, before
+    end
+
+    should "take into account the weekend when adding a day" do
+      first = Time.zone.parse("April 9th, 2010, 12:33 pm")
+      after = 1.business_day.after(first)
+      expected = Time.zone.parse("April 12th, 2010, 12:33 pm")
+      assert_equal expected, after
+    end
+
+    should "take into account the weekend when subtracting a day" do
+      first = Time.zone.parse("April 12th, 2010, 12:33 pm")
+      before = 1.business_day.before(first)
+      expected = Time.zone.parse("April 9th, 2010, 12:33 pm")
+      assert_equal expected, before
+    end
+
+    should "move forward one week when adding 5 business days" do
+      first = Time.zone.parse("April 9th, 2010, 12:33 pm")
+      after = 5.business_days.after(first)
+      expected = Time.zone.parse("April 16th, 2010, 12:33 pm")
+      assert_equal expected, after
+    end
+
+    should "move backward one week when subtracting 5 business days" do
+      first = Time.zone.parse("April 16th, 2010, 12:33 pm")
+      before = 5.business_days.before(first)
+      expected = Time.zone.parse("April 9th, 2010, 12:33 pm")
+      assert_equal expected, before
+    end
+
+    should "take into account a holiday when adding a day" do
+      three_day_weekend = Date.parse("July 5th, 2010")
+      BusinessTime::Config.holidays << three_day_weekend
+      friday_afternoon = Time.zone.parse("July 2nd, 2010, 4:50 pm")
+      tuesday_afternoon = 1.business_day.after(friday_afternoon)
+      expected = Time.zone.parse("July 6th, 2010, 4:50 pm")
+      assert_equal expected, tuesday_afternoon
+    end
+
+    should "take into account a holiday on a weekend" do
+      BusinessTime::Config.reset
+      july_4 = Date.parse("July 4th, 2010")
+      BusinessTime::Config.holidays << july_4
+      friday_afternoon = Time.zone.parse("July 2nd, 2010, 4:50 pm")
+      monday_afternoon = 1.business_day.after(friday_afternoon)
+      expected = Time.zone.parse("July 5th, 2010, 4:50 pm")
+      assert_equal expected, monday_afternoon
+    end
+  end
+
+end

data/test/test_business_hours.rb

@@ -1,64 +1,69 @@
 require 'helper'
 
 class TestBusinessHours < Test::Unit::TestCase
-  should "move to tomorrow if we add 8 business hours" do
-    first = Time.parse("Aug 4 2010, 9:35 am")
-    later = 8.business_hours.after(first)
-    expected = Time.parse("Aug 5 2010, 9:35 am")
-    assert expected == later
-  end
-  
-  should "move to yesterday if we subtract 8 business hours" do
-    first = Time.parse("Aug 4 2010, 9:35 am")
-    later = 8.business_hours.before(first)
-    expected = Time.parse("Aug 3 2010, 9:35 am")
-    assert expected == later
-  end
-  
-  should "take into account a weekend when adding an hour" do
-    friday_afternoon = Time.parse("April 9th, 4:50 pm")
-    monday_morning = 1.business_hour.after(friday_afternoon)
-    expected = Time.parse("April 12th 2010, 9:50 am")
-    assert expected == monday_morning
-  end
-  
-  should "take into account a weekend when subtracting an hour" do
-    monday_morning = Time.parse("April 12th 2010, 9:50 am")
-    friday_afternoon = 1.business_hour.before(monday_morning)
-    expected = Time.parse("April 9th 2010, 4:50 pm")
-    assert expected == friday_afternoon
-  end
-  
-  should "take into account a holiday" do
-    BusinessTime::Config.holidays << Date.parse("July 5th, 2010")
-    friday_afternoon = Time.parse("July 2nd 2010, 4:50pm")
-    tuesday_morning = 1.business_hour.after(friday_afternoon)
-    expected = Time.parse("July 6th 2010, 9:50 am")
-    assert expected == tuesday_morning
-  end
-  
-  should "add hours in the middle of the workday"  do
-    monday_morning = Time.parse("April 12th 2010, 9:50 am")
-    later = 3.business_hours.after(monday_morning)
-    expected = Time.parse("April 12th 2010, 12:50 pm")
-    assert expected == later
-  end
-  
-  should "roll forward to 9 am if asked in the early morning" do
-    crack_of_dawn_monday = Time.parse("Mon Apr 26, 04:30:00, 2010")
-    monday_morning = Time.parse("Mon Apr 26, 09:00:00, 2010")
-    assert_equal monday_morning, crack_of_dawn_monday.roll_forward
-  end
-  
-  should "roll forward to the next morning if aftern business hours" do
-    monday_evening = Time.parse("Mon Apr 26, 18:00:00, 2010")
-    tuesday_morning = Time.parse("Tue Apr 27, 09:00:00, 2010")
-    assert_equal tuesday_morning, monday_evening.roll_forward
-  end
-  
-  should "consider any time on a weekend as equivalent to monday morning" do
-    sunday = Time.parse("Sun Apr 25 12:06:56, 2010")
-    monday = Time.parse("Mon Apr 26, 09:00:00, 2010")
-    assert_equal 1.business_hour.before(monday), 1.business_hour.before(sunday)
+
+  context "with a standard Time object" do
+
+    should "move to tomorrow if we add 8 business hours" do
+      first = Time.parse("Aug 4 2010, 9:35 am")
+      later = 8.business_hours.after(first)
+      expected = Time.parse("Aug 5 2010, 9:35 am")
+      assert_equal expected, later
+    end
+
+    should "move to yesterday if we subtract 8 business hours" do
+      first = Time.parse("Aug 4 2010, 9:35 am")
+      later = 8.business_hours.before(first)
+      expected = Time.parse("Aug 3 2010, 9:35 am")
+      assert_equal expected, later
+    end
+
+    should "take into account a weekend when adding an hour" do
+      friday_afternoon = Time.parse("April 9th, 4:50 pm")
+      monday_morning = 1.business_hour.after(friday_afternoon)
+      expected = Time.parse("April 12th 2010, 9:50 am")
+      assert_equal expected, monday_morning
+    end
+
+    should "take into account a weekend when subtracting an hour" do
+      monday_morning = Time.parse("April 12th 2010, 9:50 am")
+      friday_afternoon = 1.business_hour.before(monday_morning)
+      expected = Time.parse("April 9th 2010, 4:50 pm")
+      assert_equal expected, friday_afternoon
+    end
+
+    should "take into account a holiday" do
+      BusinessTime::Config.holidays << Date.parse("July 5th, 2010")
+      friday_afternoon = Time.parse("July 2nd 2010, 4:50pm")
+      tuesday_morning = 1.business_hour.after(friday_afternoon)
+      expected = Time.parse("July 6th 2010, 9:50 am")
+      assert_equal expected, tuesday_morning
+    end
+
+    should "add hours in the middle of the workday"  do
+      monday_morning = Time.parse("April 12th 2010, 9:50 am")
+      later = 3.business_hours.after(monday_morning)
+      expected = Time.parse("April 12th 2010, 12:50 pm")
+      assert_equal expected, later
+    end
+
+    should "roll forward to 9 am if asked in the early morning" do
+      crack_of_dawn_monday = Time.parse("Mon Apr 26, 04:30:00, 2010")
+      monday_morning = Time.parse("Mon Apr 26, 09:00:00, 2010")
+      assert_equal monday_morning, Time.roll_forward(crack_of_dawn_monday)
+    end
+
+    should "roll forward to the next morning if aftern business hours" do
+      monday_evening = Time.parse("Mon Apr 26, 18:00:00, 2010")
+      tuesday_morning = Time.parse("Tue Apr 27, 09:00:00, 2010")
+      assert_equal tuesday_morning, Time.roll_forward(monday_evening)
+    end
+
+    should "consider any time on a weekend as equivalent to monday morning" do
+      sunday = Time.parse("Sun Apr 25 12:06:56, 2010")
+      monday = Time.parse("Mon Apr 26, 09:00:00, 2010")
+      assert_equal 1.business_hour.before(monday), 1.business_hour.before(sunday)
+    end
   end
+
 end

data/test/test_business_hours_eastern.rb

@@ -0,0 +1,75 @@
+require 'helper'
+
+class TestBusinessHours < Test::Unit::TestCase
+
+  context "with a TimeWithZone object in US Eastern" do
+    setup do
+      Time.zone = 'Eastern Time (US & Canada)'
+    end
+    teardown do
+      Time.zone = nil
+    end
+
+    should "move to tomorrow if we add 8 business hours" do
+      first = Time.zone.parse("Aug 4 2010, 9:35 am")
+      later = 8.business_hours.after(first)
+      expected = Time.zone.parse("Aug 5 2010, 9:35 am")
+      assert_equal expected, later
+    end
+
+    should "move to yesterday if we subtract 8 business hours" do
+      first = Time.zone.parse("Aug 4 2010, 9:35 am")
+      later = 8.business_hours.before(first)
+      expected = Time.zone.parse("Aug 3 2010, 9:35 am")
+      assert_equal expected, later
+    end
+
+    should "take into account a weekend when adding an hour" do
+      friday_afternoon = Time.zone.parse("April 9th, 4:50 pm")
+      monday_morning = 1.business_hour.after(friday_afternoon)
+      expected = Time.zone.parse("April 12th 2010, 9:50 am")
+      assert_equal expected, monday_morning
+    end
+
+    should "take into account a weekend when subtracting an hour" do
+      monday_morning = Time.zone.parse("April 12th 2010, 9:50 am")
+      friday_afternoon = 1.business_hour.before(monday_morning)
+      expected = Time.zone.parse("April 9th 2010, 4:50 pm")
+      assert_equal expected, friday_afternoon
+    end
+
+    should "take into account a holiday" do
+      BusinessTime::Config.holidays << Date.parse("July 5th, 2010")
+      friday_afternoon = Time.zone.parse("July 2nd 2010, 4:50pm")
+      tuesday_morning = 1.business_hour.after(friday_afternoon)
+      expected = Time.zone.parse("July 6th 2010, 9:50 am")
+      assert_equal expected, tuesday_morning
+    end
+
+    should "add hours in the middle of the workday"  do
+      monday_morning = Time.zone.parse("April 12th 2010, 9:50 am")
+      later = 3.business_hours.after(monday_morning)
+      expected = Time.zone.parse("April 12th 2010, 12:50 pm")
+      assert_equal expected, later
+    end
+
+    should "roll forward to 9 am if asked in the early morning" do
+      crack_of_dawn_monday = Time.zone.parse("Mon Apr 26, 04:30:00, 2010")
+      monday_morning = Time.zone.parse("Mon Apr 26, 09:00:00, 2010")
+      assert_equal monday_morning, Time.roll_forward(crack_of_dawn_monday)
+    end
+
+    should "roll forward to the next morning if aftern business hours" do
+      monday_evening = Time.zone.parse("Mon Apr 26, 18:00:00, 2010")
+      tuesday_morning = Time.zone.parse("Tue Apr 27, 09:00:00, 2010")
+      assert_equal tuesday_morning, Time.roll_forward(monday_evening)
+    end
+
+    should "consider any time on a weekend as equivalent to monday morning" do
+      sunday = Time.zone.parse("Sun Apr 25 12:06:56, 2010")
+      monday = Time.zone.parse("Mon Apr 26, 09:00:00, 2010")
+      assert_equal 1.business_hour.before(monday), 1.business_hour.before(sunday)
+    end
+
+  end
+end

data/test/test_business_hours_utc.rb

@@ -0,0 +1,75 @@
+require 'helper'
+
+class TestBusinessHours < Test::Unit::TestCase
+
+  context "with a TimeWithZone object in UTC" do
+    setup do
+      Time.zone = 'UTC'
+    end
+    teardown do
+      Time.zone = nil
+    end
+
+    should "move to tomorrow if we add 8 business hours" do
+      first = Time.zone.parse("Aug 4 2010, 9:35 am")
+      later = 8.business_hours.after(first)
+      expected = Time.zone.parse("Aug 5 2010, 9:35 am")
+      assert_equal expected, later
+    end
+
+    should "move to yesterday if we subtract 8 business hours" do
+      first = Time.zone.parse("Aug 4 2010, 9:35 am")
+      later = 8.business_hours.before(first)
+      expected = Time.zone.parse("Aug 3 2010, 9:35 am")
+      assert_equal expected, later
+    end
+
+    should "take into account a weekend when adding an hour" do
+      friday_afternoon = Time.zone.parse("April 9th, 4:50 pm")
+      monday_morning = 1.business_hour.after(friday_afternoon)
+      expected = Time.zone.parse("April 12th 2010, 9:50 am")
+      assert_equal expected, monday_morning
+    end
+
+    should "take into account a weekend when subtracting an hour" do
+      monday_morning = Time.zone.parse("April 12th 2010, 9:50 am")
+      friday_afternoon = 1.business_hour.before(monday_morning)
+      expected = Time.zone.parse("April 9th 2010, 4:50 pm")
+      assert_equal expected, friday_afternoon, "Expected #{expected} but received #{friday_afternoon}"
+    end
+
+    should "take into account a holiday" do
+      BusinessTime::Config.holidays << Date.parse("July 5th, 2010")
+      friday_afternoon = Time.zone.parse("July 2nd 2010, 4:50pm")
+      tuesday_morning = 1.business_hour.after(friday_afternoon)
+      expected = Time.zone.parse("July 6th 2010, 9:50 am")
+      assert_equal expected, tuesday_morning
+    end
+
+    should "add hours in the middle of the workday"  do
+      monday_morning = Time.zone.parse("April 12th 2010, 9:50 am")
+      later = 3.business_hours.after(monday_morning)
+      expected = Time.zone.parse("April 12th 2010, 12:50 pm")
+      assert_equal expected, later
+    end
+
+    should "roll forward to 9 am if asked in the early morning" do
+      crack_of_dawn_monday = Time.zone.parse("Mon Apr 26, 04:30:00, 2010")
+      monday_morning = Time.zone.parse("Mon Apr 26, 09:00:00, 2010")
+      assert_equal monday_morning, Time.roll_forward(crack_of_dawn_monday)
+    end
+
+    should "roll forward to the next morning if aftern business hours" do
+      monday_evening = Time.zone.parse("Mon Apr 26, 18:00:00, 2010")
+      tuesday_morning = Time.zone.parse("Tue Apr 27, 09:00:00, 2010")
+      assert_equal tuesday_morning, Time.roll_forward(monday_evening)
+    end
+
+    should "consider any time on a weekend as equivalent to monday morning" do
+      sunday = Time.zone.parse("Sun Apr 25 12:06:56, 2010")
+      monday = Time.zone.parse("Mon Apr 26, 09:00:00, 2010")
+      assert_equal 1.business_hour.before(monday), 1.business_hour.before(sunday)
+    end
+  end
+
+end

data/test/test_config.rb

@@ -3,15 +3,15 @@ require 'helper'
 class TestConfig < Test::Unit::TestCase
   
   should "keep track of the start of the day" do
-    assert BusinessTime::Config.beginning_of_workday == "9:00 am"
+    assert_equal BusinessTime::Config.beginning_of_workday, "9:00 am"
     BusinessTime::Config.beginning_of_workday = "8:30 am"
-    assert BusinessTime::Config.beginning_of_workday == "8:30 am"
+    assert_equal BusinessTime::Config.beginning_of_workday, "8:30 am"
   end
   
   should "keep track of the end of the day" do
-    assert BusinessTime::Config.end_of_workday == "5:00 pm"
+    assert_equal BusinessTime::Config.end_of_workday, "5:00 pm"
     BusinessTime::Config.end_of_workday = "5:30 pm"
-    assert BusinessTime::Config.end_of_workday == "5:30 pm"
+    assert_equal BusinessTime::Config.end_of_workday, "5:30 pm"
   end
   
   should "keep track of holidays" do
@@ -22,4 +22,4 @@ class TestConfig < Test::Unit::TestCase
     assert BusinessTime::Config.holidays.include?(daves_birthday)
   end
   
-end
+end

data/test/test_time_extensions.rb

@@ -3,17 +3,17 @@ require 'helper'
 class TestTimeExtensions < Test::Unit::TestCase
   
   should "know what a weekend day is" do
-    assert(Time.parse("April 9, 2010 10:30am").weekday?)
-    assert(!Time.parse("April 10, 2010 10:30am").weekday?)
-    assert(!Time.parse("April 11, 2010 10:30am").weekday?)
-    assert(Time.parse("April 12, 2010 10:30am").weekday?)
+    assert( Time.weekday?(Time.parse("April 9, 2010 10:30am")))
+    assert(!Time.weekday?(Time.parse("April 10, 2010 10:30am")))
+    assert(!Time.weekday?(Time.parse("April 11, 2010 10:30am")))
+    assert( Time.weekday?(Time.parse("April 12, 2010 10:30am")))
   end
   
   should "know a weekend day is not a workday" do
-    assert(Time.parse("April 9, 2010 10:45 am").workday?)
-    assert(!Time.parse("April 10, 2010 10:45 am").workday?)
-    assert(!Time.parse("April 11, 2010 10:45 am").workday?)
-    assert(Time.parse("April 12, 2010 10:45 am").workday?)
+    assert( Time.workday?(Time.parse("April 9, 2010 10:45 am")))
+    assert(!Time.workday?(Time.parse("April 10, 2010 10:45 am")))
+    assert(!Time.workday?(Time.parse("April 11, 2010 10:45 am")))
+    assert( Time.workday?(Time.parse("April 12, 2010 10:45 am")))
   end
   
   should "know a holiday is not a workday" do
@@ -22,21 +22,21 @@ class TestTimeExtensions < Test::Unit::TestCase
     BusinessTime::Config.holidays << Date.parse("July 4, 2010")
     BusinessTime::Config.holidays << Date.parse("July 5, 2010")
     
-    assert(!Time.parse("July 4th, 2010 1:15 pm").workday?)
-    assert(!Time.parse("July 5th, 2010 2:37 pm").workday?)
+    assert(!Time.workday?(Time.parse("July 4th, 2010 1:15 pm")))
+    assert(!Time.workday?(Time.parse("July 5th, 2010 2:37 pm")))
   end
   
   
   should "know the beginning of the day for an instance" do
     first = Time.parse("August 17th, 2010, 11:50 am")
     expecting = Time.parse("August 17th, 2010, 9:00 am")
-    assert expecting == first.beginning_of_workday
+    assert_equal expecting, Time.beginning_of_workday(first)
   end
   
   should "know the end of the day for an instance" do
     first = Time.parse("August 17th, 2010, 11:50 am")
     expecting = Time.parse("August 17th, 2010, 5:00 pm")
-    assert expecting == first.end_of_workday
+    assert_equal expecting, Time.end_of_workday(first)
   end
   
-end
+end

data/test/test_time_with_zone_extensions.rb

@@ -0,0 +1,92 @@
+require 'helper'
+
+class TestTimeWithZoneExtensions < Test::Unit::TestCase
+  
+  context "With Eastern Standard Time" do
+    setup do
+      Time.zone = 'Eastern Time (US & Canada)'
+    end
+    
+    should "know what a weekend day is" do
+      assert( Time.weekday?(Time.zone.parse("April 9, 2010 10:30am")))
+      assert(!Time.weekday?(Time.zone.parse("April 10, 2010 10:30am")))
+      assert(!Time.weekday?(Time.zone.parse("April 11, 2010 10:30am")))
+      assert( Time.weekday?(Time.zone.parse("April 12, 2010 10:30am")))
+    end
+  
+    should "know a weekend day is not a workday" do
+      assert( Time.workday?(Time.zone.parse("April 9, 2010 10:45 am")))
+      assert(!Time.workday?(Time.zone.parse("April 10, 2010 10:45 am")))
+      assert(!Time.workday?(Time.zone.parse("April 11, 2010 10:45 am")))
+      assert( Time.workday?(Time.zone.parse("April 12, 2010 10:45 am")))
+    end
+  
+    should "know a holiday is not a workday" do
+      BusinessTime::Config.reset
+    
+      BusinessTime::Config.holidays << Date.parse("July 4, 2010")
+      BusinessTime::Config.holidays << Date.parse("July 5, 2010")
+    
+      assert(!Time.workday?(Time.zone.parse("July 4th, 2010 1:15 pm")))
+      assert(!Time.workday?(Time.zone.parse("July 5th, 2010 2:37 pm")))
+    end
+  
+  
+    should "know the beginning of the day for an instance" do
+      first = Time.zone.parse("August 17th, 2010, 11:50 am")
+      expecting = Time.zone.parse("August 17th, 2010, 9:00 am")
+      assert_equal expecting, Time.beginning_of_workday(first)
+    end
+  
+    should "know the end of the day for an instance" do
+      first = Time.zone.parse("August 17th, 2010, 11:50 am")
+      expecting = Time.zone.parse("August 17th, 2010, 5:00 pm")
+      assert_equal expecting, Time.end_of_workday(first)
+    end
+  end
+  
+  
+  context "With UTC Timezone" do
+    setup do
+      Time.zone = 'UTC'
+    end
+    
+    should "know what a weekend day is" do
+      assert( Time.weekday?(Time.zone.parse("April 9, 2010 10:30am")))
+      assert(!Time.weekday?(Time.zone.parse("April 10, 2010 10:30am")))
+      assert(!Time.weekday?(Time.zone.parse("April 11, 2010 10:30am")))
+      assert( Time.weekday?(Time.zone.parse("April 12, 2010 10:30am")))
+    end
+  
+    should "know a weekend day is not a workday" do
+      assert( Time.workday?(Time.zone.parse("April 9, 2010 10:45 am")))
+      assert(!Time.workday?(Time.zone.parse("April 10, 2010 10:45 am")))
+      assert(!Time.workday?(Time.zone.parse("April 11, 2010 10:45 am")))
+      assert( Time.workday?(Time.zone.parse("April 12, 2010 10:45 am")))
+    end
+  
+    should "know a holiday is not a workday" do
+      BusinessTime::Config.reset
+    
+      BusinessTime::Config.holidays << Date.parse("July 4, 2010")
+      BusinessTime::Config.holidays << Date.parse("July 5, 2010")
+    
+      assert(!Time.workday?(Time.zone.parse("July 4th, 2010 1:15 pm")))
+      assert(!Time.workday?(Time.zone.parse("July 5th, 2010 2:37 pm")))
+    end
+  
+  
+    should "know the beginning of the day for an instance" do
+      first = Time.zone.parse("August 17th, 2010, 11:50 am")
+      expecting = Time.zone.parse("August 17th, 2010, 9:00 am")
+      assert_equal expecting, Time.beginning_of_workday(first)
+    end
+  
+    should "know the end of the day for an instance" do
+      first = Time.zone.parse("August 17th, 2010, 11:50 am")
+      expecting = Time.zone.parse("August 17th, 2010, 5:00 pm")
+      assert_equal expecting, Time.end_of_workday(first)
+    end
+  end
+  
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - bokmann
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 -04:00
+date: 2010-05-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -72,11 +72,16 @@ files:
 - rails_generators/business_time_config/templates/business_time.yml
 - test/helper.rb
 - test/test_business_days.rb
+- test/test_business_days_eastern.rb
+- test/test_business_days_utc.rb
 - test/test_business_hours.rb
+- test/test_business_hours_eastern.rb
+- test/test_business_hours_utc.rb
 - test/test_config.rb
 - test/test_date_extensions.rb
 - test/test_fixnum_extensions.rb
 - test/test_time_extensions.rb
+- test/test_time_with_zone_extensions.rb
 has_rdoc: true
 homepage: http://github.com/bokmann/business_time
 licenses: []
@@ -110,8 +115,13 @@ summary: Support for doing time math in business hours and days
 test_files: 
 - test/helper.rb
 - test/test_business_days.rb
+- test/test_business_days_eastern.rb
+- test/test_business_days_utc.rb
 - test/test_business_hours.rb
+- test/test_business_hours_eastern.rb
+- test/test_business_hours_utc.rb
 - test/test_config.rb
 - test/test_date_extensions.rb
 - test/test_fixnum_extensions.rb
 - test/test_time_extensions.rb
+- test/test_time_with_zone_extensions.rb