business_time 0.7.3 → 0.9.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5fe356eb4f4e620e3f3db2aa9242df1c63213500
+  data.tar.gz: d1f662a4f576662e3f6d140970d5b2191016fda8
+SHA512:
+  metadata.gz: 86434d31fbf26aa3372510db883266643431a449fa2980cee43e9d34198c140a560d0606d41911aa0a47e030b373eeba0442f38dad07c36a5b5113a811c97213
+  data.tar.gz: 5c1ae7866418a21538030ba2129698eaafb2016b5d715cd2c13e31e1739b8732ff625af6f87e48e98bbe697ea06005d74c35bfab7c8610b306f7ba7c9d0121b5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009,2010,2011,2012 bokmann
+Copyright (c) 2009-2016 bokmann
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -15,11 +15,11 @@ as well as helpers to do that from any provided date or time.
 I needed this, but taking into account business hours/days and holidays.
 
 == Usage
-* install the gem
+=== install the gem
 
     gem install business_time
 
-* open up your console
+=== open up your console
 
     # if in irb, add these lines:
 
@@ -43,7 +43,11 @@ I needed this, but taking into account business hours/days and holidays.
     4.business_days.ago
     8.business_days.ago
 
-    # and we can do it from any Date or Time object.
+    Date.today.workday?
+    Date.parse("2015-12-09").workday?
+    Date.parse("2015-12-12").workday?
+
+And we can do it from any Date or Time object.
     my_birthday = Date.parse("August 4th, 1969")
     8.business_days.after(my_birthday)
     8.business_days.before(my_birthday)
@@ -53,24 +57,24 @@ I needed this, but taking into account business hours/days and holidays.
     8.business_days.before(my_birthday)
 
 
-    # We can adjust the start and end time of our business hours
+We can adjust the start and end time of our business hours
     BusinessTime::Config.beginning_of_workday = "8:30 am"
     BusinessTime::Config.end_of_workday = "5:30 pm"
 
-    # and we can add holidays that don't count as business days
-    # July 5 in 2010 is a monday that the U.S. takes off because our independence day falls on that Sunday.
+and we can add holidays that don't count as business days
+July 5 in 2010 is a monday that the U.S. takes off because our independence day falls on that Sunday.
     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_morning = 1.business_hour.after(friday_afternoon)
 
-    # plus, we can change the work week:
+plus, we can change the work week:
     # July 9th in 2010 is a Friday.
     BusinessTime::Config.work_week = [:sun, :mon, :tue, :wed, :thu]
     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:
+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"],
@@ -80,26 +84,46 @@ I needed this, but taking into account business hours/days and holidays.
     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
+You can also calculate business duration between two dates
     friday = Date.parse("December 24, 2010")
     monday = Date.parse("December 27, 2010")
     friday.business_days_until(monday) #=> 1
 
-    # or you can calculate business duration between two Time objects
+Or you can calculate business duration between two Time objects
     ticket_reported = Time.parse("February 3, 2012, 10:40 am")
     ticket_resolved = Time.parse("February 4, 2012, 10:50 am")
     ticket_reported.business_time_until(ticket_resolved) #=> 8.hours + 10.minutes
 
-    # note that counterintuitively, durations might not be quite what you expect when involving weekends.
-    # Consider the following example:
+You can also determine if a given time is within business hours
+    Time.parse("February 3, 2012, 10:00 am").during_business_hours?
+
+Note that counterintuitively, durations might not be quite what you expect when involving weekends.
+Consider the following example:
     ticket_reported = Time.parse("February 3, 2012, 10:40 am")
     ticket_resolved = Time.parse("February 4, 2012, 10:40 am")
     ticket_reported.business_time_until(ticket_resolved) # will equal 6 hours and 20 minutes!
 
-    # why does this happen?  Feb 4 2012 is a Saturday.  That time will roll over to
-    # Monday, Feb 6th 2012, 9:00am.  The business time between 10:40am friday and 9am monday is
-    # 6 hours and 20 minutes. From a quick inspection of the code, it looks like it should be 8 hours.
-
+Why does this happen?  Feb 4 2012 is a Saturday.  That time will roll over to
+Monday, Feb 6th 2012, 9:00am.  The business time between 10:40am friday and 9am monday is
+6 hours and 20 minutes. From a quick inspection of the code, it looks like it should be 8 hours.
+
+Or you can calculate business dates between two dates
+    monday = Date.parse("December 20, 2010")
+    wednesday = Date.parse("December 22, 2010")
+    monday.business_dates_until(wednesday) #=> [Mon, 20 Dec 2010, Tue, 21 Dec 2010]
+
+You can get the first workday after a time or return itself if it is a workday
+    saturday = Time.parse("Sat Aug 9, 18:00:00, 2014")
+    monday = Time.parse("Mon Aug 11, 18:00:00, 2014")
+    Time.first_business_day(saturday) #=> "Mon Aug 11, 18:00:00, 2014"
+    Time.first_business_day(monday) #=> "Mon Aug 11, 18:00:00, 2014"
+
+    # similar to Time#first_business_day Time#previous_business_day only cares about
+    # workdays:
+    saturday = Time.parse("Sat Aug 9, 18:00:00, 2014")
+    monday = Time.parse("Mon Aug 11, 18:00:00, 2014")
+    Time.previous_business_day(saturday) #=> "Fri Aug 8, 18:00:00, 2014"
+    Time.previous_business_day(monday) #=> "Mon Aug 11, 18:00:00, 2014"
 == Rails generator
 
     rails generate business_time:config
@@ -123,12 +147,11 @@ and some complexities (bugs?) in the timeWithZone class, this was harder than ex
   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...
+This can lead to some weird 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.
 
 == Integration with the Holidays gem
 
@@ -141,16 +164,6 @@ I'm hoping Arild and I write some good blog entries on the subject at http://blo
     # BusinessTime::Config.holidays << holiday[:date].next_week if !holiday[:date].weekday?
   end
 
-== Releases
-
-0.7.1 - fixing a multithreaded issue, upgrading some dependencies, loosening the dependency on TZInfo
-
-0.7.0 - major maintenance upgrade on the process of constructing the gem, testing the gem, and updating dependencies.
-        the api has not changed.
-
-
-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
  * Enrico Bianco  http://github.com/enricob
@@ -158,6 +171,8 @@ I'm hoping Arild and I write some good blog entries on the subject at http://blo
  * Piotr Jakubowski http://github.com/piotrj
  * Glenn Vanderburg http://github.com/glv
  * Michael Grosser http://github.com/grosser
+ * Michael Curtis http://github.com/mcurtis
+ * Brian Ewins http://github.com/bazzargh
 
  (Special thanks for Arild on the complexities of dealing with TimeWithZone)
 
@@ -189,6 +204,20 @@ I'm hoping Arild and I write some good blog entries on the subject at http://blo
   need the baggage.
 
 
+== A note on stability and change
+
+Sometimes people ask me why this gem doesn't release more often.  My opinions on that are best discussed in person in a friendly discussion, but I'll attempt some of that here.
+
+First, a big part of the reason is that the projects I do use this gem on are happy with it's current functionality.  It is 'suitable for the purpose' for which I released it, and as such, maintenance I do on this gem is a gift to the community.
+
+Second, out of the ~1.3 million downloads (according to rubygems.org), the number of real 'issues' with this gem have been minimal.  Most of the issues that are opened are really people with slightly different requirements than I have regarding whether 'off hours' work counts as the previous or the next business day, a disagreement on the semantics of days vs. hours, etc.  I take care to try to explain these choices in the open issues, but to my mind, they aren't true issues if it's just a difference of opinion.  Even so, I'll gladly accept pull requests that resolve this difference of opinion as a configuration option... just don't expect me to do your job for you.  I've already given you 90% of what you need.
+
+Third, a business time gem is, well, relevant to businesses.  Many businesses don't move quickly.  My government clients move even more slowly.  Stability is favored in these environments.
+
+Fourth, new features can wait.  To the person that adds them they can be mission critical, but with modern packaging processes, they can use their version without waiting for their changes to be included in the upstream version.  Their changes don't break your code.
+
+I'm proud of the work in this gem; the stability is a big part of that.  This gem has lived longer than many others that have attempted to do the same thing.  I expect it to be here chugging away when Ruby has become the next COBOL.
+
 == Copyright
 
-Copyright (c) 2010,2011,2012,2013 bokmann. See LICENSE for details.
+Copyright (c) 2010-2017 bokmann. See LICENSE for details.

data/lib/business_time.rb

@@ -4,12 +4,14 @@ require 'active_support/time'
 require 'time'
 require 'yaml'
 
+require 'business_time/parsed_time'
+require 'business_time/version'
 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/fixnum'
+require 'business_time/core_ext/integer'
 
 require 'business_time/time_extensions'
+require 'business_time/core_ext/date'
 require 'business_time/core_ext/time'
 require 'business_time/core_ext/active_support/time_with_zone'

data/lib/business_time/business_days.rb

@@ -1,38 +1,67 @@
 require 'active_support/time'
 
 module BusinessTime
-  
   class BusinessDays
+    include Comparable
+    attr_reader :days
+
     def initialize(days)
       @days = days
     end
 
-    def after(time = Time.now)
-      time = Time.zone ? Time.zone.parse(time.strftime('%Y-%m-%d %H:%M:%S %z')) : Time.parse(time.strftime('%Y-%m-%d %H:%M:%S %z'))
-      days = @days
-      while days > 0 || !Time.workday?(time)
-        days -= 1 if Time.workday?(time)
-        time = time + 1.day
+    def <=>(other)
+      if other.class != self.class
+        raise ArgumentError.new("#{self.class} can't be compared with #{other.class}")
       end
-      time
+      self.days <=> other.days
+    end
+
+    def after(time = Time.current)
+      non_negative_days? ? calculate_after(time, @days) : calculate_before(time, -@days)
     end
-    
+
     alias_method :from_now, :after
     alias_method :since, :after
-    
-    def before(time = Time.now)
-      time = Time.zone ? Time.zone.parse(time.rfc822) : Time.parse(time.rfc822)
-      days = @days
-      while days > 0 || !Time.workday?(time)
-        days -= 1 if Time.workday?(time)
-        time = time - 1.day
-      end
-      time
+
+    def before(time = Time.current)
+      non_negative_days? ? calculate_before(time, @days) : calculate_after(time, -@days)
     end
-    
+
     alias_method :ago, :before
     alias_method :until, :before
-  
-  end  
-  
+
+    private
+
+    def non_negative_days?
+      @days >= 0
+    end
+
+    def calculate_after(time, days)
+      while days > 0 || !time.workday?
+        days -= 1 if time.workday?
+        time += 1.day
+      end
+      # If we have a Time or DateTime object, we can roll_forward to the
+      #   beginning of the next business day
+      if time.is_a?(Time) || time.is_a?(DateTime)
+        time = Time.roll_forward(time) unless time.during_business_hours?
+      end
+      time
+    end
+
+    def calculate_before(time, days)
+      while days > 0 || !time.workday?
+        days -= 1 if time.workday?
+        time -= 1.day
+      end
+      # If we have a Time or DateTime object, we can roll_backward to the
+      #   beginning of the previous business day
+      if time.is_a?(Time) || time.is_a?(DateTime)
+        unless time.during_business_hours?
+          time = Time.beginning_of_workday(Time.roll_backward(time))
+        end
+      end
+      time
+    end
+  end
 end

data/lib/business_time/business_hours.rb

@@ -1,10 +1,20 @@
 module BusinessTime
 
   class BusinessHours
+    include Comparable
+    attr_reader :hours
+    
     def initialize(hours)
       @hours = hours
     end
 
