working_hours 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b22e4d023c26a46743000425945952ab1bab9fd
-  data.tar.gz: cbed8ec547a77301003e9dc7ed0686c08f2cac46
+  metadata.gz: 4b1729fae716e9632d6944229a25e12b76c4acd3
+  data.tar.gz: bf9c3b93eeee75439bbc09b05ecb7db36465ca0b
 SHA512:
-  metadata.gz: a63290c01a8c6f78782a7abc917b655e16d97c115f44c1c3a075cfe067ddc8a68a4df7fc609d10ba81beb471e963032b7491df872b0ea372e8585377832b938b
-  data.tar.gz: a65bebd4a98cd33caccd717924166bbc89057f7b0800385cca6902ef2a76a1d5367cda365de1926000f37816f028fbb728154db5ae1d9ac08fe43050e279152f
+  metadata.gz: c545c3b569235af36415d087c42eb54a9137f0bcc6c27a5a17dcfd85ac5efcd9440b6b671dc69193329c721c66b2b76a53767b0f9c9c92cb1ac68d4d6fc49e5b
+  data.tar.gz: a1a2b0e842150465f06d7f6c89475f509416b83e86ea41a4dcedac8c55cff11bcac1d7f01fcc828d6c8fd600c0ab8660b9a65326fa75046eda1fdaf5c8aed78a

data/CHANGELOG.md

@@ -1,10 +1,17 @@
 # Unreleased
 
-[Compare master with v1.0.3](https://github.com/intrepidd/working_hours/compare/v1.0.3...master)
+[Compare master with v1.1.0](https://github.com/intrepidd/working_hours/compare/v1.1.0...master)
+
+# 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.
+
+_03/04/2015_
 
 # v1.0.4
 * Fixed a nasty stack level too deep error on DateTime#+ and DateTime#- (thanks @jlanatta)
 
+_27/03/2015_
+
 # v1.0.3
 
 * Relax configuration input formats - [#10](https://github.com/Intrepidd/working_hours/pull/10)

data/README.md

@@ -63,7 +63,7 @@ WorkingHours.return_to_working_time(Time.utc(2014, 8, 4, 7, 16)) # => Fri, 01 Au
 
 ## Configuration
 
-The working hours configuration is thread local and consists of a hash defining working periods for each day, a time zone and a list of days off.
+The working hours configuration is thread safe and consists of a hash defining working periods for each day, a time zone and a list of days off. You can set it once, for example in a initializer for rails:
 
 ```ruby
 # Configure working hours
@@ -82,7 +82,7 @@ WorkingHours::Config.time_zone = 'Paris'
 WorkingHours::Config.holidays = [Date.new(2014, 12, 31)]
 ```
 
-Alternatively, you can apply a particular config in a block with the ``with_config`` method :
+Or you can set it for the duration of a block with the `with_config` method, this is particularly useful with `around_filter`:
 
 ```ruby
 WorkingHours::Config.with_config(working_hours: {mon:{'09:00' => '18:00'}}, holidays: [], time_zone: 'Paris') do

data/lib/working_hours/config.rb

@@ -17,6 +17,7 @@ module WorkingHours
       def working_hours=(val)
         validate_working_hours! val
         config[:working_hours] = val
+        global_config[:working_hours] = val
         config.delete :precompiled
       end
 
@@ -27,6 +28,7 @@ module WorkingHours
       def holidays=(val)
         validate_holidays! val
         config[:holidays] = val
+        global_config[:holidays] = val
         config.delete :precompiled
       end
 
@@ -62,6 +64,7 @@ module WorkingHours
       def time_zone=(val)
         zone = validate_time_zone! val
         config[:time_zone] = zone
+        global_config[:time_zone] = val
         config.delete :precompiled
       end
 
@@ -86,7 +89,11 @@ module WorkingHours
       private
 
       def config
-        Thread.current[:working_hours] ||= default_config
+        Thread.current[:working_hours] ||= global_config
+      end
+
+      def global_config
+        @@global_config ||= default_config
       end
 
       def default_config

data/lib/working_hours/version.rb

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

data/spec/working_hours/config_spec.rb

@@ -26,6 +26,13 @@ describe WorkingHours::Config do
       }.not_to change { WorkingHours::Config.working_hours }
     end
 
+    it 'is initialized from last known global config' do
+      WorkingHours::Config.working_hours = {:mon => {'08:00' => '14:00'}}
+      Thread.new {
+        expect(WorkingHours::Config.working_hours).to match :mon => {'08:00' => '14:00'}
+      }.join
+    end
+
     it 'should have a key for each week day' do
       [:mon, :tue, :wed, :thu, :fri].each do |d|
         expect(config[d]).to be_kind_of(Hash)
@@ -137,6 +144,13 @@ describe WorkingHours::Config do
       }.to change { WorkingHours::Config.precompiled[:holidays] }.by(Set.new([Date.today]))
     end
 
+    it 'is initialized from last known global config' do
+      WorkingHours::Config.holidays = [Date.today]
+      Thread.new {
+        expect(WorkingHours::Config.holidays).to eq [Date.today]
+      }.join
+    end
+
     describe 'validation' do
       it 'rejects types that cannot be converted into an array' do
         expect {
@@ -178,6 +192,13 @@ describe WorkingHours::Config do
       expect(config).to eq(ActiveSupport::TimeZone['Tokyo'])
     end
 
+    it 'is initialized from last known global config' do
+      WorkingHours::Config.time_zone = ActiveSupport::TimeZone['Tokyo']
+      Thread.new {
+        expect(WorkingHours::Config.time_zone).to eq ActiveSupport::TimeZone['Tokyo']
+      }.join
+    end
+
     it "recomputes precompiled when modified" do
       expect {
         WorkingHours::Config.time_zone.instance_variable_set(:@name, 'Bordeaux')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-03 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.4.6
+rubygems_version: 2.2.2
 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: