business_time 0.9.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa0158cf6f58b97d18d14f31f5e1fa969b880cd7
-  data.tar.gz: f7144c2f47e4ce925c19d661715212469f278245
+SHA256:
+  metadata.gz: e917428c31758c1ce02b1bfae4f1ab3c864e8b3eb3f12ec3556445c390506820
+  data.tar.gz: 1f8020bef45cdbdb1981fe9452633a427a202c7bc4d4f3390ca955b8f6c7a49c
 SHA512:
-  metadata.gz: 015f73637a4d3958b08442811e12552edfb68a251c6b5624e57ed46ec8fc923f48a70105d3082da292ada0c4fe3eeda590a8b228b038fde1c2e513411561d1d6
-  data.tar.gz: 7374e3d3c4264f29a5447408fb4932a2099af93b3e628a3f5a10a950ce27ea599fe624e3bd1158f564e66293e292177aadc6819e34db85a05a289c72568f72be
+  metadata.gz: 8ffe3ada04985e1f12d6eb8c011e6dcfd4c09f02dc589e82e73fac1571af3caad6c52c2e80d7e312eb05cbdf5eda1ce39a251e6df2378d389f9fc49884ab7a5c
+  data.tar.gz: 1c244d0e42b7222422e5b6d2317aa1bdf9f5339ee71cae551c7c9a406add3b84dc6eed57e8d58e19a21dce10af10ba96e521eeb124a327510ea1827a17d9e2c0

data/README.rdoc

@@ -1,6 +1,6 @@
 = business_time
 
-{<img src="https://secure.travis-ci.org/bokmann/business_time.png" />}[http://travis-ci.org/bokmann/business_time]
+{<img src="https://github.com/bokmann/business_time/workflows/CI/badge.svg" />}[https://github.com/bokmann/business_time/actions?query=workflow%3ACI]
 
 ActiveSupport gives us some great helpers so we can do things like:
 
@@ -61,6 +61,11 @@ 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"
 
+Or we can temporarily override the configured values
+    BusinessTime::Config.with(beginning_of_workday: "8 am", end_of_workday: "6 pm") do
+      1.business_hour.from_now
+    end
+
 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")
@@ -166,6 +171,7 @@ Timezone relative date handling gets more and more complicated every time you lo
 
 == Contributors
  * David Bock  http://github.com/bokmann
+ * Ryan McGeary  http://github.com/rmm5t
  * Enrico Bianco  http://github.com/enricob
  * Arild Shirazi  http://github.com/ashirazi
  * Piotr Jakubowski http://github.com/piotrj
@@ -220,4 +226,4 @@ I'm proud of the work in this gem; the stability is a big part of that.  This ge
 
 == Copyright
 
-Copyright (c) 2010-2017 bokmann. See LICENSE for details.
+Copyright (c) 2010-2021 bokmann. See LICENSE for details.

data/lib/business_time/business_days.rb

@@ -17,7 +17,29 @@ module BusinessTime
     end
 
     def after(time = Time.current)
-      days = @days
+      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.current)
+      non_negative_days? ? calculate_before(time, @days) : calculate_after(time, -@days)
+    end
+
+    alias_method :ago, :before
+    alias_method :until, :before
+
+    private
+
+    def non_negative_days?
+      @days >= 0
+    end
+
+    def calculate_after(time, days)
+      if (time.is_a?(Time) || time.is_a?(DateTime)) && !time.workday?
+        time = Time.beginning_of_workday(time)
+      end
       while days > 0 || !time.workday?
         days -= 1 if time.workday?
         time += 1.day
@@ -30,11 +52,10 @@ module BusinessTime
       time
     end
 
-    alias_method :from_now, :after
-    alias_method :since, :after
-
-    def before(time = Time.current)
-      days = @days
+    def calculate_before(time, days)
+      if (time.is_a?(Time) || time.is_a?(DateTime)) && !time.workday?
+        time = Time.beginning_of_workday(time)
+      end
       while days > 0 || !time.workday?
         days -= 1 if time.workday?
         time -= 1.day
@@ -48,8 +69,5 @@ module BusinessTime
       end
       time
     end
-
-    alias_method :ago, :before
-    alias_method :until, :before
   end
 end

data/lib/business_time/business_hours.rb

@@ -24,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
@@ -44,12 +59,11 @@ module BusinessTime
       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

data/lib/business_time/config.rb

@@ -47,15 +47,19 @@ module BusinessTime
       end
 
       def local_config
-        Thread.current[:business_time_local_config]
+        local_config_stack.last
       end
 
       def local_config=(config)
-        Thread.current[:business_time_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.nil?
+        !local_config_stack.empty?
       end
 
       def threadsafe_cattr_accessor(name)
@@ -76,23 +80,7 @@ module BusinessTime
       end
     end
 
-    # You can set this yourself, either by the load method below, or
-    # by saying
-    #   BusinessTime::Config.beginning_of_workday = "8:30 am"
-    # someplace in the initializers of your application.
-    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_reader :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.
-    threadsafe_cattr_accessor :work_week
+    threadsafe_cattr_reader :work_week
 
     # You can set this yourself, either by the load method below, or
     # by saying
@@ -114,6 +102,10 @@ module BusinessTime
     threadsafe_cattr_accessor :fiscal_month_offset
 
     class << self
+      # 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.
       def end_of_workday(day=nil)
         if day
           wday = work_hours[int_to_wday(day.wday)]
@@ -123,6 +115,10 @@ module BusinessTime
         end
       end
 
+      # You can set this yourself, either by the load method below, or
+      # by saying
+      #   BusinessTime::Config.beginning_of_workday = "8:30 am"
+      # someplace in the initializers of your application.
       def beginning_of_workday(day=nil)
         if day
           wday = work_hours[int_to_wday(day.wday)]
@@ -132,6 +128,10 @@ module BusinessTime
         end
       end
 
+      # 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.
       def work_week=(days)
         config[:work_week] = days
         self._weekdays = nil
@@ -173,11 +173,11 @@ module BusinessTime
       end
 
       def with(config)
-        self.local_config = config().dup
+        local_config_stack.push(config().dup)
         config.each { |k,v| send("#{k}=", v) } # calculations are done on setting
         yield
       ensure
-        self.local_config = nil
+        local_config_stack.pop
       end
 
       def default_config
@@ -186,18 +186,23 @@ module BusinessTime
 
       private
 
+      DAY_NAMES = [
+        'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
+      ]
+      private_constant :DAY_NAMES
+
       def wday_to_int day_name
-        lowercase_day_names = ::Time::RFC2822_DAY_NAME.map(&:downcase)
+        lowercase_day_names = DAY_NAMES.map(&:downcase)
         lowercase_day_names.find_index(day_name.to_s.downcase)
       end
 
       def int_to_wday num
-        ::Time::RFC2822_DAY_NAME.map(&:downcase).map(&:to_sym)[num]
+        DAY_NAMES.map(&:downcase).map(&:to_sym)[num]
       end
 
       def reset
-        self.config       = default_config
-        self.local_config = nil
+        local_config_stack.clear
+        self.config = default_config
       end
 
       def deep_dup(object)

data/lib/business_time/time_extensions.rb

@@ -169,5 +169,30 @@ module BusinessTime
     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.9.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_time
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.11.0
 platform: ruby
 authors:
 - bokmann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sorted_set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +136,7 @@ homepage: https://github.com/bokmann/business_time
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,9 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.31
+signing_key:
 specification_version: 4
 summary: Support for doing time math in business hours and days
 test_files: []