roxbury 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13b52faa3fb9374270da742934fdee4f0765ccf4774c8502f364aa05a411795d
-  data.tar.gz: 902edc63311964fbeb521a73f9cb4a5350c944852fa0ed8062a1d96f8416b4d1
+  metadata.gz: 95a78111c7254e8b3e5f35c69e781f16f971ad839c0e7c76c42b4f41ea681bd7
+  data.tar.gz: 9d76e376abecaa9796dd40f532b66d69e623876a0efc9360cf70976d4a4a9359
 SHA512:
-  metadata.gz: e1aea73afe80cb96c4cfea67486bd208eba3587f903ffcce6f4c45db4493ecd9e987549035c0ba8405c2618ac780e3b213192c7c90dc4830aa3aa4b2be50698f
-  data.tar.gz: 12b5aac1014909993f5119a5bb327182e09818bb85ba5899aa0621ee157c918ae9af385995212092420158962b893be412b78a880bb5ee50cb86079c06b58dfd
+  metadata.gz: db1b169f1db6ce10e4a9831a2400a3ff914f0bb5c7ba31d0bca9527fa144ded503200b78e2583bc1d619337862aa7126134f8cd852a54566c8efaef1f455fc32
+  data.tar.gz: 12b76c182370f9b382cdb15f73c7eb3afebdf1300c94973fc0bec8d1a56178a280323ac0bd3b2d3ff9ed6908ec6b9d4e13dcf4c59e04759f9f75fb502951a10b

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    roxbury (0.1.0)
+    roxbury (0.1.1)
       activesupport (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
     byebug (11.0.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -74,6 +75,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    zeitwerk (2.1.9)
 
 PLATFORMS
   ruby

data/README.md

@@ -2,6 +2,8 @@
 
 A Ruby library for handling business days calculations, e.g., working days/hours between two dates, add working days/hours to a date, etc.
 
+It was extracted from a production application that's been running for many years.
+
 [![Build Status](https://travis-ci.org/eeng/roxbury.svg?branch=master)](https://travis-ci.org/eeng/roxbury)
 
 ## Installation

data/bin/benchmark.rb

@@ -0,0 +1,5 @@
+require 'benchmark'
+require 'roxbury'
+
+calendar = Roxbury::BusinessCalendar.new(working_hours: Hash.new(5..21))
+puts Benchmark.measure { 100.times { calendar.add_working_days Date.today, 500 } }

data/lib/roxbury/business_calendar.rb

@@ -55,11 +55,24 @@ module Roxbury
     # @param number_of_days [Integer, Float]
     # @return [Date, Time] The result of adding the number_of_days to the given date. If a Date is given returns a Date, otherwise if a Time is given returns a Time.
     def add_working_days to, number_of_days
-      result = add_working_hours(to, number_of_days * max_working_hours_in_a_day)
-      to.is_a?(Date) ? result.to_date : result
+      raise ArgumentError, 'number_of_days must not be negative' if number_of_days < 0
+
+      if to.is_a?(Time)
+        # this implementation would work for Date instances as well, but is around 10 times slower than the other in my machine
+        add_working_hours(to, number_of_days * max_working_hours_in_a_day)
+      else
+        remaining_days = number_of_days
+        rolling_date = to
+        loop do
+          remaining_days -= business_day(rolling_date).number_of_working_hours * 1.0 / max_working_hours_in_a_day
+          break if remaining_days < 0
+          rolling_date = roll_forward rolling_date.next
+        end
+        rolling_date
+      end
     end
 
-    # Snaps the date to the beginning of the next business day, unless it is already within the working hours.
+    # Snaps the date to the beginning of the next business day, unless it is already within the working hours of a business day.
     #
     # @param date [Date, Time]
     def roll_forward date
@@ -69,7 +82,7 @@ module Roxbury
       elsif bday.starts_after?(date)
         bday.at_beginning
       else
-        roll_forward date.tomorrow.beginning_of_day
+        roll_forward(date.is_a?(Date) ? date.tomorrow : date.tomorrow.beginning_of_day)
       end
     end
 
@@ -111,7 +124,7 @@ module Roxbury
     end
 
     def max_working_hours_in_a_day
-      @working_hours.values.map(&:quantity).max
+      @max_working_hours_in_a_day ||= @working_hours.values.map(&:quantity).max
     end
   end
 end

data/lib/roxbury/version.rb

@@ -1,3 +1,3 @@
 module Roxbury
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roxbury
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Emmanuel Nicolau
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,6 +142,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/benchmark.rb
 - bin/console
 - bin/setup
 - lib/roxbury.rb