business_time 0.7.3 → 0.7.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5bdd88444abb3662202edb5a58a7966198095d0c
+  data.tar.gz: d3bb972b85a2f229c34a88511bcb6eb9595f8589
+SHA512:
+  metadata.gz: b4d19b1491299ca47b3a765f701ba6ba909a5af84925005c75262679b4d193c70520d7938bc23c694fc03d5ee509c742f472285d82da75050aa457513d2f5f5f
+  data.tar.gz: c959f75f0cc63e165e7a55bceaddbc9dceefb0db9491cbeec38bf75944359c0113e20aa9a22460ee650071e6a7af515b7de6e3c3ceb4fa71004bda8f76f5e0fd

data/README.rdoc

@@ -90,6 +90,9 @@ I needed this, but taking into account business hours/days and holidays.
     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
+    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")
@@ -100,6 +103,16 @@ I needed this, but taking into account business hours/days and holidays.
     # 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"
 == Rails generator
 
     rails generate business_time:config
@@ -158,6 +171,7 @@ 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
 
  (Special thanks for Arild on the complexities of dealing with TimeWithZone)
 

data/lib/business_time.rb

@@ -7,9 +7,9 @@ require 'yaml'
 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/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,33 @@
 require 'active_support/time'
 
 module BusinessTime
-  
   class BusinessDays
     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'))
+    def after(time = Time.current)
       days = @days
-      while days > 0 || !Time.workday?(time)
-        days -= 1 if Time.workday?(time)
+      while days > 0 || !time.workday?
+        days -= 1 if time.workday?
         time = time + 1.day
       end
       time
     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)
+
+    def before(time = Time.current)
       days = @days
-      while days > 0 || !Time.workday?(time)
-        days -= 1 if Time.workday?(time)
+      while days > 0 || !time.workday?
+        days -= 1 if time.workday?
         time = time - 1.day
       end
       time
     end
-    
+
     alias_method :ago, :before
     alias_method :until, :before
-  
-  end  
-  
+  end
 end

data/lib/business_time/business_hours.rb

@@ -28,7 +28,7 @@ module BusinessTime
         end
 
         # Ignore weekends and holidays
-        while !Time.workday?(after_time)
+        while !after_time.workday?
           after_time = after_time + 1.day
         end
       end
@@ -56,7 +56,7 @@ module BusinessTime
         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/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,12 @@
 # Add workday and weekday concepts to the Date class
 class Date
-  def workday?
-    weekday? && !BusinessTime::Config.holidays.include?(self)
-  end
+  include BusinessTime::TimeExtensions
 
-  def weekday?
-    BusinessTime::Config.weekdays.include? wday
+  def business_days_until(to_date)
+    business_dates_until(to_date).size
   end
 
-  def business_days_until(to_date)
-    (self...to_date).select{ |day| day.workday? }.size
+  def business_dates_until(to_date)
+    (self...to_date).select { |day| day.workday? }
   end
-end
+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/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
@@ -26,13 +33,14 @@ module BusinessTime
       # 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,7 +91,7 @@ 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
 
@@ -81,7 +99,7 @@ module BusinessTime
       end
 
       def work_hours_total(day)
-        return 0 unless Time.workday?(day)
+        return 0 unless day.workday?
 
         day = day.strftime('%a').downcase.to_sym
 
@@ -141,5 +159,9 @@ 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
   end
 end

data/lib/business_time/version.rb

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

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: business_time
 version: !ruby/object:Gem::Version
-  version: 0.7.3
-  prerelease: 
+  version: 0.7.4
 platform: ruby
 authors:
 - bokmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2015-04-12 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.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
@@ -133,32 +120,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.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Support for doing time math in business hours and days
 test_files: []