working_hours 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1729fae716e9632d6944229a25e12b76c4acd3
-  data.tar.gz: bf9c3b93eeee75439bbc09b05ecb7db36465ca0b
+  metadata.gz: fdc5713f20da1316a29bf18573095ac9e92ccb6c
+  data.tar.gz: bf54ee89ba3f855fcdc0d791965cf23fd5c29d3c
 SHA512:
-  metadata.gz: c545c3b569235af36415d087c42eb54a9137f0bcc6c27a5a17dcfd85ac5efcd9440b6b671dc69193329c721c66b2b76a53767b0f9c9c92cb1ac68d4d6fc49e5b
-  data.tar.gz: a1a2b0e842150465f06d7f6c89475f509416b83e86ea41a4dcedac8c55cff11bcac1d7f01fcc828d6c8fd600c0ab8660b9a65326fa75046eda1fdaf5c8aed78a
+  metadata.gz: 99cd033ae02a2c9c25fbced88e1c265a891210c7a232e12bb32191fd3c9bcea652cf3f35bd6c50c3215277b190d3af56e73fbde20cff1bb6cdfb24e2a205e08f
+  data.tar.gz: 50f2ca92979404a58af287abd33dd7af125ad9366a43160804bbbf09ce2b7648d474c5bf598e583fef4c7394e28965c31a91cc26a3ebba35d71e12cba0cdff95

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.3
+  - 2.1.6
+  - 2.2.2
   - ruby-head
   - jruby-1.7.19
   - jruby-head

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Unreleased
 
-[Compare master with v1.1.0](https://github.com/intrepidd/working_hours/compare/v1.1.0...master)
+[Compare master with v1.1.1](https://github.com/intrepidd/working_hours/compare/v1.1.1...master)
+
+# v1.1.1
+* Fix infinite loop happening when rewinding seconds and crossing through midgnight
+
+_18/08/2015_
 
 # v1.1.0
 * Config set globally is now properly inherited in new threads. This fixes the issue when setting the config once in an initializer won't work in threaded web servers.

data/README.md

@@ -5,7 +5,7 @@
 A modern ruby gem allowing to do time calculation with working hours.
 
 Compatible and tested with:
-- Ruby `2.0`, `2.1`, JRuby `1.7`
+- 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`
 
 ## Installation

data/lib/working_hours/computation.rb

@@ -49,7 +49,7 @@ module WorkingHours
       end
       while seconds < 0
         # roll to previous business period
-        time = return_to_working_time(time, config: config)
+        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|
@@ -63,7 +63,7 @@ module WorkingHours
           end
         end
       end
-      convert_to_original_format time, origin
+      convert_to_original_format(time.round, origin)
     end
 
     def advance_to_working_time time, config: nil
@@ -85,7 +85,14 @@ module WorkingHours
       end
     end
 
-    def return_to_working_time time, config: nil
+    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
+      # public API
+      return_to_exact_working_time(time, config: config).round
+    end
+
+    def return_to_exact_working_time time, config: nil
       config ||= wh_config
       time = in_config_zone(time, config: config).round
       loop do
@@ -97,8 +104,8 @@ module WorkingHours
         time_in_day = time.seconds_since_midnight
         (config[:working_hours][time.wday] || {}).reverse_each do |from, to|
           # round is used to suppress miliseconds hack from `end_of_day`
-          return time.round if time_in_day > from and time_in_day <= to
-          return (time - (time_in_day - to)).round if to <= time_in_day
+          return time if time_in_day > from and time_in_day <= to
+          return (time - (time_in_day - to)) if to <= time_in_day
         end
         # if none is found, go to previous day and loop
         time = (time - 1.day).end_of_day

data/lib/working_hours/version.rb

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

data/spec/working_hours/computation_spec.rb

@@ -98,11 +98,17 @@ describe WorkingHours::Computation do
       add_seconds(time, 120)
     end
 
-    it 'supports midnight' do
+    it 'supports midnight when advancing time' do
       WorkingHours::Config.working_hours = {:mon => {'00:00' => '24:00'}}
-      time = Time.utc(2014, 4, 7, 23, 59, 30) # Friday
+      time = Time.utc(2014, 4, 7, 23, 59, 30) # Monday
       expect(add_seconds(time, 60)).to eq(Time.utc(2014, 4, 14, 0, 0, 30))
     end
+
+    it 'supports midnight when rewinding time' do
+      WorkingHours::Config.working_hours = {:mon => {'00:00' => '24:00'}, :tue => {'08:00' => '18:00'}}
+      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
   end
 
   describe '#advance_to_working_time' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-08-18 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.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: time calculation with working hours
@@ -167,4 +167,3 @@ test_files:
 - spec/working_hours/duration_proxy_spec.rb
 - spec/working_hours/duration_spec.rb
 - spec/working_hours_spec.rb
-has_rdoc: