ione 1.1.2 → 1.1.3.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8edb1b899493ad38350a6bfaed1c021157fcfbaf
-  data.tar.gz: 39710eb4eec6a84c7212a5c838dd3d7be2f3d1e8
+  metadata.gz: 683f88dbcc94dbca64fc620cbad845bfb7eb359e
+  data.tar.gz: eda5367f48dda6be7a53664dc219b39e71797634
 SHA512:
-  metadata.gz: c0482a3411e1aebd9776501b049004ecc7dc90b4803ca0fe793517abc96a0fdf0afca3e70504c6e20bb198c8868df1dcad82694cf341c274ce6faa2bada82289
-  data.tar.gz: 91804377c9d4b5d80a1f7aa679de5fa07fab046b7ee9145344c77d550d63ac7ca0d57cd4117db585c41cb69852312b21a0ffa93cf8021af0c1a6cb072d4b5bc5
+  metadata.gz: bdadd53947a7b24140b2d2a2dba5615a4251576af3114e6da458ec9c4d47b0be578d93d1f13f2bff774d49fbb85668430312d4fd4c0e4a211969b82ca24c38c9
+  data.tar.gz: d4d1dd59ae9d4300483c0b9e65084d905f80911d126ba1984f89537e4f53e2bfc7468c6bd7c45dc7fb4ef9c564046e654103e09367ce9349a5156835361deb19

data/lib/ione/future.rb

@@ -236,11 +236,18 @@ module Ione
     # @yieldparam [Ione::Future] future the future
     def on_complete(&listener)
       run_immediately = false
-      @lock.synchronize do
-        if @resolved || @failed
-          run_immediately = true
-        else
-          @complete_listeners << listener
+      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
@@ -256,11 +263,18 @@ module Ione
     # @yieldparam [Object] value the value of the resolved future
     def on_value(&listener)
       run_immediately = false
-      @lock.synchronize do
-        if @resolved
-          run_immediately = true
-        elsif !@failed
-          @value_listeners << listener
+      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
@@ -276,11 +290,18 @@ module Ione
     # @yieldparam [Error] error the error that failed the future
     def on_failure(&listener)
       run_immediately = false
-      @lock.synchronize do
-        if @failed
-          run_immediately = true
-        elsif !@resolved
-          @failure_listeners << listener
+      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
@@ -300,8 +321,7 @@ module Ione
 
     def initialize
       @lock = Mutex.new
-      @resolved = false
-      @failed = false
+      @state = :pending
       @failure_listeners = []
       @value_listeners = []
       @complete_listeners = []
@@ -315,19 +335,27 @@ module Ione
     #
     # @return [Object] the value of this future
     def value
+      raise @error if @state == :failed
+      return @value if @state == :resolved
       semaphore = nil
-      @lock.synchronize do
-        raise @error if @failed
-        return @value if @resolved
+      @lock.lock
+      begin
+        raise @error if @state == :failed
+        return @value if @state == :resolved
         semaphore = Queue.new
         u = proc { semaphore << :unblock }
         @value_listeners << u
         @failure_listeners << u
+      ensure
+        @lock.unlock
       end
       while true
-        @lock.synchronize do
-          raise @error if @failed
-          return @value if @resolved
+        @lock.lock
+        begin
+          raise @error if @state == :failed
+          return @value if @state == :resolved
+        ensure
+          @lock.unlock
         end
         semaphore.pop
       end
@@ -335,17 +363,35 @@ module Ione
 
     # Returns true if this future is resolved or failed
     def completed?
-      resolved? || failed?
+      return true unless @state == :pending
+      @lock.lock
+      begin
+        @state != :pending
+      ensure
+        @lock.unlock
+      end
     end
 
     # Returns true if this future is resolved
     def resolved?
-      @lock.synchronize { @resolved }
+      return @state == :resolved unless @state == :pending
+      @lock.lock
+      begin
+        @state == :resolved
+      ensure
+        @lock.unlock
+      end
     end
 
     # Returns true if this future has failed
     def failed?
-      @lock.synchronize { @failed }
+      return @state == :failed unless @state == :pending
+      @lock.lock
+      begin
+        @state == :failed
+      ensure
+        @lock.unlock
+      end
     end
   end
 
@@ -354,15 +400,18 @@ module Ione
     def resolve(v=nil)
       value_listeners = nil
       complete_listeners = nil
-      @lock.synchronize do
-        raise FutureError, 'Future already completed' if @resolved || @failed
-        @resolved = true
+      @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
+      ensure
+        @lock.unlock
       end
       value_listeners.each do |listener|
         listener.call(v) rescue nil
@@ -376,15 +425,18 @@ module Ione
     def fail(error)
       failure_listeners = nil
       complete_listeners = nil
