working_hours 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b53643f4f18edb7c63446575a16d2f670d658e
-  data.tar.gz: dff1cc9158cf632f559734fdf52b31b41b16d004
+  metadata.gz: f00a9f2b6cd9d293631464feb64a41d6c738b03f
+  data.tar.gz: c18fa540c8033e1d8c1f42cad501420f16c6c7d7
 SHA512:
-  metadata.gz: ffaa30b066b7fa1aca5627d26698b6fa54c4f594d7d5dc4a876be57ab065557d6bcd078ad2a3682d855804981e992979ed7c6b986ba9b8e1135850d2e4716ea2
-  data.tar.gz: 124cd2067fbb66250df7bf78451a0561d37b2b3a27ff91cfd8b85155af0e806193b20fb272065fd615ac85500b6539c1080ac93c2daed37e48e00d9ae2b8d346
+  metadata.gz: fb32d4257bb17d0c0dc5d7595e19f808ec76970d38bb46ab3b4bf0893ed3d05e9f1734db7f49ec09a89eb495bc21e45a98bd08ce40979edd89efbbfd039f8539
+  data.tar.gz: f9874b5d95e6b47846d194347de5e78c14fe56d95a36071a1215e016dfe9312c3a57f0343aabdb4a4280fc89900e100e5c5598975954683d32a08cb18cfd92bd

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Unreleased
 
-[Compare master with v1.1.3](https://github.com/intrepidd/working_hours/compare/v1.1.3...master)
+[Compare master with v1.1.4](https://github.com/intrepidd/working_hours/compare/v1.1.4...master)
+
+# v1.1.4
+* Fix thread safety - [#36](https://github.com/Intrepidd/working_hours/pull/36)
 
 # v1.1.3
 * Fixed warnings with Ruby 2.4.0+ - [#32](https://github.com/Intrepidd/working_hours/pull/32)

data/lib/working_hours/config.rb

@@ -89,7 +89,7 @@ module WorkingHours
       private
 
       def config
-        Thread.current[:working_hours] ||= global_config
+        Thread.current[:working_hours] ||= global_config.dup
       end
 
       def global_config

data/lib/working_hours/version.rb

@@ -1,3 +1,3 @@
 module WorkingHours
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/working_hours/config_spec.rb

@@ -5,25 +5,58 @@ 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' } } }
 
     it 'has a default config' do
       expect(config).to be_kind_of(Hash)
     end
 
     it 'is thread safe' do
+      expect(WorkingHours::Config.working_hours).to eq(config)
+
+      thread = Thread.new do
+        WorkingHours::Config.working_hours = config2
+        expect(WorkingHours::Config.working_hours).to eq(config2)
+        Thread.stop
+        expect(WorkingHours::Config.working_hours).to eq(config2)
+      end
+
+      expect {
+        sleep 0.1 # let the thread begin its execution
+      }.not_to change { WorkingHours::Config.working_hours }.from(config)
+
+      expect {
+        WorkingHours::Config.working_hours = config3
+      }.to change { WorkingHours::Config.working_hours }.from(config).to(config3)
+
       expect {
-        Thread.new {
-          WorkingHours::Config.working_hours = {:mon => {'08:00' => '14:00'}}
-        }.join
-      }.not_to change { WorkingHours::Config.working_hours }
+        thread.run
+        thread.join
+      }.not_to change { WorkingHours::Config.working_hours }.from(config3)
     end
 
     it 'is fiber safe' do
+      expect(WorkingHours::Config.working_hours).to eq(config)
+
+      fiber = Fiber.new do
+        WorkingHours::Config.working_hours = config2
+        expect(WorkingHours::Config.working_hours).to eq(config2)
+        Fiber.yield
+        expect(WorkingHours::Config.working_hours).to eq(config2)
+      end
+
+      expect {
+        fiber.resume
+      }.not_to change { WorkingHours::Config.working_hours }.from(config)
+
+      expect {
+        WorkingHours::Config.working_hours = config3
+      }.to change { WorkingHours::Config.working_hours }.from(config).to(config3)
+
       expect {
-        Fiber.new {
-          WorkingHours::Config.working_hours = {:mon => {'08:00' => '14:00'}}
-        }.resume
-      }.not_to change { WorkingHours::Config.working_hours }
+        fiber.resume
+      }.not_to change { WorkingHours::Config.working_hours }.from(config3)
     end
 
     it 'is initialized from last known global config' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2018-11-30 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.6.6
+rubygems_version: 2.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: