business_time 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c76c5a8e2c840f078e70de2e996a33bc11106501cccca459f1e77ce236bf587
-  data.tar.gz: 8d41d5e765ff55f6158049fabd41039c6acb121e2c2be834d579f60a0fa6a3ed
+  metadata.gz: 3006a4d1708551ad12693457ba051e16b0b8f94439cc8cca54999519d20a5a63
+  data.tar.gz: 785c54ba3652f861532d1963dff4afbcb8194b78ffb7a46de3932778aafb6703
 SHA512:
-  metadata.gz: 46bececd4f088d2a50a061f83510e0e998f427e4fe7ef49d304a8949b7f42f8a1265689f2f83c972829d3a175813dc3a79956b117aa8719a4203b5afd86ab9c6
-  data.tar.gz: 42316dc95c99be2600588ad5a2d765a97b79abf9369c0d41235f375c3e7b6ee3ae63318da62a0a20b0a989499ae9527263da3b7184a65e21c9d2e5bc6b0db2e1
+  metadata.gz: dac78848ef4878c0891b30f3eb8842578047eb3ae559681e25f7f5dbac885643719fa28ebab37af36daa26d5278cc88f9e40c8919bfbb9b26aa8d38e625c25b2
+  data.tar.gz: 73529a47adeb15c99c0cc06143ee70bb5f2eeb6ee4f0da6c2cff79970082f742aeb412f4e0d201643bb60b9c024dea51c96b0db67ff4220f9a0ca51049264ca8

data/lib/business_time/business_days.rb

@@ -5,7 +5,7 @@ module BusinessTime
     include Comparable
     attr_reader :days
 
-    def initialize(days)
+    def initialize(days, options={})
       @days = days
     end
 
@@ -16,15 +16,15 @@ module BusinessTime
       self.days <=> other.days
     end
 
-    def after(time = Time.current)
-      non_negative_days? ? calculate_after(time, @days) : calculate_before(time, -@days)
+    def after(time = Time.current, options={})
+      non_negative_days? ? calculate_after(time, @days, options) : calculate_before(time, -@days, options)
     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)
+    def before(time = Time.current, options={})
+      non_negative_days? ? calculate_before(time, @days, options) : calculate_after(time, -@days, options)
     end
 
     alias_method :ago, :before
@@ -36,35 +36,35 @@ module BusinessTime
       @days >= 0
     end
 
-    def calculate_after(time, days)
-      if (time.is_a?(Time) || time.is_a?(DateTime)) && !time.workday?
+    def calculate_after(time, days, options={})
+      if (time.is_a?(Time) || time.is_a?(DateTime)) && !time.workday?(options)
         time = Time.beginning_of_workday(time)
       end
-      while days > 0 || !time.workday?
-        days -= 1 if time.workday?
+      while days > 0 || !time.workday?(options)
+        days -= 1 if time.workday?(options)
         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?
+        time = Time.roll_forward(time, options) unless time.during_business_hours?
       end
       time
     end
 
-    def calculate_before(time, days)
-      if (time.is_a?(Time) || time.is_a?(DateTime)) && !time.workday?
+    def calculate_before(time, days, options={})
+      if (time.is_a?(Time) || time.is_a?(DateTime)) && !time.workday?(options)
         time = Time.beginning_of_workday(time)
       end
-      while days > 0 || !time.workday?
-        days -= 1 if time.workday?
+      while days > 0 || !time.workday?(options)
+        days -= 1 if time.workday?(options)
         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))
+          time = Time.beginning_of_workday(Time.roll_backward(time, options))
         end
       end
       time

data/lib/business_time/business_hours.rb

@@ -3,8 +3,8 @@ module BusinessTime
   class BusinessHours
     include Comparable
     attr_reader :hours
-    
-    def initialize(hours)
+
+    def initialize(hours, options={})
       @hours = hours
     end
 
@@ -15,21 +15,21 @@ module BusinessTime
       self.hours <=> other.hours
     end
     
-    def ago
-      Time.zone ? before(Time.zone.now) : before(Time.now)
+    def ago(options={})
+      Time.zone ? before(Time.zone.now, options) : before(Time.now, options)
     end
 
-    def from_now
-      Time.zone ?  after(Time.zone.now) : after(Time.now)
+    def from_now(options={})
+      Time.zone ?  after(Time.zone.now, options) : after(Time.now, options)
     end
 
-    def after(time)
-      non_negative_hours? ? calculate_after(time, @hours) : calculate_before(time, -@hours)
+    def after(time, options={})
+      non_negative_hours? ? calculate_after(time, @hours, options) : calculate_before(time, -@hours, options)
     end
     alias_method :since, :after
 
-    def before(time)
-      non_negative_hours? ? calculate_before(time, @hours) : calculate_after(time, -@hours)
+    def before(time, options={})
+      non_negative_hours? ? calculate_before(time, @hours, options) : calculate_after(time, -@hours, options)
     end
 
     private
@@ -38,18 +38,18 @@ module BusinessTime
       @hours >= 0
     end
 
-    def calculate_after(time, hours)
-      after_time = Time.roll_forward(time)
+    def calculate_after(time, hours, options={})
+      after_time = Time.roll_forward(time, options)
       # Step through the hours, skipping over non-business hours
       hours.times do
         after_time = after_time + 1.hour
 
         if after_time.hour == 0 && after_time.min == 0 && after_time.sec == 0
-          after_time = Time.roll_forward(after_time)
+          after_time = Time.roll_forward(after_time, options)
         elsif (after_time > Time.end_of_workday(after_time))
           # Ignore hours before opening and after closing
           delta = after_time - Time.end_of_workday(after_time)
-          after_time = Time.roll_forward(after_time) + delta
+          after_time = Time.roll_forward(after_time, options) + delta
         end
 
         # Ignore weekends and holidays
@@ -60,20 +60,20 @@ module BusinessTime
       after_time
     end
 
-    def calculate_before(time, hours)
+    def calculate_before(time, hours, options={})
       before_time = Time.roll_backward(time)
       # Step through the hours, skipping over non-business hours
       hours.times do
         before_time = before_time - 1.hour
 
         if before_time.hour == 0 && before_time.min == 0 && before_time.sec == 0
-          before_time = Time.roll_backward(before_time - 1.second)
+          before_time = Time.roll_backward(before_time - 1.second, options)
         elsif (before_time <= Time.beginning_of_workday(before_time))
           # Ignore hours before opening and after closing
           delta = Time.beginning_of_workday(before_time) - before_time
 
           # Due to the 23:59:59 end-of-workday exception
-          time_roll_backward = Time.roll_backward(before_time)
+          time_roll_backward = Time.roll_backward(before_time, options)
           time_roll_backward += 1.second if time_roll_backward.iso8601 =~ /23:59:59/
 
           before_time = time_roll_backward - delta

data/lib/business_time/core_ext/date.rb

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

data/lib/business_time/core_ext/integer.rb

@@ -4,13 +4,13 @@
 #  3.business_days.after(some_date)
 #  4.business_hours.before(some_date_time)
 class Integer
-  def business_hours
-    BusinessTime::BusinessHours.new(self)
+  def business_hours(options={})
+    BusinessTime::BusinessHours.new(self, options)
   end
   alias_method :business_hour, :business_hours
 
-  def business_days
-    BusinessTime::BusinessDays.new(self)
+  def business_days(options={})
+    BusinessTime::BusinessDays.new(self, options)
   end
   alias_method :business_day, :business_days
 end

data/lib/business_time/time_extensions.rb

@@ -2,8 +2,12 @@ module BusinessTime
   module TimeExtensions
     # 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)
+    # holidays option allows you to pass in a different Array of holiday dates on
+    # each call vs the BusinessTime::Config.holidays which is always static.
+    def workday?(options={})
+      weekday? &&
+        !BusinessTime::Config.holidays.include?(to_date) &&
+        !to_array_of_dates(options[:holidays]).include?(to_date)
     end
 
     # True if this time falls on a weekday.
@@ -32,9 +36,9 @@ 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)
+      def workday?(day, options={})
         ActiveSupport::Deprecation.warn("`Time.workday?(time)` is deprecated. Please use `time.workday?`")
-        day.workday?
+        day.workday?(options)
       end
 
       # True if this time falls on a weekday.
@@ -53,9 +57,8 @@ module BusinessTime
 
       # Rolls forward to the next beginning_of_workday
       # when the time is outside of business hours
-      def roll_forward(time)
-
-        if Time.before_business_hours?(time) || !time.workday?
+      def roll_forward(time, options={})
+        if Time.before_business_hours?(time) || !time.workday?(options)
           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)
@@ -63,7 +66,7 @@ module BusinessTime
           next_business_time = time.clone
         end
 
-        while !next_business_time.workday?
+        while !next_business_time.workday?(options)
           next_business_time = Time.beginning_of_workday(next_business_time + 1.day)
         end
 
@@ -72,8 +75,8 @@ module BusinessTime
 
       # 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?
+      def first_business_day(time, options={})
+        while !time.workday?(options)
           time = time + 1.day
         end
 
@@ -82,8 +85,8 @@ module BusinessTime
 
       # 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?)
+      def roll_backward(time, options={})
+        prev_business_time = if (Time.before_business_hours?(time) || !time.workday?(options))
                                Time.end_of_workday(time - 1.day)
                              elsif Time.after_business_hours?(time)
                                Time.end_of_workday(time)
@@ -91,7 +94,7 @@ module BusinessTime
                                time.clone
                              end
 
-        while !prev_business_time.workday?
+        while !prev_business_time.workday?(options)
           prev_business_time = Time.end_of_workday(prev_business_time - 1.day)
         end
 
@@ -100,16 +103,16 @@ module BusinessTime
 
       # 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?
+      def previous_business_day(time, options={})
+        while !time.workday?(options)
           time = time - 1.day
         end
 
         time
       end
 
-      def work_hours_total(day)
-        return 0 unless day.workday?
+      def work_hours_total(day, options={})
+        return 0 unless day.workday?(options)
 
         day = day.strftime('%a').downcase.to_sym
 
@@ -136,7 +139,7 @@ module BusinessTime
       end
     end
 
-    def business_time_until(to_time)
+    def business_time_until(to_time, options={})
       # Make sure that we will calculate time from A to B "clockwise"
       if self < to_time
         time_a = self
@@ -149,8 +152,8 @@ module BusinessTime
       end
 
       # Align both times to the closest business hours
-      time_a = Time::roll_forward(time_a)
-      time_b = Time::roll_forward(time_b)
+      time_a = Time::roll_forward(time_a, options)
+      time_b = Time::roll_forward(time_b, options)
 
       if time_a.to_date == time_b.to_date
         time_b - time_a
@@ -166,16 +169,16 @@ module BusinessTime
       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)
+    def during_business_hours?(options={})
+      self.workday?(options) && 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? } : []
+    def consecutive_workdays(options={})
+      workday?(options) ? consecutive_days { |date| date.workday?(options) } : []
     end
 
-    def consecutive_non_working_days
-      !workday? ? consecutive_days { |date| !date.workday? } : []
+    def consecutive_non_working_days(options={})
+      !workday?(options) ? consecutive_days { |date| !date.workday?(options) } : []
     end
 
     private
@@ -194,5 +197,9 @@ module BusinessTime
       end
       (days << self).sort
     end
+
+    def to_array_of_dates(values)
+      Array.wrap(values).map(&:to_date)
+    end
   end
 end

data/lib/business_time/version.rb

@@ -1,3 +1,3 @@
 module BusinessTime
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_time
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - bokmann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport