working_hours 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f00a9f2b6cd9d293631464feb64a41d6c738b03f
-  data.tar.gz: c18fa540c8033e1d8c1f42cad501420f16c6c7d7
+SHA256:
+  metadata.gz: 1c6ba325dcb5811a04a8eb5102e65b6d48e291a7d4a581baaf6f5e63b5394cf1
+  data.tar.gz: 302e9f7a199ac7db4049e288f141c7dad3674e6618f99a2c4380af14e316b121
 SHA512:
-  metadata.gz: fb32d4257bb17d0c0dc5d7595e19f808ec76970d38bb46ab3b4bf0893ed3d05e9f1734db7f49ec09a89eb495bc21e45a98bd08ce40979edd89efbbfd039f8539
-  data.tar.gz: f9874b5d95e6b47846d194347de5e78c14fe56d95a36071a1215e016dfe9312c3a57f0343aabdb4a4280fc89900e100e5c5598975954683d32a08cb18cfd92bd
+  metadata.gz: d5ff45d737ba62afd04c0322d4010e6bac9cad0954a1fadcbd38564540367f32e2e8da8f78529921f755a46663cd1dbabf4562ec6d02235d8c1d0ddcc047316b
+  data.tar.gz: 686a39afbad5ff340de57db83173dd75dd6c2b5b0ec244e25fbc2263b2eb7f90764f7cb8a95aed53a689507c19b4ba337a987ee00eac33bdce0c9fc903865772

data/.travis.yml

@@ -1,29 +1,25 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - 2.4.0
-  - ruby-head
-  - jruby-1.7.23
-  - jruby-9.0.4.0
-  - jruby-head
-before_install:
-  - bundler --version || gem install bundler
-env: JRUBY_OPTS=--2.0
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
+  - jruby-9.2.11.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:
+  - gemfiles/Gemfile.activesupport-4.x
+  - gemfiles/Gemfile.activesupport-5.x
+  - gemfiles/Gemfile.activesupport-6.x
+jobs:
   exclude:
-    - rvm: 2.4.0
-      env: JRUBY_OPTS=--2.0
-      gemfile: gemfiles/Gemfile.activesupport-3.2.x
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.activesupport-edge
+    - rvm: 2.4.9
+      gemfile: gemfiles/Gemfile.activesupport-6.x
+    - rvm: 2.7.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,16 @@
 # Unreleased
 
-[Compare master with v1.1.4](https://github.com/intrepidd/working_hours/compare/v1.1.4...master)
+[Compare master with v1.2.0](https://github.com/intrepidd/working_hours/compare/v1.2.0...master)
+
+# 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)

data/README.md

@@ -5,8 +5,8 @@
 A modern ruby gem allowing to do time calculation with working hours.
 
 Compatible and tested with:
-- Ruby `2.x`, JRuby `9.0.x`, JRuby `1.7.x` ( with 2.0 syntax: `--2.0` )
-- ActiveSupport `3.2.x`, `4.x`
+- Ruby `2.4`, `2.5`, `2.6`, `2.7`, JRuby `9.2`
+- ActiveSupport `4.x`, `5.x`, `6.x`
 
 ## Installation
 

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/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)

data/lib/working_hours/version.rb

@@ -1,3 +1,3 @@
 module WorkingHours
-  VERSION = "1.1.4"
+  VERSION = "1.2.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

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.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2020-04-15 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,11 +111,10 @@ 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
@@ -153,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: time calculation with working hours
@@ -167,4 +165,3 @@ test_files:
 - spec/working_hours/duration_proxy_spec.rb
 - spec/working_hours/duration_spec.rb
 - spec/working_hours_spec.rb
-has_rdoc: 

data/gemfiles/Gemfile.activesupport-4.1.x

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