ione 1.2.0.pre0 → 1.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ae6f32b5b3e404b07f6ec0a0b20856a0458719
-  data.tar.gz: 6a1e98dcd2cb657b2cbbe7dcc29514e38c672608
+  metadata.gz: 48f64612b814b95e3c12619aad2ad8da60d00f7b
+  data.tar.gz: 6094996f6fedbe6449c0033cae40ccc19cafe46c
 SHA512:
-  metadata.gz: b57e6559e0be8dca588b6f4b7d1cf069041848d368de377ad0c4db94f4863c0d0194d66843190fc18f1de2c92a0465429d32773d4994c8aee405a584aa167544
-  data.tar.gz: 8a30c9516df0d52376ebda8958446fdb35d4fb9adbe4028d180afb438f31061bb77ede9ecebde1e7a640ba19364a2a2a35acc691288585de35e2ea64453d5526
+  metadata.gz: 00e1194cf9716e8f5030b634f21740d622c96862682a0427266dd76fa453290ed60460b2fdae08f9165d28df12bbfa3ca24de2d03043935c3407335a5e85afd5
+  data.tar.gz: 9dda73caa92ee3a8f5853f3edf81496082e9c748663295b2f6f5c1f6c5a21f324d54d8e921a3afb4ec580e8253b0d1c5e24ecf2985a7684a10a962b926f25612

data/lib/ione/future.rb

@@ -395,56 +395,14 @@ module Ione
   end
 
   module FutureCallbacks
-    # Registers a listener that will be called when this future completes,
-    # i.e. resolves or fails. The listener will be called with the future as
-    # solve argument
-    #
-    # @yieldparam [Ione::Future] future the future
-    def on_complete(&listener)
-      run_immediately = false
-      if @state != :pending
-        run_immediately = true
-      else
-        @lock.lock
-        begin
-          if @state == :pending
-            @complete_listeners << listener
-          else
-            run_immediately = true
-          end
-        ensure
-          @lock.unlock
-        end
-      end
-      if run_immediately
-        listener.call(self, @value, @error) rescue nil
-      end
-      nil
-    end
-
     # Registers a listener that will be called when this future becomes
     # resolved. The listener will be called with the value of the future as
     # sole argument.
     #
     # @yieldparam [Object] value the value of the resolved future
     def on_value(&listener)
-      run_immediately = false
-      if @state == :resolved
-        run_immediately = true
-      else
-        @lock.lock
-        begin
-          if @state == :pending
-            @value_listeners << listener
-          elsif @state == :resolved
-            run_immediately = true
-          end
-        ensure
-          @lock.unlock
-        end
-      end
-      if run_immediately
-        listener.call(value) rescue nil
+      on_complete do |f, value|
+        listener.call(value) if f.resolved?
       end
       nil
     end
@@ -455,23 +413,8 @@ module Ione
     #
     # @yieldparam [Error] error the error that failed the future
     def on_failure(&listener)
-      run_immediately = false
-      if @state == :failed
-        run_immediately = true
-      else
-        @lock.lock
-        begin
-          if @state == :pending
-            @failure_listeners << listener
-          elsif @state == :failed
-            run_immediately = true
-          end
-        ensure
-          @lock.unlock
-        end
-      end
-      if run_immediately
-        listener.call(@error) rescue nil
+      on_complete do |f, _, error|
+        listener.call(error) if f.failed?
       end
       nil
     end
@@ -488,9 +431,34 @@ module Ione
     def initialize
       @lock = Mutex.new
       @state = :pending
-      @failure_listeners = []
-      @value_listeners = []
-      @complete_listeners = []
+      @listeners = []
+    end
+
+    # Registers a listener that will be called when this future completes,
+    # i.e. resolves or fails. The listener will be called with the future as
+    # solve argument
+    #
+    # @yieldparam [Ione::Future] future the future
+    def on_complete(&listener)
+      run_immediately = false
+      if @state != :pending
+        run_immediately = true
+      else
+        @lock.lock
+        begin
+          if @state == :pending
+            @listeners << listener
+          else
+            run_immediately = true
+          end
+        ensure
+          @lock.unlock
+        end
+      end
+      if run_immediately
+        listener.call(self, @value, @error) rescue nil
+      end
+      nil
     end
 
     # Returns the value of this future, blocking until it is available if
@@ -510,8 +478,7 @@ module Ione
         return @value if @state == :resolved
         semaphore = Queue.new
         u = proc { semaphore << :unblock }
-        @value_listeners << u
-        @failure_listeners << u
+        @listeners << u
       ensure
         @lock.unlock
       end
@@ -564,50 +531,36 @@ module Ione
   # @private
   class CompletableFuture < Future
     def resolve(v=nil)
-      value_listeners = nil
-      complete_listeners = nil
+      listeners = nil
       @lock.lock
       begin
         raise FutureError, 'Future already completed' unless @state == :pending
         @value = v
         @state = :resolved
-        value_listeners = @value_listeners
-        complete_listeners = @complete_listeners
-        @value_listeners = nil
-        @failure_listeners = nil
-        @complete_listeners = nil
+        listeners = @listeners
+        @listeners = nil
       ensure
         @lock.unlock
       end
-      value_listeners.each do |listener|
-        listener.call(v) rescue nil
-      end
-      complete_listeners.each do |listener|
+      listeners.each do |listener|
         listener.call(self, v, nil) rescue nil
       end
       nil
     end
 
     def fail(error)
-      failure_listeners = nil
-      complete_listeners = nil
+      listeners = nil
       @lock.lock
       begin
         raise FutureError, 'Future already completed' unless @state == :pending
         @error = error
         @state = :failed
-        failure_listeners = @failure_listeners
-        complete_listeners = @complete_listeners
-        @value_listeners = nil
-        @failure_listeners = nil
-        @complete_listeners = nil
+        listeners = @listeners
+        @listeners = nil
       ensure
         @lock.unlock
       end
-      failure_listeners.each do |listener|
-        listener.call(error) rescue nil
-      end
-      complete_listeners.each do |listener|
+      listeners.each do |listener|
         listener.call(self, nil, error) rescue nil
       end
       nil

data/lib/ione/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Ione
-  VERSION = '1.2.0.pre0'.freeze
+  VERSION = '1.2.0.pre1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre0
+  version: 1.2.0.pre1
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies: []
 description: Reactive programming framework for Ruby, painless evented IO, futures
   and an efficient byte buffer