sync-defer 0.9.0 → 0.9.1

data/CHANGES.md

@@ -1,5 +1,14 @@
 # CHANGES
 
+## sync-defer 0.9.1 -- 2012-02-25
+
+* Added a generic interface which would pick the underneath reactor
+  automatically. `SyncDefer.defer{ sleep(10) }`
+
+* Added multi-defer:
+  `SyncDefer.defer(lambda{ sleep(10) }, lambda{ sleep(5) })`
+  which return the values inside an array according to the index.
+
 ## sync-defer 0.9.0 -- 2012-02-24
 
 * Birthday!

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 gem 'rake'
 gem 'bacon'
+gem 'rr'
 
 gem 'eventmachine'
 gem 'cool.io', :platforms => 'ruby'

data/README.md

@@ -14,7 +14,8 @@ Synchronous deferred operations with fibers (coroutines)
 
 ## REQUIREMENTS:
 
-Either cool.io or eventmachine
+* Either cool.io or eventmachine
+* Ruby 1.9+ (or if fibers could be used in Ruby 1.8)
 
 ## INSTALLATION:
 
@@ -24,26 +25,31 @@ Either cool.io or eventmachine
 
 Remember to wrap a fiber around the client, and inside the client:
 
-### with cool.io:
+### Generic interface which would select underneath reactor automatically:
 
-    Coolio::SyncDefer{
-      sleep(10) # any CPU-bound operations
-    }
+    # Single computation:
+    puts(SyncDefer.defer{
+                           sleep(10) # any CPU-bound operations
+                           100})     # 100
     puts "DONE"
 
-### with eventmachine:
-
-    EventMachine::SyncDefer{
-      sleep(10) # any CPU-bound operations
-    }
+    # Multiple computations:
+    puts(SyncDefer.defer(lambda{
+                           sleep(10) # any CPU-bound operations
+                           100
+                         },
+                         lambda{
+                           sleep(5)  # any CPU-bound operations
+                           50}))     # [100, 50] # it would match the index
     puts "DONE"
 
-Full examples:
+Full examples with reactor turned on:
 
 ### with cool.io:
 
     Fiber.new{
-      Coolio::SyncDefer.defer{ sleep(10) } # any CPU-bound operations
+      # or Coolio::SyncDefer
+      SyncDefer.defer{ sleep(10) }
       puts "DONE"
     }.resume
     Coolio::Loop.default.run
