business_time 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/business_time/business_hours.rb

@@ -14,6 +14,7 @@ module BusinessTime
     end
      
     def after(time)
+      time = time.roll_forward
       @hours.times do 
         time = time + 1.hour  #add an hour
         
@@ -29,8 +30,9 @@ module BusinessTime
     end
             
     def before(time)
+      time = time.roll_forward
       @hours.times do 
-        time = time - 1.hour  #add an hour
+        time = time - 1.hour  #subtract an hour
         
         if (time < time.beginning_of_workday)
           time = time - off_hours  # if that pushes us before business hours,

data/lib/extensions/time.rb

@@ -15,4 +15,40 @@ class Time
   def weekday?
     [1,2,3,4,5].include? self.wday
   end
+  
+
+  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
+    end
+    
+    if after_business_hours?
+      next_business_time = beginning_of_workday + 1.day
+    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

data/test/test_business_hours.rb

@@ -44,4 +44,21 @@ class TestBusinessHours < Test::Unit::TestCase
     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)
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - bokmann
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -04:00
+date: 2010-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency