business_time 0.6.1 → 0.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 85605515b3dfca0f7d48ed3ff03cabe4d0265930
+  data.tar.gz: f8637bacc2e3c19665a87484ad48c03056ec4a2e
+SHA512:
+  metadata.gz: 73a15a3b9fef741d3e095c451871ff3ca51287499a46518bc01c7a4536db5347c9a919c0c4c4bf12b5f98381e1efb8ee675ef3be3e61be9fe44dc68935a47df1
+  data.tar.gz: 2c3c0fb687cf7545e16d8315ed1d10dfe29c2bd3625b99f8c9226108bb22c5b9d693490089a4462b9cee839f28d0484c0e5989250245166e28370ae6352faddf

data/README.rdoc

@@ -78,6 +78,16 @@ I needed this, but taking into account business hours/days and holidays.
     thursday_afternoon = Time.parse("July 8th, 2010, 4:50 pm")
     sunday_morning = 1.business_hour.after(thursday_afternoon)
 
+    # as alternative we also can change the business hours for each work day:
+    BusinessTime::Config.work_hours = {
+      :mon=>["9:00","17:00"],
+      :fri=>["9:00","17:00"],
+      :sat=>["10:00","15:00"]
+    }
+    friday = Time.parse("December 24, 2010 15:00")
+    monday = Time.parse("December 27, 2010 11:00")
+    working_hours = friday.business_time_until(monday) # 9.hours
+
     # you can also calculate business duration between two dates
     friday = Date.parse("December 24, 2010")
     monday = Date.parse("December 27, 2010")
@@ -133,10 +143,12 @@ This can lead to some wierd looking effects if, say, you are in the Eastern time
 
 == Integration with the Holidays gem
 
