sync-defer 0.9.3 → 0.9.4

data/CHANGES.md

@@ -1,5 +1,14 @@
 # CHANGES
 
+## sync-defer 0.9.4 -- 2012-03-21
+
+* Fixed a bug that where there's an exception in multiple computations,
+  the fiber should not be resumed twice or more times. This bug is caught
+  by JRuby.
+
+* `SyncDefer.defer` should also return only one value if there's only one
+  computation.
+
 ## sync-defer 0.9.3 -- 2012-03-20
 
 * Also work without a reactor in the generic interface: `SyncDefer.defer`,

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

data/lib/eventmachine/sync-defer.rb

@@ -45,11 +45,11 @@ module EventMachine::SyncDefer
         },
         lambda{ |result|
           if exception
-            fiber.resume(nil, exception)
+            fiber.resume(nil, exception) if fiber.alive?
           else
             results[index] = result
             fiber.resume(results.sort.map(&:last), nil) if
-              results.size == funcs.size
+              results.size == funcs.size && fiber.alive?
           end
         })
     end

data/lib/sync-defer.rb

@@ -22,7 +22,11 @@ module SyncDefer
                    "Only cool.io and eventmachine are supported.")
       $stderr.puts("           Called from: #{caller.last(5).inspect}")
       args << block if block_given?
-      args.map(&:call)
+      if args.size == 1
+        args.first.call
+      else
+        args.map(&:call)
+      end
     end
   end
 end

data/sync-defer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sync-defer"
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-03-20"
+  s.date = "2012-03-21"
   s.description = "Synchronous deferred operations with fibers (coroutines)"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [

data/test/test_sync-defer.rb

@@ -94,7 +94,7 @@ begin
             EM.stop
           }.resume
         }
-        result.inspect.should == [0, 1, 2, 3].inspect
+        result.inspect.should.eql [0, 1, 2, 3].inspect
       end
 
       should 'defer_multi' do
@@ -107,7 +107,7 @@ begin
             EM.stop
           }.resume
         }
-        result.inspect.should == [0, 1, 2, 3].inspect
+        result.inspect.should.eql [0, 1, 2, 3].inspect
       end
 
       should 'raise the exception' do
@@ -141,3 +141,20 @@ begin
 rescue LoadError => e
   puts "eventmachine is not installed, skipping: #{e}"
 end
+
+describe SyncDefer do
+  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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sync-defer
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies: []
 description: Synchronous deferred operations with fibers (coroutines)
 email: