business_time 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bdd88444abb3662202edb5a58a7966198095d0c
-  data.tar.gz: d3bb972b85a2f229c34a88511bcb6eb9595f8589
+  metadata.gz: 6a751f4e1f9392f84ebca332f961e63434779054
+  data.tar.gz: aed6514ab58ee91cac9d45414459d12cdb7b9e7f
 SHA512:
-  metadata.gz: b4d19b1491299ca47b3a765f701ba6ba909a5af84925005c75262679b4d193c70520d7938bc23c694fc03d5ee509c742f472285d82da75050aa457513d2f5f5f
-  data.tar.gz: c959f75f0cc63e165e7a55bceaddbc9dceefb0db9491cbeec38bf75944359c0113e20aa9a22460ee650071e6a7af515b7de6e3c3ceb4fa71004bda8f76f5e0fd
+  metadata.gz: 4e98626ba766dccef9d6f7826b456e17eada6258ad1e130d39a6fa423b4e99b9e301b8fb0748dfe6af5d172073b84c646ff96edaa4544fb1fa1ce60f4a49674d
+  data.tar.gz: 147619baf4a120328a78df160e4469874a040559b7acd4fb1fff5eacd0fb199ad904a3c239b25f376bdd63ffb6e1ecbeb722d8078163c69ea3a41adbf050e321

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:
 
@@ -42,8 +42,12 @@ I needed this, but taking into account business hours/days and holidays.
     1.business_day.ago
     4.business_days.ago
     8.business_days.ago
+    
+    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.
+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,39 +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
 
-    # you can also determine if a given time is within business hours
+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:
+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
+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
+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
@@ -205,4 +216,4 @@ I'm hoping Arild and I write some good blog entries on the subject at http://blo
 
 == Copyright
 
-Copyright (c) 2010,2011,2012,2013 bokmann. See LICENSE for details.
+Copyright (c) 2010-2016 bokmann. See LICENSE for details.

data/lib/business_time/business_days.rb

@@ -2,15 +2,30 @@ require 'active_support/time'
 
 module BusinessTime
   class BusinessDays
+    include Comparable
+    attr_reader :days
+
     def initialize(days)
       @days = days
     end
 
+    def <=>(other)
+      if other.class != self.class
+        raise ArgumentError.new("#{self.class} can't be compared with #{other.class}")
+      end
+      self.days <=> other.days
+    end
+
     def after(time = Time.current)
       days = @days
       while days > 0 || !time.workday?
         days -= 1 if time.workday?
-        time = time + 1.day
+        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
@@ -22,7 +37,14 @@ module BusinessTime
       days = @days
       while days > 0 || !time.workday?
         days -= 1 if time.workday?
-        time = time - 1.day
+        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

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

data/lib/business_time/config.rb

@@ -20,13 +20,27 @@ module BusinessTime
       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
+        Thread.current[:business_time_local_config]
+      end
+
+      def local_config=(config)
+        Thread.current[:business_time_local_config] = config
+      end
+
+      def local_config?
+        !local_config.nil?
+      end
+
       def threadsafe_cattr_accessor(name)
         define_singleton_method name do
           config[name]
@@ -131,11 +145,11 @@ module BusinessTime
       end
 
       def with(config)
-        old = config().dup
+        self.local_config = config().dup
         config.each { |k,v| send("#{k}=", v) } # calculations are done on setting
         yield
       ensure
-        self.config = old
+        self.local_config = nil
       end
 
       def default_config
@@ -154,7 +168,8 @@ module BusinessTime
       end
 
       def reset
-        self.config = default_config
+        self.config       = default_config
+        self.local_config = nil
       end
 
       def deep_dup(object)

data/lib/business_time/core_ext/date.rb

@@ -2,11 +2,15 @@
 class Date
   include BusinessTime::TimeExtensions
 
-  def business_days_until(to_date)
-    business_dates_until(to_date).size
+  def business_days_until(to_date, inclusive = false)
+    business_dates_until(to_date, inclusive).size
   end
 
-  def business_dates_until(to_date)
-    (self...to_date).select { |day| day.workday? }
+  def business_dates_until(to_date, inclusive = false)
+    if inclusive
+      (self..to_date).select(&:workday?)
+    else
+      (self...to_date).select(&:workday?)
+    end
   end
-end
+end

data/lib/business_time/time_extensions.rb

@@ -98,6 +98,16 @@ module BusinessTime
         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 day.workday?
 
@@ -159,7 +169,7 @@ 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

data/lib/business_time/version.rb

@@ -1,3 +1,3 @@
 module BusinessTime
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_time
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - bokmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -96,7 +96,7 @@ dependencies:
         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: []
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Support for doing time math in business hours and days