working_hours 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 102b64fd640e32b4164e32d0323d3575bfd720064d02045ff65f7e320b7dd305
-  data.tar.gz: dea4493b517eda97438e35f3857da9b456ead0e992b6278b33d108f1c38ef7ca
+  metadata.gz: d2f3a760854612e389ff263f670c2ddbd3206c5895f13a753267e44a92ca12f1
+  data.tar.gz: f9f30c0aaf3c7004a68b7f18ef39767e30c497bedc14361c2ad450894272997e
 SHA512:
-  metadata.gz: 88e9102b1a8111aab7b0c5017c93f2eda8c99821499dfe9aa91e89572925b090a95840059a91de0e1114340ae566973a4d67844ebabee4a8f93dd6f11ae94786
-  data.tar.gz: 5dcdc183274c968c8cf61880870642ec1045092f9f579fb0f14c9ad1e45ffd232e37aa544c0a1c2f4c58dca4a676d1c6856fdd7cf95171e8702201ec44b550bc
+  metadata.gz: c63b351486621dca69deb0b827dc51024f74b4304e6639c9272b01d5a5fd9a58013e1d9874ed13466ce6f5fb60ccab67c9f2712a0af2b4d5e4a94bbf214ac996
+  data.tar.gz: 8662b6a40f4ee6bc734cd2f87eecf1e6b51a474638dc5b9a867525cbdc0c7a4b329a34054fff395e71e36b5b93e26d01d3205b2965fd0573c70bbe764c1e450b

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Unreleased
 
-[Compare master with v1.3.1](https://github.com/intrepidd/working_hours/compare/v1.3.1...master)
+[Compare master with v1.4.0](https://github.com/intrepidd/working_hours/compare/v1.4.0...master)
+
+# v1.4.0
+* New config option: holiday_hours - [#37](https://github.com/Intrepidd/working_hours/pull/37)
 
 # v1.3.2
 * Improve support for time shifts - [#46](https://github.com/Intrepidd/working_hours/pull/46)

data/README.md

@@ -104,6 +104,17 @@ end
 - ``holidays``
 - ``time_zone``
 
+### Holiday hours
+Sometimes you need to configure different working hours as a one-off, e.g. the working day might end earlier on Christmas Eve.
+
+You can configure this with the `holiday_hours` option, either as an override on the existing working hours, or as a set of hours that *are* being worked on a holiday day.
+
+If *any* hours are set for a calendar day in `holiday_hours`, then the `working_hours` for that day will be ignored, and only the entries in `holiday_hours` taken into consideration.
+
+```ruby
+# Configure holiday hours
+WorkingHours::Config.holiday_hours = {Date.new(2020, 12, 24) => {'09:00' => '12:00', '13:00' => '15:00'}}
+```
 
 ## No core extensions / monkey patching
 

data/lib/working_hours/computation.rb

@@ -40,7 +40,7 @@ module WorkingHours
         time = advance_to_working_time(time, config: config)
         # look at working ranges
         time_in_day = time.seconds_since_midnight
-        config[:working_hours][time.wday].each do |from, to|
+        working_hours_for(time, config: config).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
@@ -56,7 +56,8 @@ module WorkingHours
         time = return_to_exact_working_time(time, config: config)
         # look at working ranges
         time_in_day = time.seconds_since_midnight
-        config[:working_hours][time.wday].reverse_each do |from, to|
+        
+        working_hours_for(time, config: config).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
@@ -80,7 +81,8 @@ 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|
+        
+        working_hours_for(time, config: config).each do |from, to|
           return time if time_in_day >= from and time_in_day < to
           return move_time_of_day(time, from) if from >= time_in_day
         end
@@ -99,7 +101,7 @@ module WorkingHours
         end
         # find next working range after time
         time_in_day = time.seconds_since_midnight
-        config[:working_hours][time.wday].each do |from, to|
+        working_hours_for(time, config: config).each do |from, to|
           return move_time_of_day(time, to) if time_in_day < to
         end
         # if none is found, go to next day and loop
@@ -129,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|
+        working_hours_for(time, config: config).reverse_each do |from, to|
           return time if time_in_day > from and time_in_day <= to
           return move_time_of_day(time, to) if to <= time_in_day
         end
@@ -141,7 +143,9 @@ module WorkingHours
     def working_day? time, config: nil
       config ||= wh_config
       time = in_config_zone(time, config: config)
-      config[:working_hours][time.wday].present? and not config[:holidays].include?(time.to_date)
+
+      (config[:working_hours][time.wday].present? && !config[:holidays].include?(time.to_date)) ||
+        config[:holiday_hours].include?(time.to_date)
     end
 
     def in_working_hours? time, config: nil
@@ -149,7 +153,7 @@ module WorkingHours
       time = in_config_zone(time, config: config)
       return false if not working_day?(time, config: config)
       time_in_day = time.seconds_since_midnight
-      config[:working_hours][time.wday].each do |from, to|
+      working_hours_for(time, config: config).each do |from, to|
         return true if time_in_day >= from and time_in_day < to
       end
       false
@@ -183,7 +187,7 @@ module WorkingHours
           from_was = from
           # look at working ranges
           time_in_day = from.seconds_since_midnight
-          config[:working_hours][from.wday].each do |begins, ends|
+          working_hours_for(from, config: config).each do |begins, ends|
             if time_in_day >= begins and time_in_day < ends
               if (to - from) > (ends - time_in_day)
                 # take all the range and continue
@@ -246,5 +250,8 @@ module WorkingHours
       end
     end
 
+    def working_hours_for(time, config:)
+      config[:holiday_hours][time.to_date] || config[:working_hours][time.wday]
+    end
   end
 end

data/lib/working_hours/config.rb

@@ -4,13 +4,11 @@ module WorkingHours
   InvalidConfiguration = Class.new StandardError
 
   class Config
-
     TIME_FORMAT = /\A([0-2][0-9])\:([0-5][0-9])(?:\:([0-5][0-9]))?\z/
     DAYS_OF_WEEK = [:sun, :mon, :tue, :wed, :thu, :fri, :sat]
     MIDNIGHT = Rational('86399.999999')
 
     class << self
-
       def working_hours
         config[:working_hours]
       end
@@ -33,9 +31,26 @@ module WorkingHours
         config.delete :precompiled
       end
 
+      def holiday_hours
+        config[:holiday_hours]
+      end
+
+      def holiday_hours=(val)
+        validate_holiday_hours! val
+        config[:holiday_hours] = val
+        global_config[:holiday_hours] = val
+        config.delete :precompiled
+      end
+
       # Returns an optimized for computing version
       def precompiled
-        config_hash = [config[:working_hours], config[:holidays], config[:time_zone]].hash
+        config_hash = [
+          config[:working_hours],
+          config[:holiday_hours],
+          config[:holidays],
+          config[:time_zone]
+        ].hash
+
         if config_hash != config[:config_hash]
           config[:config_hash] = config_hash
           config.delete :precompiled
@@ -43,14 +58,21 @@ module WorkingHours
 
         config[:precompiled] ||= begin
           validate_working_hours! config[:working_hours]
+          validate_holiday_hours! config[:holiday_hours]
           validate_holidays! config[:holidays]
           validate_time_zone! config[:time_zone]
-          compiled = { working_hours: Array.new(7) { Hash.new } }
+          compiled = { working_hours: Array.new(7) { Hash.new }, holiday_hours: {} }
           working_hours.each do |day, hours|
             hours.each do |start, finish|
               compiled[:working_hours][DAYS_OF_WEEK.index(day)][compile_time(start)] = compile_time(finish)
             end
           end
+          holiday_hours.each do |day, hours|
+            compiled[:holiday_hours][day] = {}
+            hours.each do |start, finish|
+              compiled[:holiday_hours][day][compile_time(start)] = compile_time(finish)
+            end
+          end
           compiled[:holidays] = Set.new(holidays)
           compiled[:time_zone] = time_zone
           compiled
@@ -72,16 +94,19 @@ module WorkingHours
         Thread.current[:working_hours] = default_config
       end
 
-      def with_config(working_hours: nil, holidays: nil, time_zone: nil)
+      def with_config(working_hours: nil, holiday_hours: nil, holidays: nil, time_zone: nil)
         original_working_hours = self.working_hours
+        original_holiday_hours = self.holiday_hours
         original_holidays = self.holidays
         original_time_zone = self.time_zone
         self.working_hours = working_hours if working_hours
+        self.holiday_hours = holiday_hours if holiday_hours
         self.holidays = holidays if holidays
         self.time_zone = time_zone if time_zone
         yield
       ensure
         self.working_hours = original_working_hours
+        self.holiday_hours = original_holiday_hours
         self.holidays = original_holidays
         self.time_zone = original_time_zone
       end
@@ -105,6 +130,7 @@ module WorkingHours
             thu: {'09:00' => '17:00'},
             fri: {'09:00' => '17:00'}
           },
+          holiday_hours: {},
           holidays: [],
           time_zone: ActiveSupport::TimeZone['UTC']
         }
@@ -120,14 +146,8 @@ module WorkingHours
         time
       end
 
-      def validate_working_hours! week
-        if week.empty?
-          raise InvalidConfiguration.new "No working hours given"
-        end
-        if (invalid_keys = (week.keys - DAYS_OF_WEEK)).any?
-          raise InvalidConfiguration.new "Invalid day identifier(s): #{invalid_keys.join(', ')} - must be 3 letter symbols"
-        end
-        week.each do |day, hours|
+      def validate_hours! dates
+        dates.each do |day, hours|
           if not hours.is_a? Hash
             raise InvalidConfiguration.new "Invalid type for `#{day}`: #{hours.class} - must be Hash"
           elsif hours.empty?
@@ -151,6 +171,23 @@ module WorkingHours
         end
       end
 
+      def validate_working_hours! week
+        if week.empty?
+          raise InvalidConfiguration.new "No working hours given"
+        end
+        if (invalid_keys = (week.keys - DAYS_OF_WEEK)).any?
+          raise InvalidConfiguration.new "Invalid day identifier(s): #{invalid_keys.join(', ')} - must be 3 letter symbols"
+        end
+        validate_hours!(week)
+      end
+
+      def validate_holiday_hours! days
+        if (invalid_keys = (days.keys.reject{ |day| day.is_a?(Date) })).any?
+          raise InvalidConfiguration.new "Invalid day identifier(s): #{invalid_keys.join(', ')} - must be a Date object"
+        end
+        validate_hours!(days)
+      end
+
       def validate_holidays! holidays
         if not holidays.respond_to?(:to_a)
           raise InvalidConfiguration.new "Invalid type for holidays: #{holidays.class} - must act like an array"
@@ -175,12 +212,10 @@ module WorkingHours
         end
         res
       end
-
     end
 
     private
 
-    def initialize
-    end
+    def initialize; end
   end
 end

data/lib/working_hours/version.rb

@@ -1,3 +1,3 @@
 module WorkingHours
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/spec/working_hours/computation_spec.rb

@@ -111,7 +111,7 @@ describe WorkingHours::Computation do
       expect(add_seconds(time, 120)).to eq(Time.utc(1991, 11, 18, 9, 1, 42))
     end
 
-    it 'Calls precompiled only once' do
+    it 'calls precompiled only once' do
       precompiled = WorkingHours::Config.precompiled
       expect(WorkingHours::Config).to receive(:precompiled).once.and_return(precompiled) # in_config_zone and add_seconds
       time = Time.utc(1991, 11, 15, 16, 59, 42) # Friday
@@ -130,12 +130,94 @@ describe WorkingHours::Computation do
       expect(add_seconds(time, -60)).to eq(Time.utc(2014, 4, 7, 23, 59, 00))
     end
 
+    context 'with holiday hours' do
+      before do
+        WorkingHours::Config.working_hours = { thu: { '08:00' => '18:00' }, fri: { '08:00' => '18:00' } }
+      end
+
+      context 'with a later starting hour' do
+        before do
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 27) => { '10:00' => '18:00' } }
+        end
+
+        it 'adds working seconds' do
+          time = Time.utc(2019, 12, 27, 9)
+          expect(add_seconds(time, 120)).to eq(Time.utc(2019, 12, 27, 10, 2))
+        end
+
+        it 'removes working seconds' do
+          time = Time.utc(2019, 12, 27, 9)
+          expect(add_seconds(time, -120)).to eq(Time.utc(2019, 12, 26, 17, 58))
+        end
+
+        context 'working back from working hours' do
+          it 'moves to the previous working day' do
+            time = Time.utc(2019, 12, 27, 11)
+            expect(add_seconds(time, -2.hours)).to eq(Time.utc(2019, 12, 26, 17))
+          end
+        end
+      end
+
+      context 'with an earlier ending hour' do
+        before do
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 27) => { '08:00' => '17:00' } }
+        end
+
+        it 'adds working seconds' do
+          time = Time.utc(2019, 12, 27, 17, 59)
+          expect(add_seconds(time, 120)).to eq(Time.utc(2020, 1, 2, 8, 2))
+        end
+
+        it 'removes working seconds' do
+          time = Time.utc(2019, 12, 27, 18)
+          expect(add_seconds(time, -120)).to eq(Time.utc(2019, 12, 27, 16, 58))
+        end
+
+        context 'working forward from working hours' do
+          it 'moves to the next working day' do
+            time = Time.utc(2019, 12, 27, 16)
+            expect(add_seconds(time, 2.hours)).to eq(Time.utc(2020, 1, 2, 9))
+          end
+        end
+      end
+
+      context 'with an earlier starting time in the second set of hours within a day' do
+        before do
+          WorkingHours::Config.working_hours = { thu: { '08:00' => '18:00' }, fri: { '08:00' => '12:00', '13:00' => '18:00' } }
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 27) => { '08:00' => '12:00', '14:00' => '18:00' } }
+        end
+
+        it 'adds working seconds' do
+          time = Time.utc(2019, 12, 27, 12, 59)
+          expect(add_seconds(time, 120)).to eq(Time.utc(2019, 12, 27, 14, 2))
+        end
+
+        it 'removes working seconds' do
+          time = Time.utc(2019, 12, 27, 14)
+          expect(add_seconds(time, -120)).to eq(Time.utc(2019, 12, 27, 11, 58))
+        end
+
+        context 'from morning to afternoon' do
+          it 'takes into account the additional hour for lunch set in `holiday_hours`' do
+            time = Time.utc(2019, 12, 27, 10)
+            expect(add_seconds(time, 4.hours)).to eq(Time.utc(2019, 12, 27, 16))
+          end
+        end
+
+        context 'from afternoon to morning' do
+          it 'takes into account the additional hour for lunch set in `holiday_hours`' do
+            time = Time.utc(2019, 12, 27, 16)
+            expect(add_seconds(time, -4.hours)).to eq(Time.utc(2019, 12, 27, 10))
+          end
+        end
+      end
+    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
@@ -174,6 +256,12 @@ describe WorkingHours::Computation do
       expect(advance_to_working_time(Time.new(2014, 4, 7, 0, 0, 0)).zone).to eq('JST')
     end
 