-	Chris Wise wrote up a great article[http://murmurinfo.wordpress.com/2012/01/11/handling-holidays-and-business-hours/] on using the business_time gem with the holidays[https://github.com/HealthyWeb/holidays] gem. It boils down to this:
+	Chris Wise wrote up a great article[http://murmurinfo.wordpress.com/2012/01/11/handling-holidays-and-business-hours/] on using the business_time gem with the holidays[https://github.com/alexdunae/holidays] gem. It boils down to this:
 
   Holidays.between(Date.civil(2011, 1, 1), 2.years.from_now, :ca_on, :o bserved).map{|holiday| BusinessTime::Config.holidays << holiday[:date]}
 
+== Releases
+0.6.2 - rchady pointed out that issue #14 didn't appear to be released.  This fixes that, as well as confirms that all tests run as expected on Ruby 2.0.0p195
 
 == Contributors
  * David Bock  http://github.com/bokmann
@@ -160,7 +172,7 @@ This can lead to some wierd looking effects if, say, you are in the Eastern time
 == TODO
 
 * Arild has pointed out that there may be some logical inconsistencies
-  regaring the beginning_of_workday and end_of workday times not actually
+  regarding the beginning_of_workday and end_of workday times not actually
   being considered inside of the workday.  I'd like to make sure that they
   work as if the beginning_of_workday is included and the end_of_workday is
   not included, just like the '...' range operator in Ruby.
@@ -177,4 +189,4 @@ This can lead to some wierd looking effects if, say, you are in the Eastern time
   
 == Copyright
 
-Copyright (c) 2010,2011,2012 bokmann. See LICENSE for details.
+Copyright (c) 2010,2011,2012,2013 bokmann. See LICENSE for details.

data/lib/business_time/business_days.rb

@@ -9,10 +9,10 @@ module BusinessTime
 
     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?(time)
+      days = @days
+      while days > 0 || !Time.workday?(time)
+        days -= 1 if Time.workday?(time)
+        time = time + 1.day
       end
       time
     end
@@ -22,10 +22,10 @@ module BusinessTime
     
     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?(time)
+      days = @days
+      while days > 0 || !Time.workday?(time)
+        days -= 1 if Time.workday?(time)
+        time = time - 1.day
       end
       time
     end

data/lib/business_time/config.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext'
 
 module BusinessTime
-  
+
   # controls the behavior of this gem.  You can change
   # the beginning_of_workday, end_of_workday, and the list of holidays
   # manually, or with a yaml file and the load method.
@@ -12,51 +12,83 @@ module BusinessTime
       #   BusinessTime::Config.beginning_of_workday = "8:30 am"
       # someplace in the initializers of your application.
       attr_accessor :beginning_of_workday
-      
+
       # You can set this yourself, either by the load method below, or
       # by saying
       #   BusinessTime::Config.end_of_workday = "5:30 pm"
       # someplace in the initializers of your application.
       attr_accessor :end_of_workday
-      
+
       # You can set this yourself, either by the load method below, or
       # by saying
       #   BusinessTime::Config.work_week = [:sun, :mon, :tue, :wed, :thu]
       # someplace in the initializers of your application.
       attr_accessor :work_week
-      
+
       # You can set this yourself, either by the load method below, or
       # by saying
       #   BusinessTime::Config.holidays << my_holiday_date_object
       # someplace in the initializers of your application.
       attr_accessor :holidays
 
+      # working hours for each day - if not set using global variables :beginning_of_workday 
+      # and end_of_workday. Keys will be added ad weekdays.
+      # Example:
+      #    {:mon => ["9:00","17:00"],:tue => ["9:00","17:00"].....}
+      attr_accessor :work_hours
+
+    end
+
+    def self.end_of_workday(day=nil)
+      if day
+        wday = @work_hours[self.int_to_wday(day.wday)]
+        wday ? (wday.last =~ /0{1,2}\:0{1,2}/ ? "23:59:59" : wday.last) : @end_of_workday
+      else
+        @end_of_workday
+      end
+    end
+
+    def self.beginning_of_workday(day=nil)
+      if day
+        wday = @work_hours[self.int_to_wday(day.wday)]
+        wday ? wday.first : @beginning_of_workday
+      else
+        @beginning_of_workday
+      end
     end
-    
+
     def self.work_week=(days)
       @work_week = days
       @weekdays = nil
     end
-    
+
     def self.weekdays
       return @weekdays unless @weekdays.nil?
-      
-      lowercase_day_names = ::Time::RFC2822_DAY_NAME.map(&:downcase)
-      
-      @weekdays = work_week.each_with_object([]) do |day_name, days|
-        day_num = lowercase_day_names.find_index(day_name.to_s.downcase)
+
+      @weekdays = (!work_hours.empty? ? work_hours.keys : work_week).each_with_object([]) do |day_name, days|
+        day_num = self.wday_to_int(day_name)
         days << day_num unless day_num.nil?
       end
     end
-    
+
+    def self.wday_to_int day_name
+      lowercase_day_names = ::Time::RFC2822_DAY_NAME.map(&:downcase)
+      lowercase_day_names.find_index(day_name.to_s.downcase)
+    end
+
+    def self.int_to_wday num
+      ::Time::RFC2822_DAY_NAME.map(&:downcase).map(&:to_sym)[num]
+    end
+
     def self.reset
       self.holidays = []
       self.beginning_of_workday = "9:00 am"
       self.end_of_workday = "5:00 pm"
       self.work_week = %w[mon tue wed thu fri]
+      self.work_hours = {}
       @weekdays = nil
     end
-    
+
     # loads the config data from a yaml file written as:
     #
     #   business_time:
@@ -66,20 +98,24 @@ module BusinessTime
     #       - Jan 1st, 2010
     #       - July 4th, 2010
     #       - Dec 25th, 2010
-    def self.load(filename)
+    def self.load(file)
       self.reset
-      data = YAML::load(File.open(filename))
-      self.beginning_of_workday = data["business_time"]["beginning_of_workday"]
-      self.end_of_workday = data["business_time"]["end_of_workday"]
-      self.work_week = data["business_time"]["work_week"]
-      data["business_time"]["holidays"].each do |holiday|
-        self.holidays << (Time.zone ? Time.zone.parse(holiday) : Time.parse(holiday))
+      data = YAML::load(file.respond_to?(:read) ? file : File.open(file))
+      config = (data["business_time"] || {})
+
+      # load each config variable from the file, if it's present and valid
+      config_vars = %w(beginning_of_workday end_of_workday work_week work_hours)
+      config_vars.each do |var|
+        send("#{var}=", config[var]) if config[var] && respond_to?("#{var}=")
+      end
+
+      (config["holidays"] || []).each do |holiday|
+        self.holidays << Date.parse(holiday)
       end
-      
     end
-    
+
     #reset the first time we are loaded.
     self.reset
   end
-  
+
 end

data/lib/{extensions → business_time/core_ext}/time.rb

@@ -7,9 +7,8 @@ class Time
     # 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_of_workday = Time.parse(BusinessTime::Config.end_of_workday(day))
+      change_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
@@ -17,9 +16,8 @@ class Time
     # 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))
+      beginning_of_workday = Time.parse(BusinessTime::Config.beginning_of_workday(day))
+      change_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
@@ -35,11 +33,11 @@ class Time
     end
 
     def before_business_hours?(time)
-      time < beginning_of_workday(time)
+      time.to_i < beginning_of_workday(time).to_i
     end
 
     def after_business_hours?(time)
-      time > end_of_workday(time)
+      time.to_i > end_of_workday(time).to_i
     end
 
     # Rolls forward to the next beginning_of_workday
@@ -48,19 +46,48 @@ class 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
+      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 += 1.day
+        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)
+      if (Time.before_business_hours?(time) || !Time.workday?(time))
+        prev_business_time = Time.end_of_workday(time) - 1.day
+      elsif Time.after_business_hours?(time)
+        prev_business_time = Time.end_of_workday(time)
+      else
+        prev_business_time = time.clone
+      end
+
+      while !Time.workday?(prev_business_time)
+        prev_business_time -= 1.day
+      end
+
+      prev_business_time
+    end
+
+    private
+
+    def change_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
 end
 
@@ -78,27 +105,44 @@ class 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 = 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
-    duration_of_working_day = Time.parse(BusinessTime::Config.end_of_workday) - Time.parse(BusinessTime::Config.beginning_of_workday)
-    result += (time_a.to_date.business_days_until(time_b.to_date) - 1) * duration_of_working_day
-    
+    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
 
-end
+end

data/lib/business_time/version.rb

@@ -1,3 +1,3 @@
 module BusinessTime
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/business_time.rb

@@ -1,10 +1,12 @@
 require 'thread'
-require "active_support"
+require 'active_support'
 require 'active_support/time'
-require "time"
-require "business_time/config"
-require "business_time/business_hours"
-require "business_time/business_days"
-require "extensions/date"
-require "extensions/time"
-require "extensions/fixnum"
+require 'time'
+
+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'
+

data/rails_generators/business_time_config/templates/business_time.rb

@@ -1,6 +1,7 @@
 BusinessTime::Config.load("#{Rails.root}/config/business_time.yml")
 
-# or you can configure it manually:  look at me!  I'm Tim Ferris!
+# or you can configure it manually:  look at me!  I'm Tim Ferriss!
 #  BusinessTime.Config.beginning_of_workday = "10:00 am"
-#  BusinessTime.Comfig.end_of_workday = "11:30 am"
-#  BusinessTime.config.holidays << Date.parse("August 4th, 2010")
+#  BusinessTime.Config.end_of_workday = "11:30 am"
+#  BusinessTime.Config.holidays << Date.parse("August 4th, 2010")
+

metadata

@@ -1,155 +1,127 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: business_time
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
+version: !ruby/object:Gem::Version
+  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - bokmann
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-12 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 3
-        - 31
+      - !ruby/object:Gem::Version
         version: 0.3.31
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.31
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: Have you ever wanted to do things like "6.business_days.from_now" and have weekends and holidays taken into account?  Now you can.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Have you ever wanted to do things like "6.business_days.from_now" and
+  have weekends and holidays taken into account?  Now you can.
 email: dbock@codesherpas.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.rdoc
 - lib/business_time.rb
 - lib/business_time/business_days.rb
 - lib/business_time/business_hours.rb
 - lib/business_time/config.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/version.rb
-- lib/extensions/date.rb
-- lib/extensions/fixnum.rb
-- lib/extensions/time.rb
 - lib/generators/business_time/config_generator.rb
 - rails_generators/business_time_config/business_time_config_generator.rb
 - rails_generators/business_time_config/templates/business_time.rb
 - rails_generators/business_time_config/templates/business_time.yml
-has_rdoc: true
 homepage: http://github.com/bokmann/business_time
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Support for doing time math in business hours and days
 test_files: []
-