abstractivator 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54f3b2d12bb7c97e29e93c119a4765d096bd67d8
-  data.tar.gz: 0b51547e1f0d6dd51d166094aa1fc49e86f3d9be
+  metadata.gz: 26f878ae4109bef8680cc85a6b0d903b97778871
+  data.tar.gz: ce8833f063703cdba55a4c7367cc66143f19c622
 SHA512:
-  metadata.gz: 7ef0efeda3115b72e4e5c68050f01ed5da7b28771be78177aa8069c27eb0151583e6fc1d59356165797a7150a7dd98fd95eb8b768a27df1e9a02669c11ecad50
-  data.tar.gz: 2cd2fd65d5d5da79a16bcace335f1ea136a43bea38e69a5a51656486c0a3663536b5a2db8000d766fed4336b1d97974024fac19fbd410c109080a7b1850d1766
+  metadata.gz: d45dc88be70f404b5449d61cc8684bf2b45c2deb2a07503d5586d75a1ab3295b15fde8fc5c2e180a266f1e7602832c82b2e409d94b8270b5b1d1b32445eafc30
+  data.tar.gz: 96b27bef0776b6c25c5ea7bc0c1aff4f0801439e53f866938e6c4e02db8e14efda2f7bc2203352066b75b2c9a17a493d8e6cdd227c7909df702245beb8b30a1b

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/lib/abstractivator/fiber_defer.rb

@@ -98,6 +98,12 @@ module Abstractivator
       safe_action = proc do
         begin
           [action.call, nil]
+        rescue SignalException => e
+          # The thread has been instructed to shut down, so let it.
+          # Don't pass on the exception to another thread/fiber.
+          # We will assume whatever is shutting down the thread will
+          # also account for the paused fiber on its own.
+          raise
         rescue Exception => e
           [nil, e]
         end

data/lib/abstractivator/version.rb

@@ -1,3 +1,3 @@
 module Abstractivator
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/spec/lib/abstractivator/fiber_defer_spec.rb

@@ -40,7 +40,7 @@ describe Abstractivator::FiberDefer do
       it 'propagates the thread/fiber-local variables into the block' do
         EM.run do
           guard = {
-            Thread.current[:meaning] => proc { |x| Thread.current[:meaning] = x }
+              Thread.current[:meaning] => proc { |x| Thread.current[:meaning] = x }
           }
           with_fiber_defer(guard) do
             expect(Thread.current[:meaning]).to eql 42
@@ -123,6 +123,34 @@ describe Abstractivator::FiberDefer do
         end
       end
     end
+    it 'terminates the worker thread on SignalError' do
+      EM.run do
+        with_fiber_defer do
+          worker_thread = nil
+          f = Fiber.current
+          fiber_defer do
+            worker_thread = Thread.current
+            worker_thread.abort_on_exception = false # don't immediately exit() the main thread when we raise
+            EM.next_tick { f.resume([nil, nil]) } # allow fiber_defer to return when control returns to the event loop on the main thread
+            raise SignalException.new('TERM')
+          end
+          expect { worker_thread.join(1) }.to raise_error SignalException # join raises when Thread#abort_on_exception is false
+          expect(worker_thread.alive?).to be_falsey
+          EM.threadpool.clear # otherwise, EM will try to re-join these during its cleanup, crash, and leave the EM singleton in a bad state for future tests
+          EM.stop
+        end
+      end
+    end
+    it 'does not terminate the worker thread on non-SignalErrors' do
+      EM.run do
+        with_fiber_defer do
+          worker_thread = nil
+          expect{fiber_defer{ worker_thread = Thread.current; raise 'oops' }}.to raise_error 'oops'
+          expect(worker_thread.alive?).to be_truthy
+          EM.stop
+        end
+      end
+    end
     it 'works with simultaneous deferred actions' do
       EM.run do
         log = []
@@ -205,15 +233,15 @@ describe Abstractivator::FiberDefer do
         it 'applies the inherited guard and then the local guard upon entering and exiting the block' do
           EM.run do
             guard1 = {
-              Thread.current[:a] => proc {|x| Thread.current[:a] = x},
-              Thread.current[:b] => proc {|x| Thread.current[:b] = x}
+                Thread.current[:a] => proc {|x| Thread.current[:a] = x},
+                Thread.current[:b] => proc {|x| Thread.current[:b] = x}
             }
             with_fiber_defer(guard1) do
               Thread.current[:b] = 22
               Thread.current[:c] = 33
               guard2 = {
-                Thread.current[:b] => proc {|x| Thread.current[:b] = x},
-                Thread.current[:c] => proc {|x| Thread.current[:c] = x}
+                  Thread.current[:b] => proc {|x| Thread.current[:b] = x},
+                  Thread.current[:c] => proc {|x| Thread.current[:c] = x}
               }
               fiber_defer(guard2) do
                 expect(Thread.current[:a]).to eql 1

data/spec/lib/abstractivator/lazy_spec.rb

@@ -29,7 +29,7 @@ describe Abstractivator::Lazy do
     expect(lazy { 42 } != 42).to be false
     expect(lazy { 42 } != 99).to be true
     expect(lazy { 42 } === 42).to be true
-    expect(Fixnum === lazy { 42 }).to be true
+    expect(Integer === lazy { 42 }).to be true
     expect(Array === lazy { 42 }).to be false
     expect(!(lazy { true })).to be false
     expect(!(lazy { false })).to be true
@@ -54,7 +54,7 @@ describe Abstractivator::Lazy do
     it 'reveals the value type if the value has already been forced' do
       value = lazy { 42 }
       value.to_s
-      expect(value.inspect).to match /#<Abstractivator::Lazy:Fixnum:0x[0-9a-f]+>/
+      expect(value.inspect).to match /#<Abstractivator::Lazy:Integer:0x[0-9a-f]+>/
     end
   end
 

data/spec/lib/abstractivator/trees/tree_map_spec.rb

@@ -118,7 +118,7 @@ describe Abstractivator::Trees do
         expect(call_count).to eql 2
       end
       it 'raises an error is the value is not an array' do
-        expect{transform_one_path({a: 1}, 'a[]') { |x| x }}.to raise_error 'Expected an array but got Fixnum: 1'
+        expect{transform_one_path({a: 1}, 'a[]') { |x| x }}.to raise_error 'Expected an array but got Integer: 1'
         expect{transform_one_path({a: {b: 1}}, 'a[]') { |x| x }}.to raise_error 'Expected an array but got Hash: {:b=>1}'
       end
     end
@@ -140,7 +140,7 @@ describe Abstractivator::Trees do
         expect(call_count).to eql 2
       end
       it 'raises an error is the value is not a hash' do
-        expect{transform_one_path({a: 1}, 'a{}') { |x| x }}.to raise_error 'Expected a hash but got Fixnum: 1'
+        expect{transform_one_path({a: 1}, 'a{}') { |x| x }}.to raise_error 'Expected a hash but got Integer: 1'
         expect{transform_one_path({a: [1, 2]}, 'a{}') { |x| x }}.to raise_error 'Expected a hash but got Array: [1, 2]'
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractivator
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Utilities
@@ -212,4 +213,3 @@ test_files:
 - spec/lib/abstractivator/value_map_spec.rb
 - spec/lib/enumerable_ext_spec.rb
 - spec/lib/exception_ext_spec.rb
-has_rdoc: