working_hours 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdc5713f20da1316a29bf18573095ac9e92ccb6c
-  data.tar.gz: bf54ee89ba3f855fcdc0d791965cf23fd5c29d3c
+  metadata.gz: 67a0f2eb365a59918de39db2f11c29793a458f07
+  data.tar.gz: 003cae888ac4274d8fa53fffee04c8bddb83b3b8
 SHA512:
-  metadata.gz: 99cd033ae02a2c9c25fbced88e1c265a891210c7a232e12bb32191fd3c9bcea652cf3f35bd6c50c3215277b190d3af56e73fbde20cff1bb6cdfb24e2a205e08f
-  data.tar.gz: 50f2ca92979404a58af287abd33dd7af125ad9366a43160804bbbf09ce2b7648d474c5bf598e583fef4c7394e28965c31a91cc26a3ebba35d71e12cba0cdff95
+  metadata.gz: 1917dd8e540d5b79d19f85c4c29ee10951f42f37a86451eacbaa9e03522db3f76b93051358d87404bb74df3ead6c2940c029f7b80e713af861a3517e562f692a
+  data.tar.gz: 78aaf458c8bf63b49f9a94cf9134a9f6f95ae8293075d799acca986ef5b6da4417fae2315f1450d404884384864f67fc8ae51482d5f75fc02727df76a43d5dbf

data/.gitignore

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

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.6
-  - 2.2.2
+  - 2.2.3
   - ruby-head
   - jruby-1.7.19
   - jruby-head

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Unreleased
 
-[Compare master with v1.1.1](https://github.com/intrepidd/working_hours/compare/v1.1.1...master)
+[Compare master with v1.1.2](https://github.com/intrepidd/working_hours/compare/v1.1.2...master)
+
+# 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

@@ -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/lib/working_hours/computation.rb

@@ -39,7 +39,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 +55,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
@@ -85,6 +85,31 @@ module WorkingHours
       end
     end
 
+    def advance_to_closing_time time, config: nil
+      config ||= wh_config
+      time = in_config_zone(time, config: config).round
+      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

data/lib/working_hours/version.rb

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

data/spec/working_hours/computation_spec.rb

@@ -148,6 +148,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)]

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 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: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: time calculation with working hours
@@ -167,3 +167,4 @@ test_files:
 - spec/working_hours/duration_proxy_spec.rb
 - spec/working_hours/duration_spec.rb
 - spec/working_hours_spec.rb
+has_rdoc: