working_hours 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c6ba325dcb5811a04a8eb5102e65b6d48e291a7d4a581baaf6f5e63b5394cf1
-  data.tar.gz: 302e9f7a199ac7db4049e288f141c7dad3674e6618f99a2c4380af14e316b121
+  metadata.gz: 4bdb747e39a652368403adb9ad97f3776a8d8ab28f841d70912bcab6141118ea
+  data.tar.gz: 74e1447b590b829f95e52fe3c5bac18e7a690dcc8b21683402982f5810b94d8c
 SHA512:
-  metadata.gz: d5ff45d737ba62afd04c0322d4010e6bac9cad0954a1fadcbd38564540367f32e2e8da8f78529921f755a46663cd1dbabf4562ec6d02235d8c1d0ddcc047316b
-  data.tar.gz: 686a39afbad5ff340de57db83173dd75dd6c2b5b0ec244e25fbc2263b2eb7f90764f7cb8a95aed53a689507c19b4ba337a987ee00eac33bdce0c9fc903865772
+  metadata.gz: ee953af27c8d6622d8089feec9cd5b966613baff8239c11e488668ad07a48023efbd98d28599f9723c913b7e295ced2ac2b4cb5ef70711c4950ed8afea2aa107
+  data.tar.gz: 5b632e842d20ff83173c83a3e34c4bf166237f3689ba130db2cfd3031e027078f1efa1acbddac588198d78b07f3775c94e88f6d83fba328a9400629e92fab107

data/.travis.yml

@@ -4,7 +4,8 @@ rvm:
   - 2.5.7
   - 2.6.5
   - 2.7.0
-  - jruby-9.2.11.0
+  - 3.0.0
+  - jruby-9.2.14.0
 gemfile:
   - gemfiles/Gemfile.activesupport-4.x
   - gemfiles/Gemfile.activesupport-5.x
@@ -15,6 +16,8 @@ jobs:
       gemfile: gemfiles/Gemfile.activesupport-6.x
     - rvm: 2.7.0
       gemfile: gemfiles/Gemfile.activesupport-4.x
+    - rvm: 3.0.0
+      gemfile: gemfiles/Gemfile.activesupport-4.x
   include:
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile.activesupport-edge

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Unreleased
 
