working_hours 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fdc5713f20da1316a29bf18573095ac9e92ccb6c
-  data.tar.gz: bf54ee89ba3f855fcdc0d791965cf23fd5c29d3c
+SHA256:
+  metadata.gz: 4bdb747e39a652368403adb9ad97f3776a8d8ab28f841d70912bcab6141118ea
+  data.tar.gz: 74e1447b590b829f95e52fe3c5bac18e7a690dcc8b21683402982f5810b94d8c
 SHA512:
-  metadata.gz: 99cd033ae02a2c9c25fbced88e1c265a891210c7a232e12bb32191fd3c9bcea652cf3f35bd6c50c3215277b190d3af56e73fbde20cff1bb6cdfb24e2a205e08f
-  data.tar.gz: 50f2ca92979404a58af287abd33dd7af125ad9366a43160804bbbf09ce2b7648d474c5bf598e583fef4c7394e28965c31a91cc26a3ebba35d71e12cba0cdff95
+  metadata.gz: ee953af27c8d6622d8089feec9cd5b966613baff8239c11e488668ad07a48023efbd98d28599f9723c913b7e295ced2ac2b4cb5ef70711c4950ed8afea2aa107
+  data.tar.gz: 5b632e842d20ff83173c83a3e34c4bf166237f3689ba130db2cfd3031e027078f1efa1acbddac588198d78b07f3775c94e88f6d83fba328a9400629e92fab107

data/.gitignore

@@ -3,6 +3,8 @@
 .bundle
 .config
 .yardoc
+.ruby-gemset
+.ruby-version
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.travis.yml

@@ -1,20 +1,28 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.6
-  - 2.2.2
-  - ruby-head
-  - jruby-1.7.19
-  - jruby-head
-env: JRUBY_OPTS=--2.0
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
+  - 3.0.0
+  - jruby-9.2.14.0
 gemfile:
-  - gemfiles/Gemfile.activesupport-3.2.x
-  - gemfiles/Gemfile.activesupport-4.0.x
-  - gemfiles/Gemfile.activesupport-4.1.x
-  - gemfiles/Gemfile.activesupport-4.2.x
-  - gemfiles/Gemfile.activesupport-edge
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.activesupport-edge
+  - gemfiles/Gemfile.activesupport-4.x
+  - gemfiles/Gemfile.activesupport-5.x
+  - gemfiles/Gemfile.activesupport-6.x
+jobs:
+  exclude:
+    - rvm: 2.4.9
+      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
     - rvm: jruby-head
+      gemfile: gemfiles/Gemfile.activesupport-edge
+  allow_failures:
+    - gemfile: gemfiles/Gemfile.activesupport-edge
+  fast_finish: true

data/CHANGELOG.md

@@ -1,6 +1,33 @@
 # Unreleased
 