@@ -52,7 +58,8 @@ Full examples:
 
     EM.run{
       Fiber.new{
-        EM::SyncDefer.defer{ sleep(10) } # any CPU-bound operations
+        # or EM::SyncDefer
+        SyncDefer.defer{ sleep(10) }
         puts "DONE"
         EM.stop
       }.resume

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.0'
+    s.version = '0.9.1'
 
     %w[].each{ |g| s.add_runtime_dependency(g) }
   end

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

@@ -2,26 +2,74 @@
 require 'fiber'
 require 'cool.io'
 
-class Coolio::SyncDefer < Coolio::AsyncWatcher
-  def self.defer loop=Coolio::Loop.default, &block
-    new(loop, &block).result
+module Coolio::SyncDefer
+  module_function
+  def defer *args, &block
+    loop  = args.find  { |a| a.kind_of?(Coolio::Loop) }||Coolio::Loop.default
+    funcs = args.reject{ |a| a.kind_of?(Coolio::Loop) }
+    funcs << block if block_given?
+    if funcs.size == 1
+      DeferOne.new(funcs.first, loop).result
+    else
+      DeferMulti.new(funcs, loop).result
+    end
   end
 
-  attr_reader :result
-
-  def initialize loop=Coolio::Loop.default
-    super()
-    @fiber = Fiber.current
-    attach(loop)
-    Thread.new{
-      @result = yield
-      signal
-    }
-    Fiber.yield
+  class Defer < Coolio::AsyncWatcher
+    attr_reader :result
+    def initialize loop=Coolio::Loop.default
+      super()
+      self.fiber = Fiber.current
+      attach(loop)
+      yield
+      Fiber.yield
+    end
+
+    protected
+    attr_accessor :fiber
+    attr_writer   :result
+    def on_signal
+      detach
+      fiber.resume(result)
+    end
+  end
+
+  class DeferOne < Defer
+    def initialize func=lambda{}, loop=Coolio::Loop.default
+      super(loop){ defer(func) }
+    end
+
+    protected
+    def defer func
+      Thread.new{
+        self.result = func.call
+        signal
+      }
+    end
   end
 
-  def on_signal
-    detach
-    @fiber.resume(result)
+  class DeferMulti < Defer
+    def initialize funcs=[lambda{}], loop=Coolio::Loop.default
+      super(loop){ defer(funcs) }
+    end
+
+    protected
+    attr_accessor :values, :target
+    def defer funcs
+      self.values = {}
+      self.target = funcs.size
+      funcs.each.with_index do |func, index|
+        Thread.new{
+          values[index] = func.call
+          signal
+        }
+      end
+    end
+
+    def on_signal
+      return if values.size != target
+      self.result = values.sort.map(&:last)
+      super
+    end
   end
 end

data/lib/eventmachine/sync-defer.rb

@@ -4,10 +4,31 @@ require 'eventmachine'
 
 module EventMachine::SyncDefer
   module_function
-  def defer &block
+  def defer *funcs, &block
     fiber = Fiber.current
-    EventMachine.defer(lambda{ yield },
-                       lambda{ |result| fiber.resume(result)})
+    funcs << block if block_given?
+    if funcs.size == 1
+      defer_one(fiber, funcs.first)
+    else
+      defer_multi(fiber, funcs)
+    end
     Fiber.yield
   end
+
+  def defer_one fiber, func
+    EventMachine.defer(lambda{ func.call },
+                       lambda{ |result| fiber.resume(result)})
+  end
+
+  def defer_multi fiber, funcs
+    results = {}
+    funcs.each.with_index do |func, index|
+      EventMachine.defer(
+        lambda{ func.call },
+        lambda{ |result|
+          results[index] = result
+          fiber.resume(results.sort.map(&:last)) if results.size == funcs.size
+        })
+    end
+  end
 end

data/lib/sync-defer.rb

@@ -0,0 +1,23 @@
+
+begin
+  require 'eventmachine/sync-defer'
+rescue LoadError
+end
+
+begin
+  require 'cool.io/sync-defer'
+rescue LoadError
+end
+
+module SyncDefer
+  module_function
+  def defer *args, &block
+    if Object.const_defined?(:EventMachine)
+      EventMachine::SyncDefer.defer(*args, &block)
+    elsif Object.const_defined?(:Coolio)
+      Coolio::SyncDefer.defer(*args, &block)
+    else
+      raise "No reactor found. Only cool.io and eventmachine are supported."
+    end
+  end
+end

data/sync-defer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sync-defer"
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   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-24"
+  s.date = "2012-02-25"
   s.description = "Synchronous deferred operations with fibers (coroutines)"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   "Rakefile",
   "lib/cool.io/sync-defer.rb",
   "lib/eventmachine/sync-defer.rb",
+  "lib/sync-defer.rb",
   "sync-defer.gemspec",
   "task/.gitignore",
   "task/gemgem.rb",

data/test/test_sync-defer.rb

@@ -1,18 +1,46 @@
 
 require 'fiber'
 require 'bacon'
+require 'rr'
+
+include RR::Adapters::RRMethods
+
+require 'sync-defer'
 
 begin
   require 'cool.io/sync-defer'
-  describe Coolio::SyncDefer do
-    should 'work' do
-      result = []
-      Fiber.new{
-        result << Coolio::SyncDefer.defer{ sleep 0.1; result << 0; 1 }
-        result << 2
-      }.resume
-      Coolio::Loop.default.run
-      result.should.eql [0, 1, 2]
+  [Coolio::SyncDefer, SyncDefer].each do |defer|
+    describe defer do
+      before do
+        stub(Object).const_defined?(:EventMachine){ false }
+        stub(Object).const_defined?(:Coolio)      { true  }
+      end
+
+      after do
+        RR.verify
+      end
+
+      should 'defer_one' do
+        result = []
+        Fiber.new{
+          result << defer.defer{ sleep 0.1; result << 0; 1 }
+          result << defer.defer(lambda{ 2 })
+          result << 3
+        }.resume
+        Coolio::Loop.default.run
+        result.should.eql [0, 1, 2, 3]
+      end
+
+      should 'defer_multi' do
+        result = []
+          Fiber.new{
+            result.concat(defer.defer(lambda{ sleep 0.1; 1 },
+                                      lambda{ result << 0; 2 }))
+            result << 3
+          }.resume
+        Coolio::Loop.default.run
+        result.should.eql [0, 1, 2, 3]
+      end
     end
   end
 rescue LoadError => e
@@ -21,17 +49,41 @@ end
 
 begin
   require 'eventmachine/sync-defer'
-  describe EventMachine::SyncDefer do
-    should 'work' do
-      result = []
-      EM.run{
-        Fiber.new{
-          result << EM::SyncDefer.defer{ sleep 0.1; result << 0; 1 }
-          result << 2
-          EM.stop
-        }.resume
-      }
-      result.should.eql [0, 1, 2]
+  [EventMachine::SyncDefer, SyncDefer].each do |defer|
+    describe defer do
+      before do
+        stub(Object).const_defined?(:EventMachine){ true }
+      end
+
+      after do
+        RR.verify
+      end
+
+      should 'defer_one' do
+        result = []
+        EM.run{
+          Fiber.new{
+            result << defer.defer{ sleep(0.1); result << 0; 1 }
+            result << defer.defer(lambda{ 2 })
+            result << 3
+            EM.stop
+          }.resume
+        }
+        result.inspect.should == [0, 1, 2, 3].inspect
+      end
+
+      should 'defer_multi' do
+        result = []
+        EM.run{
+          Fiber.new{
+            result.concat(defer.defer(lambda{ sleep(0.1); 1 },
+                                      lambda{ result << 0; 2 }))
+            result << 3
+            EM.stop
+          }.resume
+        }
+        result.inspect.should == [0, 1, 2, 3].inspect
+      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.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies: []
 description: Synchronous deferred operations with fibers (coroutines)
 email:
@@ -28,6 +28,7 @@ files:
 - Rakefile
 - lib/cool.io/sync-defer.rb
 - lib/eventmachine/sync-defer.rb
+- lib/sync-defer.rb
 - sync-defer.gemspec
 - task/.gitignore
 - task/gemgem.rb