-[Compare master with v1.2.0](https://github.com/intrepidd/working_hours/compare/v1.2.0...master)
+[Compare master with v1.3.0](https://github.com/intrepidd/working_hours/compare/v1.3.0...master)
+
+# v1.3.0
+* Improve supports for fractional seconds in input times by only rounding results at the end - [#42](https://github.com/Intrepidd/working_hours/issues/42) [#43](https://github.com/Intrepidd/working_hours/pull/43)
+* Increase code safety by always initializing an empty hash for each day of the week in the precompiled config (inspired by [#35](https://github.com/Intrepidd/working_hours/pull/35)
 
 # v1.2.0
 * Drop support for ruby 2.0, 2.1, 2.2 and 2.3

data/README.md

@@ -1,11 +1,11 @@
 # WorkingHours
 
-[![Build Status](https://travis-ci.org/Intrepidd/working_hours.svg?branch=master)](https://travis-ci.org/Intrepidd/working_hours)
+[![Build Status](https://travis-ci.com/Intrepidd/working_hours.svg?branch=master)](https://travis-ci.com/Intrepidd/working_hours)
 
 A modern ruby gem allowing to do time calculation with working hours.
 
 Compatible and tested with:
-- Ruby `2.4`, `2.5`, `2.6`, `2.7`, JRuby `9.2`
+- Ruby `2.4`, `2.5`, `2.6`, `2.7`, `3.0`, JRuby `9.2`
 - ActiveSupport `4.x`, `5.x`, `6.x`
 
 ## Installation

data/lib/working_hours/computation.rb

@@ -34,7 +34,7 @@ module WorkingHours
 
     def add_seconds origin, seconds, config: nil
       config ||= wh_config
-      time = in_config_zone(origin, config: config).round
+      time = in_config_zone(origin, config: config)
       while seconds > 0
         # roll to next business period
         time = advance_to_working_time(time, config: config)
@@ -72,7 +72,7 @@ module WorkingHours
 
     def advance_to_working_time time, config: nil
       config ||= wh_config
-      time = in_config_zone(time, config: config).round
+      time = in_config_zone(time, config: config)
       loop do
         # skip holidays and weekends
         while not working_day?(time, config: config)
@@ -80,7 +80,7 @@ module WorkingHours
         end
         # find first working range after time
         time_in_day = time.seconds_since_midnight
-        (config[:working_hours][time.wday] || {}).each do |from, to|
+        config[:working_hours][time.wday].each do |from, to|
           return time if time_in_day >= from and time_in_day < to
           return time + (from - time_in_day) if from >= time_in_day
         end
@@ -91,7 +91,7 @@ module WorkingHours
 
     def advance_to_closing_time time, config: nil
       config ||= wh_config
-      time = in_config_zone(time, config: config).round
+      time = in_config_zone(time, config: config)
       loop do
         # skip holidays and weekends
         while not working_day?(time, config: config)
@@ -100,7 +100,7 @@ module WorkingHours
         # find next working range after time
         time_in_day = time.seconds_since_midnight
         time = time.beginning_of_day
-        (config[:working_hours][time.wday] || {}).each do |from, to|
+        config[:working_hours][time.wday].each do |from, to|
           return time + to if time_in_day >= from and time_in_day < to
           return time + to if from >= time_in_day
         end
@@ -123,7 +123,7 @@ module WorkingHours
 
     def return_to_exact_working_time time, config: nil
       config ||= wh_config
-      time = in_config_zone(time, config: config).round
+      time = in_config_zone(time, config: config)
       loop do
         # skip holidays and weekends
         while not working_day?(time, config: config)
@@ -131,7 +131,7 @@ module WorkingHours
         end
         # find last working range before time
         time_in_day = time.seconds_since_midnight
-        (config[:working_hours][time.wday] || {}).reverse_each do |from, to|
+        config[:working_hours][time.wday].reverse_each do |from, to|
           # round is used to suppress miliseconds hack from `end_of_day`
           return time if time_in_day > from and time_in_day <= to
           return (time - (time_in_day - to)) if to <= time_in_day
@@ -180,7 +180,7 @@ module WorkingHours
         -working_time_between(to, from, config: config)
       else
         from = advance_to_working_time(in_config_zone(from, config: config))
-        to = in_config_zone(to, config: config).round
+        to = in_config_zone(to, config: config)
         distance = 0
         while from < to
           # look at working ranges

data/lib/working_hours/config.rb

@@ -44,9 +44,8 @@ module WorkingHours
           validate_working_hours! config[:working_hours]
           validate_holidays! config[:holidays]
           validate_time_zone! config[:time_zone]
-          compiled = {working_hours: []}
+          compiled = { working_hours: Array.new(7) { Hash.new } }
           working_hours.each do |day, hours|
-            compiled[:working_hours][DAYS_OF_WEEK.index(day)] = {}
             hours.each do |start, finish|
               compiled[:working_hours][DAYS_OF_WEEK.index(day)][compile_time(start)] = compile_time(finish)
             end

data/lib/working_hours/version.rb

@@ -1,3 +1,3 @@
 module WorkingHours
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/working_hours/computation_spec.rb

@@ -129,6 +129,13 @@ describe WorkingHours::Computation do
       time = Time.utc(2014, 4, 8, 0, 0, 30) # Tuesday
       expect(add_seconds(time, -60)).to eq(Time.utc(2014, 4, 7, 23, 59, 00))
     end
+
+    it 'honors miliseconds in the base time and increment (but return rounded result)' do
+      # Rounding the base time or increments before the end would yield a wrong result
+      time = Time.utc(1991, 11, 15, 16, 59, 42.25) # +250ms
+      expect(add_seconds(time, 120.4)).to eq(Time.utc(1991, 11, 18, 9, 1, 43))
+    end
+
   end
 
   describe '#advance_to_working_time' do
@@ -536,5 +543,20 @@ describe WorkingHours::Computation do
         Time.new(2014, 4, 7, 15, 0, 0, "-04:00"), # Monday 7pm in UTC
       )).to eq(7.hours)
     end
+
+    # generates two times with +0ms, +250ms, +500ms, +750ms and +1s
+    # then for each combination compare the result with a ruby diff
+    context 'with precise miliseconds timings' do
+      reference = Time.utc(2014, 4, 7, 10)
+      0.step(1.0, 0.25) do |offset1|
+        0.step(1.0, 0.25) do |offset2|
+          from = reference + offset1
+          to = reference + offset2
+          it "returns expected value (#{(to - from).round}) for #{offset1} — #{offset2} interval" do
+            expect(working_time_between(from, to)).to eq((to - from).round)
+          end
+        end
+      end
+    end
   end
 end

data/spec/working_hours/config_spec.rb

@@ -266,16 +266,23 @@ describe WorkingHours::Config do
 
     it 'computes an optimized version' do
       expect(subject).to eq({
-          :working_hours => [nil, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}],
+          :working_hours => [{}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {}],
           :holidays => Set.new([]),
           :time_zone => ActiveSupport::TimeZone['UTC']
         })
     end
 
+    it 'includes default values for each days so computation does not fail' do
+      WorkingHours::Config.working_hours = {:mon => {'08:00' => '14:00'}}
+      expect(subject[:working_hours]).to eq([{}, {28800=>50400}, {}, {}, {}, {}, {}])
+      expect(WorkingHours.working_time_between(Time.utc(2014, 4, 14, 0), Time.utc(2014, 4, 21, 0))).to eq(3600*6)
+      expect(WorkingHours.add_seconds(Time.utc(2014, 4, 14, 0), 3600*7)).to eq(Time.utc(2014, 4, 21, 9))
+    end
+
     it 'supports seconds' do
       WorkingHours::Config.working_hours = {:mon => {'20:32:59' => '22:59:59'}}
       expect(subject).to eq({
-        :working_hours => [nil, {73979 => 82799}],
+        :working_hours => [{}, {73979 => 82799}, {}, {}, {}, {}, {}],
         :holidays => Set.new([]),
         :time_zone => ActiveSupport::TimeZone['UTC']
       })
@@ -284,7 +291,7 @@ describe WorkingHours::Config do
     it 'supports 24:00 (converts to 23:59:59.999999)' do
       WorkingHours::Config.working_hours = {:mon => {'20:00' => '24:00'}}
       expect(subject).to eq({
-        :working_hours => [nil, {72000 => 86399.999999}],
+        :working_hours => [{}, {72000 => 86399.999999}, {}, {}, {}, {}, {}],
         :holidays => Set.new([]),
         :time_zone => ActiveSupport::TimeZone['UTC']
       })
@@ -296,9 +303,9 @@ describe WorkingHours::Config do
       }.to change {
         WorkingHours::Config.precompiled[:working_hours]
       }.from(
-        [nil, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}]
+        [{}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {}]
       ).to(
-        [nil, {28800=>50400}]
+        [{}, {28800=>50400}, {}, {}, {}, {}, {}]
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: time calculation with working hours