+    def <=>(other)
+      if other.class != self.class
+        raise ArgumentError.new("#{self.class.to_s} can't be compared with #{other.class.to_s}")
+      end
+      self.hours <=> other.hours
+    end
+    
     def ago
       Time.zone ? before(Time.zone.now) : before(Time.now)
     end
@@ -14,9 +24,24 @@ module BusinessTime
     end
 
     def after(time)
+      non_negative_hours? ? calculate_after(time, @hours) : calculate_before(time, -@hours)
+    end
+    alias_method :since, :after
+
+    def before(time)
+      non_negative_hours? ? calculate_before(time, @hours) : calculate_after(time, -@hours)
+    end
+
+    private
+
+    def non_negative_hours?
+      @hours >= 0
+    end
+
+    def calculate_after(time, hours)
       after_time = Time.roll_forward(time)
       # Step through the hours, skipping over non-business hours
-      @hours.times do
+      hours.times do
         after_time = after_time + 1.hour
 
         if after_time.hour == 0 && after_time.min == 0 && after_time.sec == 0
@@ -28,18 +53,17 @@ module BusinessTime
         end
 
         # Ignore weekends and holidays
-        while !Time.workday?(after_time)
+        while !after_time.workday?
           after_time = after_time + 1.day
         end
       end
       after_time
     end
-    alias_method :since, :after
 
-    def before(time)
+    def calculate_before(time, hours)
       before_time = Time.roll_backward(time)
       # Step through the hours, skipping over non-business hours
-      @hours.times do
+      hours.times do
         before_time = before_time - 1.hour
 
         if before_time.hour == 0 && before_time.min == 0 && before_time.sec == 0
@@ -50,13 +74,13 @@ module BusinessTime
 
           # 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/
+          time_roll_backward += 1.second if time_roll_backward.iso8601 =~ /23:59:59/
 
           before_time = time_roll_backward - delta
         end
 
         # Ignore weekends and holidays
-        while !Time.workday?(before_time)
+        while !before_time.workday?
           before_time = before_time - 1.day
         end
       end

data/lib/business_time/config.rb

@@ -7,30 +7,73 @@ module BusinessTime
   # manually, or with a yaml file and the load method.
   class Config
     DEFAULT_CONFIG = {
-      holidays:              [],
-      beginning_of_workday:  '9:00 am',
-      end_of_workday:        '5:00 pm',
+      holidays:              SortedSet.new,
+      beginning_of_workday:  ParsedTime.parse('9:00 am'),
+      end_of_workday:        ParsedTime.parse('5:00 pm'),
       work_week:             %w(mon tue wed thu fri),
       work_hours:            {},
       work_hours_total:      {},
       _weekdays:             nil,
+      fiscal_month_offset:   10,
     }
 
     class << self
+      def beginning_of_workday=(time)
+        config[:beginning_of_workday] = ParsedTime.parse(time)
+      end
+
+      def end_of_workday=(time)
+        config[:end_of_workday] = ParsedTime.parse(time)
+      end
+
+      def work_hours=(work_hours)
+        work_hours.each_with_object(config[:work_hours] = {}) do |(day, hours), c|
+          c[day] = hours.map do |time|
+            ParsedTime.parse(time)
+          end
+        end
+      end
+
       private
 
       def config
+        return local_config if local_config?
         Thread.main[:business_time_config] ||= default_config
       end
 
       def config=(config)
+        return self.local_config = config if local_config?
         Thread.main[:business_time_config] = config
       end
 
+      def local_config
+        local_config_stack.last
+      end
+
+      def local_config=(config)
+        local_config_stack.last.replace(config)
+      end
+
+      def local_config_stack
+        Thread.current[:business_time_local_config] ||= []
+      end
+
+      def local_config?
+        !local_config_stack.empty?
+      end
+
       def threadsafe_cattr_accessor(name)
+        threadsafe_cattr_reader(name)
+        threadsafe_cattr_setter(name)
+      end
+
+      def threadsafe_cattr_reader(name)
         define_singleton_method name do
           config[name]
         end
+      end
+
+      def threadsafe_cattr_setter(name)
         define_singleton_method "#{name}=" do |value|
           config[name] = value
         end
@@ -41,13 +84,13 @@ module BusinessTime
     # by saying
     #   BusinessTime::Config.beginning_of_workday = "8:30 am"
     # someplace in the initializers of your application.
-    threadsafe_cattr_accessor :beginning_of_workday
+    threadsafe_cattr_reader :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.
-    threadsafe_cattr_accessor :end_of_workday
+    threadsafe_cattr_reader :end_of_workday
 
     # You can set this yourself, either by the load method below, or
     # by saying
@@ -65,18 +108,20 @@ module BusinessTime
     # and end_of_workday. Keys will be added ad weekdays.
     # Example:
     #    {:mon => ["9:00","17:00"],:tue => ["9:00","17:00"].....}
-    threadsafe_cattr_accessor :work_hours
+    threadsafe_cattr_reader :work_hours
 
     # total work hours for a day. Never set, always calculated.
     threadsafe_cattr_accessor :work_hours_total
 
     threadsafe_cattr_accessor :_weekdays # internal
 
+    threadsafe_cattr_accessor :fiscal_month_offset
+
     class << self
       def end_of_workday(day=nil)
         if day
           wday = work_hours[int_to_wday(day.wday)]
-          wday ? (wday.last =~ /^0{1,2}\:0{1,2}$/ ? "23:59:59" : wday.last) : config[:end_of_workday]
+          wday ? (wday.last == ParsedTime.new(0, 0) ? ParsedTime.new(23, 59, 59) : wday.last) : config[:end_of_workday]
         else
           config[:end_of_workday]
         end
@@ -99,10 +144,11 @@ module BusinessTime
       def weekdays
         return _weekdays unless _weekdays.nil?
 
-        self._weekdays = (!work_hours.empty? ? work_hours.keys : work_week).each_with_object([]) do |day_name, days|
-          day_num = wday_to_int(day_name)
-          days << day_num unless day_num.nil?
-        end
+        days = (!work_hours.empty? ? work_hours.keys : work_week).map do |day_name|
+          wday_to_int(day_name)
+        end.compact
+
+        self._weekdays = SortedSet.new(days)
       end
 
       # loads the config data from a yaml file written as:
@@ -131,11 +177,11 @@ module BusinessTime
       end
 
       def with(config)
-        old = config().dup
+        local_config_stack.push(config().dup)
         config.each { |k,v| send("#{k}=", v) } # calculations are done on setting
         yield
       ensure
-        self.config = old
+        local_config_stack.pop
       end
 
       def default_config
@@ -154,6 +200,7 @@ module BusinessTime
       end
 
       def reset
+        local_config_stack.clear
         self.config = default_config
       end
 

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

@@ -1,3 +1,4 @@
 class ActiveSupport::TimeWithZone
   include BusinessTime::TimeExtensions
+  extend BusinessTime::TimeExtensions::ClassMethods
 end

data/lib/business_time/core_ext/date.rb

@@ -1,14 +1,61 @@
 # Add workday and weekday concepts to the Date class
 class Date
-  def workday?
-    weekday? && !BusinessTime::Config.holidays.include?(self)
+  include BusinessTime::TimeExtensions
+
+  def business_days_until(to_date, inclusive = false)
+    business_dates_until(to_date, inclusive).size
+  end
+
+  def business_dates_until(to_date, inclusive = false)
+    if inclusive
+      (self..to_date).select(&:workday?)
+    else
+      (self...to_date).select(&:workday?)
+    end
+  end
+
+  # Adapted from:
+  # https://github.com/activewarehouse/activewarehouse/blob/master/lib/active_warehouse/core_ext/time/calculations.rb
+
+  def week
+    cyw = ((yday - 1) / 7) + 1
+    cyw = 52 if cyw == 53
+    cyw
+  end
+
+  def quarter
+    ((month - 1) / 3) + 1
+  end
+
+  def fiscal_month_offset
+    BusinessTime::Config.fiscal_month_offset
+  end
+
+  def fiscal_year_week
+    fyw = ((fiscal_year_yday - 1) / 7) + 1
+    fyw = 52 if fyw == 53
+    fyw
+  end
+
+  def fiscal_year_month
+    shifted_month = month - (fiscal_month_offset - 1)
+    shifted_month += 12 if shifted_month <= 0
+    shifted_month
+  end
+
+  def fiscal_year_quarter
+    ((fiscal_year_month - 1) / 3) + 1
   end
 
