sync-defer 0.9.1 → 0.9.2

data/CHANGES.md

@@ -1,5 +1,12 @@
 # CHANGES
 
+## sync-defer 0.9.2 -- 2012-03-20
+
+* Properly select the reactor.
+
+* Make it exception aware. If there's an exception raised in the
+  computation, sync-defer would resume back and raise that exception.
+
 ## sync-defer 0.9.1 -- 2012-02-25
 
 * Added a generic interface which would pick the underneath reactor

data/README.md

@@ -27,6 +27,7 @@ Remember to wrap a fiber around the client, and inside the client:
 
 ### Generic interface which would select underneath reactor automatically:
 
+``` ruby
     # Single computation:
     puts(SyncDefer.defer{
                            sleep(10) # any CPU-bound operations
@@ -42,20 +43,27 @@ Remember to wrap a fiber around the client, and inside the client:
                            sleep(5)  # any CPU-bound operations
                            50}))     # [100, 50] # it would match the index
     puts "DONE"
+```
 
 Full examples with reactor turned on:
 
 ### with cool.io:
 
+``` ruby
+    # only for adding at least one watcher in the loop
+    Coolio::TimerWatcher.new(1).attach(Coolio::Loop.default).on_timer{detach}
+
     Fiber.new{
       # or Coolio::SyncDefer
       SyncDefer.defer{ sleep(10) }
       puts "DONE"
     }.resume
     Coolio::Loop.default.run
+```
 
 ### with eventmachine:
 
+``` ruby
     EM.run{
       Fiber.new{
         # or EM::SyncDefer
@@ -64,6 +72,22 @@ Full examples with reactor turned on:
         EM.stop
       }.resume
     }
+```
+
+### No problems with exceptions, use them as normal:
+
+``` ruby
+    EM.run{
+      Fiber.new{
+        begin
+          SyncDefer.defer{ raise "BOOM" }
+        rescue => e
+          p e
+        end
+        EM.stop
+      }.resume
+    }
+```
 
 ## CONTRIBUTORS:
 

data/Rakefile

@@ -8,7 +8,7 @@ desc 'Generate gemspec'
 task 'gem:spec' do
   Gemgem.spec = Gemgem.create do |s|
     s.name    = 'sync-defer'
-    s.version = '0.9.1'
+    s.version = '0.9.2'
 
     %w[].each{ |g| s.add_runtime_dependency(g) }
   end

data/lib/cool.io/sync-defer.rb

@@ -22,15 +22,20 @@ module Coolio::SyncDefer
       self.fiber = Fiber.current
       attach(loop)
       yield
-      Fiber.yield
+      result, exception = Fiber.yield
+      if exception
+        raise exception
+      else
+        result
+      end
     end
 
     protected
-    attr_accessor :fiber
+    attr_accessor :fiber, :exception
     attr_writer   :result
     def on_signal
       detach
-      fiber.resume(result)
+      fiber.resume(result, exception)
     end
   end
 
@@ -42,7 +47,11 @@ module Coolio::SyncDefer
     protected
     def defer func
       Thread.new{
-        self.result = func.call
+        begin
+          self.result = func.call
+        rescue Exception => e
+          self.exception = e
+        end
         signal
       }
     end
@@ -60,13 +69,18 @@ module Coolio::SyncDefer
       self.target = funcs.size
       funcs.each.with_index do |func, index|
         Thread.new{
-          values[index] = func.call
+          begin
+            values[index] = func.call
+          rescue Exception => e
+            self.exception = e
+          end
           signal
         }
       end
     end
 
     def on_signal
+      return super if exception
       return if values.size != target
       self.result = values.sort.map(&:last)
       super

data/lib/eventmachine/sync-defer.rb

@@ -12,22 +12,45 @@ module EventMachine::SyncDefer
     else
       defer_multi(fiber, funcs)
     end
-    Fiber.yield
+    result, exception = Fiber.yield
+    if exception
+      raise exception
+    else
+      result
+    end
   end
 
   def defer_one fiber, func
-    EventMachine.defer(lambda{ func.call },
-                       lambda{ |result| fiber.resume(result)})
+    exception = nil
+    EventMachine.defer(lambda{
+                         begin
+                           func.call
+                         rescue Exception => e
+                           exception = e
+                         end
+                       },
+                       lambda{ |result| fiber.resume(result, exception)})
   end
 
   def defer_multi fiber, funcs
-    results = {}
+    results, exception = {}, nil
     funcs.each.with_index do |func, index|
       EventMachine.defer(
-        lambda{ func.call },
+        lambda{
+          begin
+            func.call
+          rescue Exception => e
+            exception = e
+          end
+        },
         lambda{ |result|
-          results[index] = result
-          fiber.resume(results.sort.map(&:last)) if results.size == funcs.size
+          if exception
+            fiber.resume(nil, exception)
+          else
+            results[index] = result
+            fiber.resume(results.sort.map(&:last), nil) if
+              results.size == funcs.size
+          end
         })
     end
   end

data/lib/sync-defer.rb

@@ -12,9 +12,10 @@ end
 module SyncDefer
   module_function
   def defer *args, &block
-    if Object.const_defined?(:EventMachine)
+    if Object.const_defined?(:EventMachine) && EventMachine.reactor_running?
       EventMachine::SyncDefer.defer(*args, &block)
-    elsif Object.const_defined?(:Coolio)
+    elsif Object.const_defined?(:Coolio) &&
+          Coolio::Loop.default.has_active_watchers?
       Coolio::SyncDefer.defer(*args, &block)
     else
       raise "No reactor found. Only cool.io and eventmachine are supported."

data/sync-defer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sync-defer"
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-02-25"
+  s.date = "2012-03-20"
   s.description = "Synchronous deferred operations with fibers (coroutines)"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   "test/test_sync-defer.rb"]
   s.homepage = "https://github.com/godfat/sync-defer"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.19"
   s.summary = "Synchronous deferred operations with fibers (coroutines)"
   s.test_files = ["test/test_sync-defer.rb"]
 

data/test/test_sync-defer.rb

@@ -7,6 +7,9 @@ include RR::Adapters::RRMethods
 
 require 'sync-defer'
 
+class TestException < Exception
+end
+
 begin
   require 'cool.io/sync-defer'
   [Coolio::SyncDefer, SyncDefer].each do |defer|
@@ -41,6 +44,28 @@ begin
         Coolio::Loop.default.run
         result.should.eql [0, 1, 2, 3]
       end
+
+      should 'raise the exception' do
+        Fiber.new{
+          lambda{
+            defer.defer{ raise TestException }
+          }.should.raise(TestException)
+        }.resume
+        Coolio::Loop.default.run
+      end
+
+      should 'one of them raise' do
+        Fiber.new{
+          lambda{
+            defer.defer(lambda{ raise TestException }, lambda{})
+          }.should.raise(TestException)
+
+          lambda{
+            defer.defer(lambda{}, lambda{ raise TestException })
+          }.should.raise(TestException)
+        }.resume
+        Coolio::Loop.default.run
+      end
     end
   end
 rescue LoadError => e
@@ -84,6 +109,33 @@ begin
         }
         result.inspect.should == [0, 1, 2, 3].inspect
       end
+
+      should 'raise the exception' do
+        EM.run{
+          Fiber.new{
+            lambda{
+              defer.defer{ raise TestException }
+            }.should.raise(TestException)
+            EM.stop
+          }.resume
+        }
+      end
+
+      should 'one of them raise' do
+        EM.run{
+          Fiber.new{
+            lambda{
+              defer.defer(lambda{ raise TestException }, lambda{})
+            }.should.raise(TestException)
+
+            lambda{
+              defer.defer(lambda{}, lambda{ raise TestException })
+            }.should.raise(TestException)
+
+            EM.stop
+          }.resume
+        }
+      end
     end
   end
 rescue LoadError => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sync-defer
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies: []
 description: Synchronous deferred operations with fibers (coroutines)
 email:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Synchronous deferred operations with fibers (coroutines)