roxbury 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95a78111c7254e8b3e5f35c69e781f16f971ad839c0e7c76c42b4f41ea681bd7
-  data.tar.gz: 9d76e376abecaa9796dd40f532b66d69e623876a0efc9360cf70976d4a4a9359
+  metadata.gz: 648f2d7a269ddbb4312323a30b7cd28053d64e2cadd2ba8da5464ea63a7333e6
+  data.tar.gz: 833a25391504a46b2b2e99a46c874fae76f2c77c7a14df0c662aecb97af3bcda
 SHA512:
-  metadata.gz: db1b169f1db6ce10e4a9831a2400a3ff914f0bb5c7ba31d0bca9527fa144ded503200b78e2583bc1d619337862aa7126134f8cd852a54566c8efaef1f455fc32
-  data.tar.gz: 12b76c182370f9b382cdb15f73c7eb3afebdf1300c94973fc0bec8d1a56178a280323ac0bd3b2d3ff9ed6908ec6b9d4e13dcf4c59e04759f9f75fb502951a10b
+  metadata.gz: 7bc1293b16b8197be0c7a7d635f5553b2902b0dd40d4b00d86a393a9ec44da6b925485e7d749c86a14d3257aa68c922e57f2a3376aace81885d695b254ad3b6d
+  data.tar.gz: 71d00ab54a4f6e4e059ca8e6eaa1ba7a522fb1075d608f67f9a973dbd65d41927baa2e261a9ab5197294d7e9cfc92f804b7d767e298cf99e2c1d34e10209b9ca

data/.envrc

@@ -0,0 +1,2 @@
+layout ruby
+use nix

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.direnv/
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -2,6 +2,4 @@
 sudo: false
 language: ruby
 cache: bundler
-rvm:
-  - 2.5.0
 before_install: gem install bundler -v 2.0.2

data/Gemfile.lock

@@ -1,31 +1,31 @@
 PATH
   remote: .
   specs:
-    roxbury (0.1.1)
+    roxbury (0.3.0)
       activesupport (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.0)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2, >= 2.2.2)
     byebug (11.0.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    ffi (1.10.0)
-    formatador (0.2.5)
-    guard (2.14.2)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -33,28 +33,27 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    method_source (0.9.2)
-    minitest (5.11.3)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    minitest (5.14.1)
     nenv (0.3.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    rake (10.5.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rake (13.0.1)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -69,13 +68,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    ruby_dep (1.5.0)
     shellany (0.0.1)
-    thor (0.20.3)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.1.9)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -86,7 +84,7 @@ DEPENDENCIES
   guard-rspec
   pry
   pry-byebug
-  rake (~> 10.0)
+  rake (~> 13.0)
   roxbury!
   rspec (~> 3.0)
 

data/README.md

@@ -4,7 +4,7 @@ A Ruby library for handling business days calculations, e.g., working days/hours
 
 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)
+[![Build Status](https://app.travis-ci.com/eeng/roxbury.svg?branch=master)](https://app.travis-ci.com/eeng/roxbury)
 
 ## Installation
 

data/lib/roxbury/business_calendar.rb

@@ -36,9 +36,12 @@ module Roxbury
       rolling_timestamp = roll_forward(to)
       remaining_hours = number_of_hours
 
-      until (bday = business_day(rolling_timestamp)).include?(rolling_timestamp + remaining_hours.hours)
+      loop do
+        bday = business_day(rolling_timestamp)
+        break if bday.include?(rolling_timestamp + remaining_hours.hours)
         remaining_hours -= bday.number_of_working_hours(from: rolling_timestamp)
-        rolling_timestamp = at_beginning_of_next_business_day(rolling_timestamp)
+        break if remaining_hours < 0
+        rolling_timestamp = next_working_day(rolling_timestamp)
       end
 
       rolling_timestamp + remaining_hours.hours
@@ -64,7 +67,7 @@ module Roxbury
         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
+          remaining_days -= working_hours_percentage(rolling_date)
           break if remaining_days < 0
           rolling_date = roll_forward rolling_date.next
         end
@@ -86,9 +89,48 @@ module Roxbury
       end
     end
 
-    # Snaps the date to the beginning of the next business day.
-    def at_beginning_of_next_business_day date
-      roll_forward date.tomorrow.beginning_of_day
+    # Snaps the date to the end of the previous business day, unless it is already within the working hours of a business day.
+    #
+    # @param date [Date, Time]
+    def roll_backward date
+      bday = business_day(date)
+      if bday.include?(date)
+        date
+      elsif bday.ends_before?(date)
+        bday.at_end
+      else
+        roll_backward(date.is_a?(Date) ? date.yesterday : date.yesterday.end_of_day)
+      end
+    end
+
+    # If a Date is given, returns then next business day.
+    # Otherwise if a Time is given, snaps the date to the beginning of the next business day.
+    def next_working_day date
+      case date
+      when Time
+        roll_forward date.tomorrow.beginning_of_day
+      when Date
+        roll_forward date.tomorrow
+      else
+        raise ArgumentError, 'only Date or Time instances are allowed'
+      end
+    end
+
+    # If a Date is given, returns then prev business day.
+    # Otherwise if a Time is given, snaps the date to the beginning of the prev business day.
+    def prev_working_day date
+      case date
+      when Time
+        roll_backward date.yesterday.end_of_day
+      when Date
+        roll_backward date.yesterday
+      else
+        raise ArgumentError, 'only Date or Time instances are allowed'
+      end
+    end
+
+    def working_hours_percentage date
+      business_day(date).number_of_working_hours * 1.0 / max_working_hours_in_a_day
     end
 
     def holiday? date_or_time

data/lib/roxbury/business_day.rb

@@ -22,6 +22,10 @@ module Roxbury
       same_day?(timestamp) && @working_hours.starts_after?(timestamp)
     end
 
+    def ends_before? timestamp
+      same_day?(timestamp) && @working_hours.ends_before?(timestamp)
+    end
+
     def at_beginning
       @working_hours.at_beginning @date
     end

data/lib/roxbury/empty_working_hours.rb

@@ -13,6 +13,10 @@ module Roxbury
       false
     end
 
+    def ends_before? _timestamp
+      false
+    end
+
     def non_working?
       true
     end

data/lib/roxbury/version.rb

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

data/lib/roxbury/working_hours.rb

@@ -35,6 +35,10 @@ module Roxbury
       timestamp < at_beginning(timestamp)
     end
 
+    def ends_before? timestamp
+      timestamp > at_end(timestamp)
+    end
+
     def at_beginning timestamp
       timestamp.change(hour: begins_at, min: 0, sec: 0)
     end

data/roxbury.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 4.2"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"

data/shell.nix

@@ -0,0 +1,9 @@
+with import <nixpkgs> {};
+mkShell {
+  nativeBuildInputs = [
+    ruby
+  ];
+  shellHook = ''
+    gem list -i '^bundler$' -v 2.0.2 >/dev/null || gem install bundler --version=2.0.2 --no-document
+  '';
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roxbury
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Emmanuel Nicolau
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -152,11 +153,12 @@ files:
 - lib/roxbury/version.rb
 - lib/roxbury/working_hours.rb
 - roxbury.gemspec
+- shell.nix
 homepage: https://github.com/eeng/roxbury
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,9 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.26
+signing_key:
 specification_version: 4
 summary: Ruby library for business days calculations
 test_files: []