-  def weekday?
-    BusinessTime::Config.weekdays.include? wday
+  def fiscal_year
+    month >= fiscal_month_offset ? year + 1 : year
   end
 
-  def business_days_until(to_date)
-    (self...to_date).select{ |day| day.workday? }.size
+  def fiscal_year_yday
+    offset_days = 0
+    1.upto(fiscal_month_offset - 1) { |m| offset_days += ::Time.days_in_month(m, year) }
+    shifted_year_day = yday - offset_days
+    shifted_year_day += 365 if shifted_year_day <= 0
+    shifted_year_day
   end
 end

data/lib/business_time/core_ext/{fixnum.rb → integer.rb}

@@ -1,9 +1,9 @@
-# hook into fixnum so we can say things like:
+# hook into Integer so we can say things like:
 #  5.business_hours.from_now
 #  7.business_days.ago
 #  3.business_days.after(some_date)
 #  4.business_hours.before(some_date_time)
-class Fixnum
+class Integer
   def business_hours
     BusinessTime::BusinessHours.new(self)
   end

data/lib/business_time/core_ext/time.rb

@@ -1,4 +1,5 @@
 # Add workday and weekday concepts to the Time class
 class Time
   include BusinessTime::TimeExtensions
+  extend BusinessTime::TimeExtensions::ClassMethods
 end

data/lib/business_time/parsed_time.rb

@@ -0,0 +1,34 @@
+module BusinessTime
+  class ParsedTime
+    include Comparable
+
+    attr_reader :hour, :min, :sec
+
+    def initialize(hour, min = 0, sec = 0)
+      @hour = hour
+      @min = min
+      @sec = sec
+    end
+
+    def self.parse(time_or_string)
+      if time_or_string.is_a?(String)
+        time = Time.parse(time_or_string)
+      else
+        time = time_or_string
+      end
+      new(time.hour, time.min, time.sec)
+    end
+
+    def to_s
+      "#{hour}:#{min}:#{sec}"
+    end
+
+    def -(other)
+      (hour - other.hour) * 3600 + (min - other.min) * 60 + sec - other.sec
+    end
+
+    def <=>(other)
+      [hour, min, sec] <=> [other.hour, other.min, other.sec]
+    end
+  end
+end

data/lib/business_time/time_extensions.rb

@@ -1,7 +1,14 @@
 module BusinessTime
   module TimeExtensions
-    def self.included(base)
-      base.extend(ClassMethods)
+    # 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?
+      weekday? && !BusinessTime::Config.holidays.include?(to_date)
+    end
+
+    # True if this time falls on a weekday.
+    def weekday?
+      BusinessTime::Config.weekdays.include?(wday)
     end
 
     module ClassMethods
@@ -10,7 +17,7 @@ module BusinessTime
       # 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))
+        end_of_workday = BusinessTime::Config.end_of_workday(day)
         change_business_time(day,end_of_workday.hour,end_of_workday.min,end_of_workday.sec)
       end
 
@@ -19,20 +26,21 @@ module BusinessTime
       # 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))
+        beginning_of_workday = 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)
+        ActiveSupport::Deprecation.warn("`Time.workday?(time)` is deprecated. Please use `time.workday?`")
+        day.workday?
       end
 
       # True if this time falls on a weekday.
       def weekday?(day)
-        BusinessTime::Config.weekdays.include? day.wday
+        ActiveSupport::Deprecation.warn("`Time.weekday?(time)` is deprecated. Please use `time.weekday?`")
+        day.weekday?
       end
 
       def before_business_hours?(time)
@@ -47,7 +55,7 @@ module BusinessTime
       # when the time is outside of business hours
       def roll_forward(time)
 
-        if Time.before_business_hours?(time) || !Time.workday?(time)
+        if Time.before_business_hours?(time) || !time.workday?
           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)
@@ -55,17 +63,27 @@ module BusinessTime
           next_business_time = time.clone
         end
 
-        while !Time.workday?(next_business_time)
+        while !next_business_time.workday?
           next_business_time = Time.beginning_of_workday(next_business_time + 1.day)
         end
 
         next_business_time
       end
 
+      # Returns the time parameter itself if it is a business day
+      # or else returns the next business day
+      def first_business_day(time)
+        while !time.workday?
+          time = time + 1.day
+        end
+
+        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))
+        prev_business_time = if (Time.before_business_hours?(time) || !time.workday?)
                                Time.end_of_workday(time - 1.day)
                              elsif Time.after_business_hours?(time)
                                Time.end_of_workday(time)
@@ -73,30 +91,40 @@ module BusinessTime
                                time.clone
                              end
 
-        while !Time.workday?(prev_business_time)
+        while !prev_business_time.workday?
           prev_business_time = Time.end_of_workday(prev_business_time - 1.day)
         end
 
         prev_business_time
       end
 
+      # Returns the time parameter itself if it is a business day
+      # or else returns the previous business day
+      def previous_business_day(time)
+        while !time.workday?
+          time = time - 1.day
+        end
+
+        time
+      end
+
       def work_hours_total(day)
-        return 0 unless Time.workday?(day)
+        return 0 unless day.workday?
 
         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
+            if hours_last == ParsedTime.new(0, 0)
+              (ParsedTime.new(23, 59) - hours.first) + 1.minute
             else
-              Time.parse(hours_last) - Time.parse(hours.first)
+              hours_last - 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)
+            BusinessTime::Config.end_of_workday - BusinessTime::Config.beginning_of_workday
           end
         end
       end
@@ -104,11 +132,7 @@ module BusinessTime
       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
+        time.change(:hour => hour, :min => min, :sec => sec)
       end
     end
 
@@ -141,5 +165,34 @@ module BusinessTime
         first_day + days_in_between + last_day
       end * direction
     end
+
+    def during_business_hours?
+      self.workday? && self.to_i.between?(Time.beginning_of_workday(self).to_i, Time.end_of_workday(self).to_i)
+    end
+
+    def consecutive_workdays
+      workday? ? consecutive_days { |date| date.workday? } : []
+    end
+
+    def consecutive_non_working_days
+      !workday? ? consecutive_days { |date| !date.workday? } : []
+    end
+
+    private
+
+    def consecutive_days
+      days = []
+      date = self + 1.day
+      while yield(date)
+        days << date
+        date += 1.day
+      end
+      date = self - 1.day
+      while yield(date)
+        days << date
+        date -= 1.day
+      end
+      (days << self).sort
+    end
   end
 end

data/lib/business_time/version.rb

@@ -1,3 +1,3 @@
 module BusinessTime
-  VERSION = "0.7.3"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,115 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: business_time
 version: !ruby/object:Gem::Version
-  version: 0.7.3
-  prerelease: 
+  version: 0.9.3
 platform: ruby
 authors:
 - bokmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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
+email: dbock@javaguy.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -122,8 +109,9 @@ files:
 - 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/integer.rb
 - lib/business_time/core_ext/time.rb
+- lib/business_time/parsed_time.rb
 - lib/business_time/time_extensions.rb
 - lib/business_time/version.rb
 - lib/generators/business_time/config_generator.rb
@@ -133,32 +121,25 @@ files:
 homepage: https://github.com/bokmann/business_time
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1720097037897540308
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1720097037897540308
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Support for doing time math in business hours and days
 test_files: []