-[Compare master with v1.1.1](https://github.com/intrepidd/working_hours/compare/v1.1.1...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
+* Drop support for jruby 1.7 and 9.0
+* Drop support for ActiveSupport 3.x
+* Add support for jruby 9.2
+* Add support for ruby 2.5, 2.6 and 2.7
+* Add support for ActiveSupport 5.x and 6.x
+* Fix day computations when origin is a holiday or a non worked day - [#39](https://github.com/Intrepidd/working_hours/pull/39)
+
+
+# v1.1.4
+* Fix thread safety - [#36](https://github.com/Intrepidd/working_hours/pull/36)
+
+# v1.1.3
+* Fixed warnings with Ruby 2.4.0+ - [#32](https://github.com/Intrepidd/working_hours/pull/32)
+* Fix install bug with jruby 1.7.20
+
+# v1.1.2
+* Fixed an issue of float imprecision causing infinite loop - [#27](https://github.com/Intrepidd/working_hours/pull/27)
+* Added #next_working_time and #advance_to_closing_time - [#23](https://github.com/Intrepidd/working_hours/pull/23)
+
+_06/12/2015_
 
 # v1.1.1
 * Fix infinite loop happening when rewinding seconds and crossing through midgnight

data/README.md

@@ -1,12 +1,12 @@
 # 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.0`, `2.1`, JRuby `1.7` ( with ruby 2 syntax support enabled )
-- ActiveSupport `3.2.x`, `4.0.x` and `4.1.x`
+- Ruby `2.4`, `2.5`, `2.6`, `2.7`, `3.0`, JRuby `9.2`
+- ActiveSupport `4.x`, `5.x`, `6.x`
 
 ## Installation
 
@@ -57,6 +57,16 @@ Time.utc(2014, 8, 4, 7, 16).in_working_hours? # => false
 # Advance to next working time
 WorkingHours.advance_to_working_time(Time.utc(2014, 8, 4, 7, 16)) # => Mon, 04 Aug 2014 09:00:00 UTC +00:00
 
+# Advance to next closing time
+WorkingHours.advance_to_closing_time(Time.utc(2014, 8, 4, 7, 16)) # => Mon, 04 Aug 2014 17:00:00 UTC +00:00
+WorkingHours.advance_to_closing_time(Time.utc(2014, 8, 4, 10, 16)) # => Mon, 04 Aug 2014 17:00:00 UTC +00:00
+WorkingHours.advance_to_closing_time(Time.utc(2014, 8, 4, 18, 16)) # => Tue, 05 Aug 2014 17:00:00 UTC +00:00
+
+# Next working time
+sunday = Time.utc(2014, 8, 3)
+monday = WorkingHours.next_working_time(sunday) # => Mon, 04 Aug 2014 09:00:00 UTC +00:00
+tuesday = WorkingHours.next_working_time(monday) # => Tue, 05 Aug 2014 09:00:00 UTC +00:00
+
 # Return to previous working time
 WorkingHours.return_to_working_time(Time.utc(2014, 8, 4, 7, 16)) # => Fri, 01 Aug 2014 17:00:00 UTC +00:00
 ```

data/gemfiles/{Gemfile.activesupport-3.2.x → Gemfile.activesupport-5.x}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'activesupport', '~> 3.2'
+gem 'activesupport', '~> 5.2'

data/gemfiles/{Gemfile.activesupport-4.0.x → Gemfile.activesupport-6.x}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'activesupport', '~> 4.0'
+gem 'activesupport', '~> 6.0'

data/lib/working_hours.rb

@@ -1,3 +1,3 @@
 require "working_hours/module"
-require "working_hours/core_ext/fixnum"
-require "working_hours/core_ext/date_and_time"
+require "working_hours/core_ext/integer"
+require "working_hours/core_ext/date_and_time"

data/lib/working_hours/computation.rb

@@ -5,8 +5,12 @@ module WorkingHours
   module Computation
 
     def add_days origin, days, config: nil
+      return origin if days.zero?
+
       config ||= wh_config
       time = in_config_zone(origin, config: config)
+      time += (days <=> 0).day until working_day?(time, config: config)
+
       while days > 0
         time += 1.day
         days -= 1 if working_day?(time, config: config)
@@ -30,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)
@@ -39,7 +43,7 @@ module WorkingHours
         config[:working_hours][time.wday].each do |from, to|
           if time_in_day >= from and time_in_day < to
             # take all we can
-            take = [to - time_in_day, seconds].min.round
+            take = [to - time_in_day, seconds].min
             # advance time
             time += take
             # decrease seconds
@@ -55,7 +59,7 @@ module WorkingHours
         config[:working_hours][time.wday].reverse_each do |from, to|
           if time_in_day > from and time_in_day <= to
             # take all we can
-            take = [time_in_day - from, -seconds].min.round
+            take = [time_in_day - from, -seconds].min
             # advance time
             time -= take
             # decrease seconds
@@ -68,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)
@@ -76,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
@@ -85,6 +89,31 @@ module WorkingHours
       end
     end
 
+    def advance_to_closing_time time, config: nil
+      config ||= wh_config
+      time = in_config_zone(time, config: config)
+      loop do
+        # skip holidays and weekends
+        while not working_day?(time, config: config)
+          time = (time + 1.day).beginning_of_day
+        end
+        # 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|
+          return time + to if time_in_day >= from and time_in_day < to
+          return time + to if from >= time_in_day
+        end
+        # if none is found, go to next day and loop
+        time = time + 1.day
+      end
+    end
+
+    def next_working_time(time, config: nil)
+      time = advance_to_closing_time(time, config: config) if in_working_hours?(time, config: config)
+      advance_to_working_time(time, config: config)
+    end
+
     def return_to_working_time(time, config: nil)
       # return_to_exact_working_time may return values with a high number of milliseconds,
       # this is necessary for the end of day hack, here we return a rounded value for the
@@ -94,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)
@@ -102,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
@@ -151,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
@@ -89,7 +88,7 @@ module WorkingHours
       private
 
       def config
-        Thread.current[:working_hours] ||= global_config
+        Thread.current[:working_hours] ||= global_config.dup
       end
 
       def global_config

data/lib/working_hours/core_ext/{fixnum.rb → integer.rb}

@@ -2,7 +2,7 @@ require "working_hours/duration_proxy"
 
 module WorkingHours
   module CoreExt
-    module Fixnum
+    module Integer
 
       def working
         WorkingHours::DurationProxy.new(self)
@@ -12,4 +12,4 @@ module WorkingHours
   end
 end
 
-Fixnum.send(:include, WorkingHours::CoreExt::Fixnum)
+Integer.send(:include, WorkingHours::CoreExt::Integer)

data/lib/working_hours/version.rb

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

data/spec/working_hours/computation_spec.rb

@@ -32,12 +32,26 @@ describe WorkingHours::Computation do
       expect(add_days(time, 1)).to eq(Date.new(2014, 4, 9)) # Wednesday
     end
 
+    it 'skips non worked days when origin is not worked' do
+      time = Date.new(2014, 4, 8) # Tuesday
+      WorkingHours::Config.working_hours = {mon: {'09:00' => '17:00'}, wed: {'09:00' => '17:00'}, thu: {'09:00' => '17:00'}, sun: {'09:00' => '17:00'}}
+      expect(add_days(time, 1)).to eq(Date.new(2014, 4, 10)) # Thursday
+      expect(add_days(time, -1)).to eq(Date.new(2014, 4, 6)) # Sunday
+    end
+
     it 'skips holidays' do
       time = Date.new(2014, 4, 7) # Monday
       WorkingHours::Config.holidays = [Date.new(2014, 4, 8)] # Tuesday
       expect(add_days(time, 1)).to eq(Date.new(2014, 4, 9)) # Wednesday
     end
 
+    it 'skips holidays when origin is holiday' do
+      time = Date.new(2014, 4, 9) # Wednesday
+      WorkingHours::Config.holidays = [time] # Wednesday
+      expect(add_days(time, 1)).to eq(Date.new(2014, 4, 11)) # Friday
+      expect(add_days(time, -1)).to eq(Date.new(2014, 4, 7)) # Monday
+    end
+
     it 'skips holidays and non worked days' do
       time = Date.new(2014, 4, 7) # Monday
       WorkingHours::Config.holidays = [Date.new(2014, 4, 9)] # Wednesday
@@ -45,6 +59,12 @@ describe WorkingHours::Computation do
       expect(add_days(time, 3)).to eq(Date.new(2014, 4, 21))
     end
 
+    it 'returns the original value when adding 0 days' do
+      time = Date.new(2014, 4, 7)
+      WorkingHours::Config.holidays = [time]
+      expect(add_days(time, 0)).to eq(time)
+    end
+
     it 'accepts time given from any time zone' do
       time = Time.utc(1991, 11, 14, 21, 0, 0) # Thursday 21 pm UTC
       WorkingHours::Config.time_zone = 'Tokyo' # But we are at tokyo, so it's already Friday 6 am
@@ -109,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
@@ -148,6 +175,173 @@ describe WorkingHours::Computation do
     end
   end
 
+  describe '#advance_to_closing_time' do
+
+    it 'jumps non-working day' do
+      WorkingHours::Config.holidays = [Date.new(2014, 5, 1)]
+      holiday = Time.utc(2014, 5, 1, 12, 0)
+      friday_closing = Time.utc(2014, 5, 2, 17, 0)
+      sunday = Time.utc(2014, 6, 1, 12, 0)
+      monday_closing = Time.utc(2014, 6, 2, 17, 0)
+      expect(advance_to_closing_time(holiday)).to eq(friday_closing)
+      expect(advance_to_closing_time(sunday)).to eq(monday_closing)
+    end
+
+    it 'moves to the closing time during working hours' do
+      in_open_time = Time.utc(2014, 4, 7, 12, 0)
+      closing_time = Time.utc(2014, 4, 7, 17, 0)
+      expect(advance_to_closing_time(in_open_time)).to eq(closing_time)
+    end
+
+    it 'jumps outside working hours' do
+      monday_before_opening = Time.utc(2014, 4, 7, 8, 59)
+      monday_closing = Time.utc(2014, 4, 7, 17, 0)
+      tuesday_closing = Time.utc(2014, 4, 8, 17, 0)
+      expect(advance_to_closing_time(monday_before_opening)).to eq(monday_closing)
+      expect(advance_to_closing_time(monday_closing)).to eq(tuesday_closing)
+    end
+
+    context 'moving between timespans' do
+      before do
+        WorkingHours::Config.working_hours = {
+          mon: {'07:00' => '12:00', '13:00' => '18:00'},
+          tue: {'09:00' => '17:00'},
+          wed: {'09:00' => '17:00'},
+          thu: {'09:00' => '17:00'},
+          fri: {'09:00' => '17:00'}
+        }
+      end
+
+      let(:monday_morning) { Time.utc(2014, 4, 7, 10) }
+      let(:morning_closing) { Time.utc(2014, 4, 7, 12) }
+      let(:afternoon_closing) { Time.utc(2014, 4, 7, 18) }
+      let(:monday_break) { Time.utc(2014, 4, 7, 12) }
+      let(:tuesday_closing) { Time.utc(2014, 4, 8, 17) }
+
+      it 'moves from morning to end of morning slot' do
+        expect(advance_to_closing_time(monday_morning)).to eq(morning_closing)
+      end
+
+      it 'moves from break time to end of afternoon slot' do
+        expect(advance_to_closing_time(monday_break)).to eq(afternoon_closing)
+      end
+
+      it 'moves from afternoon closing slot to next day' do
+        expect(advance_to_closing_time(afternoon_closing)).to eq(tuesday_closing)
+      end
+    end
+
+    context 'supporting midnight' do
+      before do
+        WorkingHours::Config.working_hours = {
+          mon: {'00:00' => '24:00'},
+          tue: {'09:00' => '17:00'}
+        }
+      end
+
+      let(:monday_morning) { Time.utc(2014, 4, 7, 0) }
+      let(:monday_closing) { Time.utc(2014, 4, 7) + 86399.999999 }
+      let(:tuesday_closing) { Time.utc(2014, 4, 8, 17) }
+      let(:sunday) { Time.utc(2014, 4, 6, 17) }
+
+      it 'moves from morning to midnight' do
+        expect(advance_to_closing_time(monday_morning)).to eq(monday_closing)
+      end
+
+      it 'moves from midnight to end of next slot' do
+        expect(advance_to_closing_time(monday_closing)).to eq(tuesday_closing)
+      end
+
+      it 'moves over midnight' do
+        expect(advance_to_closing_time(sunday)).to eq(monday_closing)
+      end
+    end
+
+    it 'works with any input timezone (converts to config)' do
+      # Monday 0 am (-09:00) is 9am in UTC time, working time!
+      monday_morning = Time.new(2014, 4, 7, 0, 0, 0 , "-09:00")
+      monday_closing = Time.new(2014, 4, 7, 12, 0, 0 , "-05:00")
+      monday_night = Time.new(2014, 4, 7, 22, 0, 0, "+02:00")
+      tuesday_evening = Time.utc(2014, 4, 8, 17)
+      expect(advance_to_closing_time(monday_morning)).to eq(monday_closing)
+      expect(advance_to_closing_time(monday_night)).to eq(tuesday_evening)
+    end
+
+    it 'returns time in config zone' do
+      WorkingHours::Config.time_zone = 'Tokyo'
+      expect(advance_to_closing_time(Time.new(2014, 4, 7, 0, 0, 0)).zone).to eq('JST')
+    end
+  end
+
+  describe '#next_working_time' do
+
+    it 'jumps non-working day' do
+      WorkingHours::Config.holidays = [Date.new(2014, 5, 1)]
+      holiday = Time.utc(2014, 5, 1, 12, 0)
+      sunday = Time.utc(2014, 6, 1, 12, 0)
+      expect(next_working_time(holiday)).to eq(Time.utc(2014, 5, 2, 9, 0))
+      expect(next_working_time(sunday)).to eq(Time.utc(2014, 6, 2, 9, 0))
+    end
+
+    it 'moves to the following timespan during working hours' do
+      monday = Time.utc(2014, 4, 7, 12, 0)
+      tuesday = Time.utc(2014, 4, 8, 9, 0)
+      expect(next_working_time(monday)).to eq(tuesday)
+    end
+
+    it 'jumps outside working hours' do
+      monday_before_opening = Time.utc(2014, 4, 7, 8, 59)
+      monday_opening = Time.utc(2014, 4, 7, 9, 0)
+      monday_closing = Time.utc(2014, 4, 7, 17, 0)
+      tuesday_opening = Time.utc(2014, 4, 8, 9, 0)
+      expect(next_working_time(monday_before_opening)).to eq(monday_opening)
+      expect(next_working_time(monday_closing)).to eq(tuesday_opening)
+    end
+
+    context 'move between timespans' do
+      before do
+        WorkingHours::Config.working_hours = {
+          mon: {'07:00' => '12:00', '13:00' => '18:00'},
+          tue: {'09:00' => '17:00'},
+          wed: {'09:00' => '17:00'},
+          thu: {'09:00' => '17:00'},
+          fri: {'09:00' => '17:00'}
+        }
+      end
+
+      let(:monday_morning) { Time.utc(2014, 4, 7, 10) }
+      let(:monday_afternoon) { Time.utc(2014, 4, 7, 13) }
+      let(:monday_break) { Time.utc(2014, 4, 7, 12) }
+      let(:tuesday_morning) { Time.utc(2014, 4, 8, 9) }
+
+      it 'moves from morning to afternoon slot' do
+        expect(next_working_time(monday_morning)).to eq(monday_afternoon)
+      end
+
+      it 'moves from break time to afternoon slot' do
+        expect(next_working_time(monday_break)).to eq(monday_afternoon)
+      end
+
+      it 'moves from afternoon slot to next day' do
+        expect(next_working_time(monday_afternoon)).to eq(tuesday_morning)
+      end
+    end
+
+    it 'works with any input timezone (converts to config)' do
+      # Monday 0 am (-09:00) is 9am in UTC time, working time!
+      monday_morning = Time.new(2014, 4, 7, 0, 0, 0 , "-09:00")
+      monday_night = Time.new(2014, 4, 7, 22, 0, 0, "+02:00")
+      tuesday_morning = Time.utc(2014, 4, 8, 9)
+      expect(next_working_time(monday_morning)).to eq(tuesday_morning)
+      expect(next_working_time(monday_night)).to eq(tuesday_morning)
+    end
+
+    it 'returns time in config zone' do
+      WorkingHours::Config.time_zone = 'Tokyo'
+      expect(next_working_time(Time.new(2014, 4, 7, 0, 0, 0)).zone).to eq('JST')
+    end
+  end
+
   describe '#return_to_working_time' do
     it 'jumps non-working day' do
       WorkingHours::Config.holidays = [Date.new(2014, 5, 1)]
@@ -349,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

@@ -5,25 +5,58 @@ describe WorkingHours::Config do
   describe '.working_hours' do
 
     let(:config) { WorkingHours::Config.working_hours }
+    let(:config2) { { :mon => { '08:00' => '14:00' } } }
+    let(:config3) { { :tue => { '10:00' => '16:00' } } }
 
     it 'has a default config' do
       expect(config).to be_kind_of(Hash)
     end
 
     it 'is thread safe' do
+      expect(WorkingHours::Config.working_hours).to eq(config)
+
+      thread = Thread.new do
+        WorkingHours::Config.working_hours = config2
+        expect(WorkingHours::Config.working_hours).to eq(config2)
+        Thread.stop
+        expect(WorkingHours::Config.working_hours).to eq(config2)
+      end
+
+      expect {
+        sleep 0.1 # let the thread begin its execution
+      }.not_to change { WorkingHours::Config.working_hours }.from(config)
+
       expect {
-        Thread.new {
-          WorkingHours::Config.working_hours = {:mon => {'08:00' => '14:00'}}
-        }.join
-      }.not_to change { WorkingHours::Config.working_hours }
+        WorkingHours::Config.working_hours = config3
+      }.to change { WorkingHours::Config.working_hours }.from(config).to(config3)
+
+      expect {
+        thread.run
+        thread.join
+      }.not_to change { WorkingHours::Config.working_hours }.from(config3)
     end
 
     it 'is fiber safe' do
+      expect(WorkingHours::Config.working_hours).to eq(config)
+
+      fiber = Fiber.new do
+        WorkingHours::Config.working_hours = config2
+        expect(WorkingHours::Config.working_hours).to eq(config2)
+        Fiber.yield
+        expect(WorkingHours::Config.working_hours).to eq(config2)
+      end
+
+      expect {
+        fiber.resume
+      }.not_to change { WorkingHours::Config.working_hours }.from(config)
+
+      expect {
+        WorkingHours::Config.working_hours = config3
+      }.to change { WorkingHours::Config.working_hours }.from(config).to(config3)
+
       expect {
-        Fiber.new {
-          WorkingHours::Config.working_hours = {:mon => {'08:00' => '14:00'}}
-        }.resume
-      }.not_to change { WorkingHours::Config.working_hours }
+        fiber.resume
+      }.not_to change { WorkingHours::Config.working_hours }.from(config3)
     end
 
     it 'is initialized from last known global config' do
@@ -233,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']
       })
@@ -251,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']
       })
@@ -263,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
 

data/spec/working_hours/core_ext/{fixnum_spec.rb → integer_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe WorkingHours::CoreExt::Fixnum do
+describe WorkingHours::CoreExt::Integer do
 
   describe '#working' do
     it 'returns a DurationProxy' do

data/spec/working_hours/duration_spec.rb

@@ -62,6 +62,10 @@ describe WorkingHours::Duration do
       WorkingHours::Config.time_zone = 'Tokyo'
       expect(7.working.days.from_now.zone).to eq('JST')
     end
+
+    it 'should not hang with fractional hours' do
+      WorkingHours::Duration.new(4.1, :hours).since(Time.utc(1991, 11, 15, 21))
+    end
   end
 
   describe '#until' do

data/working_hours.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'tzinfo'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler', '>= 1.5'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'timecop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,14 +43,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -111,16 +111,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/Gemfile.activesupport-3.2.x
-- gemfiles/Gemfile.activesupport-4.0.x
-- gemfiles/Gemfile.activesupport-4.1.x
-- gemfiles/Gemfile.activesupport-4.2.x
-- gemfiles/Gemfile.activesupport-head
+- gemfiles/Gemfile.activesupport-4.x
+- gemfiles/Gemfile.activesupport-5.x
+- gemfiles/Gemfile.activesupport-6.x
+- gemfiles/Gemfile.activesupport-edge
 - lib/working_hours.rb
 - lib/working_hours/computation.rb
 - lib/working_hours/config.rb
 - lib/working_hours/core_ext/date_and_time.rb
-- lib/working_hours/core_ext/fixnum.rb
+- lib/working_hours/core_ext/integer.rb
 - lib/working_hours/duration.rb
 - lib/working_hours/duration_proxy.rb
 - lib/working_hours/module.rb
@@ -129,7 +128,7 @@ files:
 - spec/working_hours/computation_spec.rb
 - spec/working_hours/config_spec.rb
 - spec/working_hours/core_ext/date_and_time_spec.rb
-- spec/working_hours/core_ext/fixnum_spec.rb
+- spec/working_hours/core_ext/integer_spec.rb
 - spec/working_hours/duration_proxy_spec.rb
 - spec/working_hours/duration_spec.rb
 - spec/working_hours_spec.rb
@@ -153,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: time calculation with working hours
@@ -163,7 +161,7 @@ test_files:
 - spec/working_hours/computation_spec.rb
 - spec/working_hours/config_spec.rb
 - spec/working_hours/core_ext/date_and_time_spec.rb
-- spec/working_hours/core_ext/fixnum_spec.rb
+- spec/working_hours/core_ext/integer_spec.rb
 - spec/working_hours/duration_proxy_spec.rb
 - spec/working_hours/duration_spec.rb
 - spec/working_hours_spec.rb

data/gemfiles/Gemfile.activesupport-4.1.x

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '..'
-
-gem 'activesupport', '~> 4.1'