business_time 0.7.1 → 0.7.2

data/lib/business_time.rb

@@ -7,6 +7,8 @@ require 'business_time/config'
 require 'business_time/business_hours'
 require 'business_time/business_days'
 require 'business_time/core_ext/date'
-require 'business_time/core_ext/time'
 require 'business_time/core_ext/fixnum'
 
+require 'business_time/time_extensions'
+require 'business_time/core_ext/time'
+require 'business_time/core_ext/active_support/time_with_zone'

data/lib/business_time/business_hours.rb

@@ -19,13 +19,10 @@ module BusinessTime
       @hours.times do
         after_time = after_time + 1.hour
 
-        # Roll back a second if it is midnight so that we check end_of_workday for the right day
         if after_time.hour == 0 && after_time.min == 0 && after_time.sec == 0
-          after_time = after_time - 1.second
-        end
-
-        # Ignore hours before opening and after closing
-        if (after_time >= Time.end_of_workday(after_time))
+          after_time = Time.roll_forward(after_time)
+        elsif (after_time > Time.end_of_workday(after_time))
+          # Ignore hours before opening and after closing
           delta = after_time - Time.end_of_workday(after_time)
           after_time = Time.roll_forward(after_time) + delta
         end
@@ -40,14 +37,22 @@ module BusinessTime
     alias_method :since, :after
 
     def before(time)
-      before_time = Time.roll_forward(time)
+      before_time = Time.roll_backward(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
+        if before_time.hour == 0 && before_time.min == 0 && before_time.sec == 0
+          before_time = Time.roll_backward(before_time - 1.second)
+        elsif (before_time <= Time.beginning_of_workday(before_time))
+          # Ignore hours before opening and after closing
+          delta = Time.beginning_of_workday(before_time) - before_time
+
+          # Due to the 23:59:59 end-of-workday exception
+          time_roll_backward = Time.roll_backward(before_time)
+          time_roll_backward += 1.second if time_roll_backward.to_s =~ /23:59:59/
+
+          before_time = time_roll_backward - delta
         end
 
         # Ignore weekends and holidays
@@ -57,20 +62,5 @@ module BusinessTime
       end
       before_time
     end
-
-    private
-
-    def off_hours
-      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

data/lib/business_time/config.rb

@@ -12,6 +12,7 @@ module BusinessTime
       end_of_workday:        '5:00 pm',
       work_week:             %w(mon tue wed thu fri),
       work_hours:            {},
+      work_hours_total:      {},
       _weekdays:             nil,
     }
 
@@ -66,6 +67,9 @@ module BusinessTime
     #    {:mon => ["9:00","17:00"],:tue => ["9:00","17:00"].....}
     threadsafe_cattr_accessor :work_hours
 
+    # total work hours for a day. Never set, always calculated.
+    threadsafe_cattr_accessor :work_hours_total
+
     threadsafe_cattr_accessor :_weekdays # internal
 
     class << self

data/lib/business_time/core_ext/active_support/time_with_zone.rb

@@ -0,0 +1,3 @@
+class ActiveSupport::TimeWithZone
+  include BusinessTime::TimeExtensions
+end

data/lib/business_time/core_ext/time.rb

@@ -1,140 +1,4 @@
 # Add workday and weekday concepts to the Time class
 class Time
-  class << self
-    # 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)
-      end_of_workday = Time.parse(BusinessTime::Config.end_of_workday(day))
-      change_business_time(day,end_of_workday.hour,end_of_workday.min,end_of_workday.sec)
-    end
-
-    # 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)
-      beginning_of_workday = Time.parse(BusinessTime::Config.beginning_of_workday(day))
-      change_business_time(day,beginning_of_workday.hour,beginning_of_workday.min,beginning_of_workday.sec)
-    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)
-      BusinessTime::Config.weekdays.include? day.wday
-    end
-
-    def before_business_hours?(time)
-      time.to_i < beginning_of_workday(time).to_i
-    end
-
-    def after_business_hours?(time)
-      time.to_i > end_of_workday(time).to_i
-    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) || Time.end_of_workday(time) == 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 = Time.beginning_of_workday(next_business_time + 1.day)
-      end
-
-      next_business_time
-    end
-
-    # Rolls backwards to the previous end_of_workday when the time is outside
-    # of business hours
-    def roll_backward(time)
-      prev_business_time = if (Time.before_business_hours?(time) || !Time.workday?(time))
-        Time.end_of_workday(time) - 1.day
-      elsif Time.after_business_hours?(time)
-        Time.end_of_workday(time)
-      else
-        time.clone
-      end
-
-      while !Time.workday?(prev_business_time)
-        prev_business_time -= 1.day
-      end
-
-      prev_business_time
-    end
-
-    private
-
-    def change_business_time time, hour, min=0, sec=0
-      if Time.zone
-        time.in_time_zone(Time.zone).change(:hour => hour, :min => min, :sec => sec)
-      else
-        time.change(:hour => hour, :min => min, :sec => sec)
-      end
-    end
-  end
-
-  def business_time_until(to_time)
-    # Make sure that we will calculate time from A to B "clockwise"
-    if self < to_time
-      time_a = self
-      time_b = to_time
-      direction = 1
-    else
-      time_a = to_time
-      time_b = self
-      direction = -1
-    end
-
-    # Align both times to the closest business hours
-    time_a = Time::roll_forward(time_a)
-    time_b = Time::roll_forward(time_b)
-
-    # If same date, then calculate difference straight forward
-    if time_a.to_date == time_b.to_date
-      result = time_b - time_a
-      return result * direction
-    end
-
-    # Both times are in different dates
-    #result = Time.parse(time_a.strftime('%Y-%m-%d ') + BusinessTime::Config.end_of_workday) - time_a   # First day
-    #result += time_b - Time.parse(time_b.strftime('%Y-%m-%d ') + BusinessTime::Config.beginning_of_workday) # Last day
-
-    result = 0
-
-    # All days in between
-    time_c = time_a
-    while time_c.to_i < time_b.to_i do
-      end_of_workday = Time.end_of_workday(time_c)
-      if time_c.to_date == time_b.to_date
-        if end_of_workday < time_b
-          result += end_of_workday - time_c
-          break
-        else
-          result += time_b - time_c
-          break
-        end
-      else
-        result += end_of_workday - time_c
-        time_c = Time::roll_forward(end_of_workday)
-      end
-      result += 1 if end_of_workday.to_s =~ /23:59:59/
-    end
-
-    # Make sure that sign is correct
-    result * direction
-  end
+  include BusinessTime::TimeExtensions
 end

data/lib/business_time/time_extensions.rb

@@ -0,0 +1,145 @@
+module BusinessTime
+  module TimeExtensions
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      # 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)
+        end_of_workday = Time.parse(BusinessTime::Config.end_of_workday(day))
+        change_business_time(day,end_of_workday.hour,end_of_workday.min,end_of_workday.sec)
+      end
+
+      # 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)
+        beginning_of_workday = Time.parse(BusinessTime::Config.beginning_of_workday(day))
+        change_business_time(day,beginning_of_workday.hour,beginning_of_workday.min,beginning_of_workday.sec)
+      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)
+        BusinessTime::Config.weekdays.include? day.wday
+      end
+
+      def before_business_hours?(time)
+        time.to_i < beginning_of_workday(time).to_i
+      end
+
+      def after_business_hours?(time)
+        time.to_i > end_of_workday(time).to_i
+      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) || Time.end_of_workday(time) == 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 = Time.beginning_of_workday(next_business_time + 1.day)
+        end
+
+        next_business_time
+      end
+
+      # Rolls backwards to the previous end_of_workday when the time is outside
+      # of business hours
+      def roll_backward(time)
+        prev_business_time = if (Time.before_business_hours?(time) || !Time.workday?(time))
+                               Time.end_of_workday(time - 1.day)
+                             elsif Time.after_business_hours?(time)
+                               Time.end_of_workday(time)
+                             else
+                               time.clone
+                             end
+
+        while !Time.workday?(prev_business_time)
+          prev_business_time = Time.end_of_workday(prev_business_time - 1.day)
+        end
+
+        prev_business_time
+      end
+
+      def work_hours_total(day)
+        return 0 unless Time.workday?(day)
+
+        day = day.strftime('%a').downcase.to_sym
+
+        if hours = BusinessTime::Config.work_hours[day]
+          BusinessTime::Config.work_hours_total[day] ||= begin
+            hours_last = hours.last
+            if hours_last == '00:00'
+              (Time.parse('23:59') - Time.parse(hours.first)) + 1.minute
+            else
+              Time.parse(hours_last) - Time.parse(hours.first)
+            end
+          end
+        else
+          BusinessTime::Config.work_hours_total[:default] ||= begin
+            Time.parse(BusinessTime::Config.end_of_workday) - Time.parse(BusinessTime::Config.beginning_of_workday)
+          end
+        end
+      end
+
+      private
+
+      def change_business_time time, hour, min=0, sec=0
+        if Time.zone
+          time.in_time_zone(Time.zone).change(:hour => hour, :min => min, :sec => sec)
+        else
+          time.change(:hour => hour, :min => min, :sec => sec)
+        end
+      end
+    end
+
+    def business_time_until(to_time)
+      # Make sure that we will calculate time from A to B "clockwise"
+      if self < to_time
+        time_a = self
+        time_b = to_time
+        direction = 1
+      else
+        time_a = to_time
+        time_b = self
+        direction = -1
+      end
+
+      # Align both times to the closest business hours
+      time_a = Time::roll_forward(time_a)
+      time_b = Time::roll_forward(time_b)
+
+      if time_a.to_date == time_b.to_date
+        time_b - time_a
+      else
+        end_of_workday = Time.end_of_workday(time_a)
+        end_of_workday += 1 if end_of_workday.to_s =~ /23:59:59/
+
+        first_day       = end_of_workday - time_a
+        days_in_between = ((time_a.to_date + 1)..(time_b.to_date - 1)).sum{ |day| Time::work_hours_total(day) }
+        last_day        = time_b - Time.beginning_of_workday(time_b)
+
+        first_day + days_in_between + last_day
+      end * direction
+    end
+  end
+end

data/lib/business_time/version.rb

@@ -1,3 +1,3 @@
 module BusinessTime
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: business_time
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,9 +120,11 @@ files:
 - lib/business_time/business_days.rb
 - lib/business_time/business_hours.rb
 - lib/business_time/config.rb
+- lib/business_time/core_ext/active_support/time_with_zone.rb
 - lib/business_time/core_ext/date.rb
 - lib/business_time/core_ext/fixnum.rb
 - lib/business_time/core_ext/time.rb
+- lib/business_time/time_extensions.rb
 - lib/business_time/version.rb
 - lib/generators/business_time/config_generator.rb
 - rails_generators/business_time_config/business_time_config_generator.rb
@@ -143,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4140664876774747293
+      hash: 2725720830618277021
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4140664876774747293
+      hash: 2725720830618277021
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23