sync-defer 0.9.4 → 0.9.5

data/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## sync-defer 0.9.5 -- 2012-03-21
+
+* Also fall back whenever it's not wrapped inside a fiber.
+
 ## sync-defer 0.9.4 -- 2012-03-21
 
 * Fixed a bug that where there's an exception in multiple computations,

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

data/lib/sync-defer.rb

@@ -1,4 +1,6 @@
 
+require 'fiber'
+
 begin
   require 'eventmachine/sync-defer'
 rescue LoadError
@@ -10,23 +12,40 @@ rescue LoadError
 end
 
 module SyncDefer
+  # assume we would always require 'rest-core' in root fiber
+  RootFiber = Fiber.current
+
   module_function
   def defer *args, &block
-    if Object.const_defined?(:EventMachine) && EventMachine.reactor_running?
+    if root_fiber?
+      fallback("Not called inside a fiber.", *args, &block)
+
+    elsif Object.const_defined?(:EventMachine) &&
+          EventMachine.reactor_running?
       EventMachine::SyncDefer.defer(*args, &block)
+
     elsif Object.const_defined?(:Coolio) &&
           Coolio::Loop.default.has_active_watchers?
       Coolio::SyncDefer.defer(*args, &block)
+
+    else
+      fallback("No reactor found.", *args, block)
+    end
+  end
+
+  def root_fiber?
+    RootFiber == Fiber.current
+  end
+
+  def fallback message, *args, &block
+    $stderr.puts("SyncDefer: WARN: #{message}")
+    $stderr.puts("           Falling back to run the computation directly.")
+    $stderr.puts("           Called from: #{caller.last(5).inspect}")
+    args << block if block_given?
+    if args.size == 1
+      args.first.call
     else
-      $stderr.puts("SyncDefer: WARN: No reactor found. " \
-                   "Only cool.io and eventmachine are supported.")
-      $stderr.puts("           Called from: #{caller.last(5).inspect}")
-      args << block if block_given?
-      if args.size == 1
-        args.first.call
-      else
-        args.map(&:call)
-      end
+      args.map(&:call)
     end
   end
 end

data/sync-defer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sync-defer"
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]

data/test/test_sync-defer.rb

@@ -143,18 +143,27 @@ rescue LoadError => e
 end
 
 describe SyncDefer do
-  after do
-    RR.verify
-  end
+  before do mock($stderr).puts(is_a(String)).times(3) end
+  after  do RR.verify                                 end
 
   should 'also work without a reactor, but print a warning' do
-    mock($stderr).puts(is_a(String)).times(2)
     SyncDefer.defer{ 123 }.should.eql 123
   end
 
   should 'multiple computations' do
-    mock($stderr).puts(is_a(String)).times(2)
     SyncDefer.defer(lambda{1}, lambda{2}){ 3 }.
       inspect.should.eql [1, 2, 3].inspect
   end
+
+  should 'also fallback if there is no fibers in EM' do
+    EM.run{ SyncDefer.defer{ 1 }.should.eql 1; EM.stop }
+  end if Object.const_defined?(:EventMachine)
+
+  should 'also fallback if there is no fibers in Coolio' do
+    watcher = Coolio::AsyncWatcher.new.attach(Coolio::Loop.default)
+    watcher.on_signal{detach}
+    SyncDefer.defer{ 1 }.should.eql 1
+    watcher.signal
+    Coolio::Loop.default.run
+  end if Object.const_defined?(:Coolio)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sync-defer
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors: