fibre 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 633dd9a0b26627425b640e012e692379c06f561b
-  data.tar.gz: 5ab441c8bf6430561201b853188922658fd15cb1
+  metadata.gz: 6e65be0e8a0426467f29ea32e1066618aa3afc53
+  data.tar.gz: f25087d69f16860813085b08d67dc89c2a59e8e0
 SHA512:
-  metadata.gz: eabdca5d1648fb3d31c20497b02616cf63fefdf5c6dcb834935d1579355d01808550f6bbbd80d132f05b9dbef6da72d07559d29e8b839c4e549c5a39498e07cb
-  data.tar.gz: d3ede9823aa33c585841021b2e85c517bd5f7b9c24aa2ba10c8dba72097b4986a3e0d2bbbbf3eef9120e8a9049fd0b913d5830c7907587f910d01ef005752262
+  metadata.gz: 8d688ac79fa241e28c189acc1801024be53acd5f382de1a06b6ff21f9f288b81e5d639fc286a4e3b3a42fa7de08b8562cb17a6fb0e33af8af0e991b78b7ee899
+  data.tar.gz: a0e28623b90b75445a14840160f58cb9a8a91dbf47fd45a10faba53308346fbfebda688e76ae34d7f98c87adec7f5b5ee1e0b1abf56c494016f42832a4b9764d

data/lib/fibre/core_ext/fiber.rb

@@ -46,7 +46,7 @@ class Fiber
     end
   end
 
-  def leave(exception, message=nil) # deprecated
-    raise exception.new(message)
+  def leave(exception, message=nil)
+    resume exception.is_a?(Class) ? exception.new(message) : exception
   end
 end

data/lib/fibre/fiber_pool.rb

@@ -12,7 +12,7 @@ module Fibre
   using EventObject
 
   class FiberPool
-    events :before, :after
+    events :error, :before, :after
 
     # Initialize fibers pool
     def initialize(size)
@@ -33,8 +33,7 @@ module Fibre
 
       @pool.shift.tap do |fiber|
         @reserved[fiber.object_id] = spec
-        err = fiber.resume(spec)
-        raise Fibre::FiberError.new(err) if err.is_a?(Exception)
+        fiber.resume(spec)
       end
 
       self
@@ -60,7 +59,6 @@ module Fibre
       loop do
         raise "wrong spec in fiber block" unless spec.is_a?(Hash)
 
-        result = nil
         begin
           before!(spec)
           spec[:block].call# *Fiber.current.args
@@ -70,7 +68,11 @@ module Fibre
           # RangeError, FloatDomainError, RegexpError, RuntimeError, SecurityError, SystemCallError
           # SystemStackError, ThreadError, TypeError, ZeroDivisionError
         rescue StandardError => e
-          result = e
+          if error.empty?
+            raise Fibre::FiberError.new(e)
+          else
+            error!(e)
+          end
           # catch NoMemoryError, ScriptError, SignalException, SystemExit, fatal etc
           #rescue Exception
         end
@@ -80,7 +82,7 @@ module Fibre
           next
         end
 
-        spec = checkin(result)
+        spec = checkin
       end
     end
 
@@ -88,7 +90,7 @@ module Fibre
     def checkin(result=nil)
       @reserved.delete ::Fiber.current.object_id
       @pool.unshift ::Fiber.current
-      ::Fiber.yield result
+      ::Fiber.yield
     end
   end
 end

data/lib/fibre/version.rb

@@ -1,3 +1,3 @@
 module Fibre
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

data/spec/fibre_spec.rb

@@ -21,7 +21,7 @@ describe Fibre do
     expect(probe).to receive(:call)
     Fibre.pool.checkout(&probe)
   end
-=begin
+
   it "should rescue error in fiber" do
     expect(probe).to receive(:call)
     Fibre.pool.on(:error) do |error|
@@ -32,7 +32,7 @@ describe Fibre do
       raise
     end
   end
-=end
+
 
   it "should scope" do
     expect(probe).to receive(:call)
@@ -54,7 +54,7 @@ describe Fibre do
       end
     }.to raise_error
   end
-=begin
+
   it "should catch exception" do
     Fibre.pool.on :error do |error|
       # catch exception here
@@ -66,7 +66,7 @@ describe Fibre do
       end
     }.to_not raise_error
   end
-=end
+
   describe "in fiber specs" do
 
     around do |examples|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibre
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le