-      @lock.synchronize do
-        raise FutureError, 'Future already completed' if @failed || @resolved
-        @failed = true
+      @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
+      ensure
+        @lock.unlock
       end
       failure_listeners.each do |listener|
         listener.call(error) rescue nil
@@ -404,9 +456,12 @@ module Ione
       remaining = futures.size
       futures.each_with_index do |f, i|
         f.on_value do |v|
-          @lock.synchronize do
+          @lock.lock
+          begin
             values[i] = v
             remaining -= 1
+          ensure
+            @lock.unlock
           end
           if remaining == 0
             resolve(values)
@@ -439,8 +494,7 @@ module Ione
   # @private
   class ResolvedFuture < Future
     def initialize(value=nil)
-      @resolved = true
-      @failed = false
+      @state = :resolved
       @value = value
       @error = nil
     end
@@ -478,8 +532,7 @@ module Ione
   # @private
   class FailedFuture < Future
     def initialize(error)
-      @resolved = false
-      @failed = true
+      @state = :failed
       @value = nil
       @error = error
     end

data/lib/ione/io/base_connection.rb

@@ -63,8 +63,11 @@ module Ione
 
       # @private
       def writable?
-        empty_buffer = @lock.synchronize do
-          @write_buffer.empty?
+        @lock.lock
+        begin
+          empty_buffer = @write_buffer.empty?
+        ensure
+          @lock.unlock
         end
         !(closed? || empty_buffer)
       end
@@ -113,12 +116,15 @@ module Ione
       # @param bytes [String, Ione::ByteBuffer] the data to write to the socket
       def write(bytes=nil)
         if @state == :connected || @state == :connecting
-          @lock.synchronize do
+          @lock.lock
+          begin
             if block_given?
               yield @write_buffer
             elsif bytes
               @write_buffer.append(bytes)
             end
+          ensure
+            @lock.unlock
           end
           @unblocker.unblock!
         end
@@ -127,7 +133,8 @@ module Ione
       # @private
       def flush
         if @state == :connected || @state == :draining
-          @lock.synchronize do
+          @lock.lock
+          begin
             unless @write_buffer.empty?
               bytes_written = @io.write_nonblock(@write_buffer.cheap_peek)
               @write_buffer.discard(bytes_written)
@@ -135,6 +142,8 @@ module Ione
             if @state == :draining && @write_buffer.empty?
               close
             end
+          ensure
+            @lock.unlock
           end
         end
       rescue => e

data/lib/ione/io/io_reactor.rb

@@ -224,9 +224,10 @@ module Ione
       end
 
       def unblock!
-        @lock.synchronize do
-          @in.write(PING_BYTE)
-        end
+        @lock.lock
+        @in.write(PING_BYTE)
+      ensure
+        @lock.unlock
       end
 
       def read
@@ -264,20 +265,22 @@ module Ione
       end
 
       def add_socket(socket)
-        @lock.synchronize do
-          sockets = @sockets.reject { |s| s.closed? }
-          sockets << socket
-          @sockets = sockets
-        end
+        @lock.lock
+        sockets = @sockets.reject { |s| s.closed? }
+        sockets << socket
+        @sockets = sockets
+      ensure
+        @lock.unlock
       end
 
       def schedule_timer(timeout, promise=Promise.new)
-        @lock.synchronize do
-          timers = @timers.reject { |pair| pair[1].nil? }
-          timers << [@clock.now + timeout, promise]
-          @timers = timers
-        end
+        @lock.lock
+        timers = @timers.reject { |pair| pair[1].nil? }
+        timers << [@clock.now + timeout, promise]
+        @timers = timers
         promise.future
+      ensure
+        @lock.unlock
       end
 
       def close_sockets

data/lib/ione/version.rb

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

data/spec/ione/future_spec.rb

@@ -148,6 +148,10 @@ module Ione
         promise.fail(StandardError.new('bork'))
         future.should be_completed
       end
+
+      it 'is false before the future has been resolved or failed' do
+        future.should_not be_completed
+      end
     end
 
     describe '#resolved?' do
@@ -165,6 +169,10 @@ module Ione
         promise.fail(StandardError.new('bork'))
         future.should_not be_resolved
       end
+
+      it 'is false before the future has been resolved or failed' do
+        future.should_not be_resolved
+      end
     end
 
     describe '#failed?' do
@@ -177,6 +185,10 @@ module Ione
         promise.fulfill
         future.should_not be_failed
       end
+
+      it 'is false before the future has been resolved or failed' do
+        future.should_not be_failed
+      end
     end
 
     describe '#on_complete' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3.pre0
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies: []
 description: Reactive programming framework for Ruby, painless evented IO, futures
   and an efficient byte buffer
@@ -56,9 +56,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1