+    it 'jumps outside holiday hours' do
+      WorkingHours::Config.working_hours = { fri: { '08:00' => '18:00' } }
+      WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 27) => { '10:00' => '18:00' } }
+      expect(advance_to_working_time(Time.utc(2019, 12, 27, 9))).to eq(Time.utc(2019, 12, 27, 10))
+    end
+
     it 'do not leak nanoseconds when advancing' do
       expect(advance_to_working_time(Time.utc(2014, 4, 7, 5, 0, 0, 123456.789))).to eq(Time.utc(2014, 4, 7, 9, 0, 0, 0))
     end
@@ -206,7 +294,6 @@ describe WorkingHours::Computation do
   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)
@@ -307,6 +394,22 @@ describe WorkingHours::Computation do
       expect(advance_to_closing_time(Time.new(2014, 4, 7, 0, 0, 0)).zone).to eq('JST')
     end
 
+    context 'with holiday hours' do
+      before do
+        WorkingHours::Config.working_hours = { thu: { '08:00' => '18:00' }, fri: { '08:00' => '18:00' } }
+      end
+
+      it 'takes into account reduced holiday closing' do
+        WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 27) => { '10:00' => '17:00' } }
+        expect(advance_to_closing_time(Time.new(2019, 12, 26, 20))).to eq(Time.new(2019, 12, 27, 17))
+      end
+
+      it 'takes into account extended holiday closing' do
+        WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 26) => { '10:00' => '21:00' } }
+        expect(advance_to_closing_time(Time.new(2019, 12, 26, 20))).to eq(Time.new(2019, 12, 26, 21))
+      end
+    end
+
     it 'do not leak nanoseconds when advancing' do
       expect(advance_to_closing_time(Time.utc(2014, 4, 7, 5, 0, 0, 123456.789))).to eq(Time.utc(2014, 4, 7, 17, 0, 0, 0))
     end
@@ -339,7 +442,6 @@ describe WorkingHours::Computation do
   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)
@@ -515,6 +617,23 @@ describe WorkingHours::Computation do
       WorkingHours::Config.time_zone = 'Tokyo'
       expect(in_working_hours?(Time.utc(2014, 4, 7, 0, 0))).to be(true)
     end
+
+    context 'with holiday hours' do
+      before do
+        WorkingHours::Config.working_hours = { thu: { '08:00' => '18:00' }, fri: { '08:00' => '18:00' } }
+        WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 27) => { '10:00' => '20:00' } }
+      end
+
+      it 'returns true during working hours' do
+        expect(in_working_hours?(Time.utc(2019, 12, 26, 9))).to be(true)
+        expect(in_working_hours?(Time.utc(2019, 12, 27, 19))).to be(true)
+      end
+
+      it 'returns false outside working hours' do
+        expect(in_working_hours?(Time.utc(2019, 12, 26, 7))).to be(false)
+        expect(in_working_hours?(Time.utc(2019, 12, 27, 9))).to be(false)
+      end
+    end
   end
 
   describe '#working_days_between' do
@@ -706,5 +825,66 @@ describe WorkingHours::Computation do
         end
       end
     end
+
+    context 'with holiday hours' do
+      before do
+        WorkingHours::Config.working_hours = { mon: { '08:00' => '18:00' }, tue: { '08:00' => '18:00' } }
+        WorkingHours::Config.holiday_hours = { Date.new(2014, 4, 7) => { '10:00' => '12:00', '14:00' => '17:00' } }
+      end
+
+      context 'time is before the start of holiday hours' do
+        it 'does not count holiday hours as working time' do
+          expect(working_time_between(
+            Time.utc(2014, 4, 7, 8),
+            Time.utc(2014, 4, 7, 9)
+          )).to eq(0)
+        end
+      end
+
+      context 'time is between holiday hours' do
+        it 'does not count holiday hours as working time' do
+          expect(working_time_between(
+            Time.utc(2014, 4, 7, 13),
+            Time.utc(2014, 4, 7, 13, 30)
+          )).to eq(0)
+        end
+      end
+
+      context 'time is after the end of holiday hours' do
+        it 'does not count holiday hours as working time' do
+          expect(working_time_between(
+            Time.utc(2014, 4, 7, 19),
+            Time.utc(2014, 4, 7, 20)
+          )).to eq(0)
+        end
+      end
+
+      context 'time is before the start of the holiday hours' do
+        it 'does not count holiday hours as working time' do
+          expect(working_time_between(
+            Time.utc(2014, 4, 7, 9),
+            Time.utc(2014, 4, 7, 12)
+          )).to eq(7200)
+        end
+      end
+
+      context 'time crosses overridden holiday hours at midday' do
+        it 'does not count holiday hours as working time' do
+          expect(working_time_between(
+            Time.utc(2014, 4, 7, 9),
+            Time.utc(2014, 4, 7, 14)
+          )).to eq(7200)
+        end
+      end
+
+      context 'time crosses overridden holiday hours at midday' do
+        it 'does not count holiday hours as working time' do
+          expect(working_time_between(
+            Time.utc(2014, 4, 7, 12),
+            Time.utc(2014, 4, 7, 18)
+          )).to eq(10800)
+        end
+      end
+    end
   end
 end

data/spec/working_hours/config_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 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' } } }
@@ -155,7 +154,132 @@ describe WorkingHours::Config do
           1.working.hour.ago
         }.to raise_error(WorkingHours::InvalidConfiguration, 'Invalid type for `mon`: String - must be Hash')
       end
+    end
+  end
+
+  describe '.holiday_hours' do
+    let(:config) { WorkingHours::Config.holiday_hours }
+    let(:config2) { { Date.new(2019, 12, 1) => { '08:00' => '14:00' } } }
+    let(:config3) { { Date.new(2019, 12, 2) => { '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.holiday_hours).to eq(config)
+
+      thread = Thread.new do
+        WorkingHours::Config.holiday_hours = config2
+        expect(WorkingHours::Config.holiday_hours).to eq(config2)
+        Thread.stop
+        expect(WorkingHours::Config.holiday_hours).to eq(config2)
+      end
+
+      expect {
+        sleep 0.1 # let the thread begin its execution
+      }.not_to change { WorkingHours::Config.holiday_hours }.from(config)
+
+      expect {
+        WorkingHours::Config.holiday_hours = config3
+      }.to change { WorkingHours::Config.holiday_hours }.from(config).to(config3)
+
+      expect {
+        thread.run
+        thread.join
+      }.not_to change { WorkingHours::Config.holiday_hours }.from(config3)
+    end
+
+    it 'is fiber safe' do
+      expect(WorkingHours::Config.holiday_hours).to eq(config)
+
+      fiber = Fiber.new do
+        WorkingHours::Config.holiday_hours = config2
+        expect(WorkingHours::Config.holiday_hours).to eq(config2)
+        Fiber.yield
+        expect(WorkingHours::Config.holiday_hours).to eq(config2)
+      end
+
+      expect {
+        fiber.resume
+      }.not_to change { WorkingHours::Config.holiday_hours }.from(config)
+
+      expect {
+        WorkingHours::Config.holiday_hours = config3
+      }.to change { WorkingHours::Config.holiday_hours }.from(config).to(config3)
+
+      expect {
+        fiber.resume
+      }.not_to change { WorkingHours::Config.holiday_hours }.from(config3)
+    end
+
+    it 'is initialized from last known global config' do
+      WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => { '08:00' => '14:00' } }
+      Thread.new {
+        expect(WorkingHours::Config.holiday_hours).to match Date.new(2019, 12, 1) => {'08:00' => '14:00'}
+      }.join
+    end
+
+    it 'should support multiple timespan per day' do
+      time_sheet = { Date.new(2019, 12, 1) => { '08:00' => '12:00', '14:00' => '18:00' } }
+      WorkingHours::Config.holiday_hours = time_sheet
+      expect(config).to eq(time_sheet)
+    end
+
+    describe 'validations' do
+      it 'rejects invalid day' do
+        expect {
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => 1, 'aaaaaa' => 2 }
+        }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid day identifier(s): aaaaaa - must be a Date object")
+      end
+
+      it 'rejects other type than hash' do
+        expect {
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => [] }
+        }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid type for `2019-12-01`: Array - must be Hash")
+      end
+
+      it 'rejects empty range' do
+        expect {
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => {} }
+        }.to raise_error(WorkingHours::InvalidConfiguration, "No working hours given for day `2019-12-01`")
+      end
+
+      it 'rejects invalid time format' do
+        expect {
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => { '8:0' => '12:00' } }
+        }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid time: 8:0 - must be 'HH:MM(:SS)'")
+
+        expect {
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => { '08:00' => '24:10' }}
+        }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid time: 24:10 - outside of day")
+      end
+
+      it 'rejects invalid range' do
+        expect {
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => { '12:30' => '12:00' } }
+        }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid range: 12:30 => 12:00 - ends before it starts")
+      end
+
+      it 'rejects overlapping range' do
+        expect {
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => { '08:00' => '13:00', '12:00' => '18:00' } }
+        }.to raise_error(WorkingHours::InvalidConfiguration, "Invalid range: 12:00 => 18:00 - overlaps previous range")
+      end
 
+      it 'does not reject out-of-order, non-overlapping ranges' do
+        expect {
+          WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => { '10:00' => '11:00', '08:00' => '09:00' } }
+        }.not_to raise_error
+      end
+
+      it 'raises an error when precompiling if working hours are invalid after assignment' do
+        WorkingHours::Config.holiday_hours = { Date.new(2019, 12, 1) => { '10:00' => '11:00', '08:00' => '09:00' } }
+        WorkingHours::Config.holiday_hours[Date.new(2019, 12, 1)] = 'Not correct'
+        expect {
+          1.working.hour.ago
+        }.to raise_error(WorkingHours::InvalidConfiguration, 'Invalid type for `2019-12-01`: String - must be Hash')
+      end
     end
   end
 
@@ -267,6 +391,7 @@ describe WorkingHours::Config do
     it 'computes an optimized version' do
       expect(subject).to eq({
           :working_hours => [{}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {32400=>61200}, {}],
+          :holiday_hours => {},
           :holidays => Set.new([]),
           :time_zone => ActiveSupport::TimeZone['UTC']
         })
@@ -283,6 +408,7 @@ describe WorkingHours::Config do
       WorkingHours::Config.working_hours = {:mon => {'20:32:59' => '22:59:59'}}
       expect(subject).to eq({
         :working_hours => [{}, {73979 => 82799}, {}, {}, {}, {}, {}],
+        :holiday_hours => {},
         :holidays => Set.new([]),
         :time_zone => ActiveSupport::TimeZone['UTC']
       })
@@ -292,6 +418,7 @@ describe WorkingHours::Config do
       WorkingHours::Config.working_hours = {:mon => {'20:00' => '24:00'}}
       expect(subject).to eq({
         :working_hours => [{}, {72000 => 86399.999999}, {}, {}, {}, {}, {}],
+        :holiday_hours => {},
         :holidays => Set.new([]),
         :time_zone => ActiveSupport::TimeZone['UTC']
       })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport