ione 1.2.0.pre3 → 1.2.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cfb6a38285dd1cd80c9120ba6df4416a04607d4
-  data.tar.gz: 456d6419e88e0845dbd4b648c48acbb83ed3ad52
+  metadata.gz: b0d198d610290a10e580f755f216bbae8ccca0ab
+  data.tar.gz: ada926b95e4a03d55ffad99687ca9f468d1cdd1f
 SHA512:
-  metadata.gz: 7620752ee5ab3f1252acec253cd39747c4d15b5c5f1f635ce1ea271369ab76bfae2cef24769c7957d868528a8d86a0a976948c2c5e2b27e905f931cd9c4fe141
-  data.tar.gz: f45766a8c27a944d68121a062c142da08539b38277b51c280c849324817794aea002d37980e049169704479045847bc60d63741dc4ecbe5c5c2732ab36e2db24
+  metadata.gz: 85e98209e280e3fcd0ca52577ffde6fdbe337191af45830bf9b43d3ded0839aa3ef902267da22abb62f937a2d3321ca0abaf15cd66a0920dfe2a9dc3357d2f19
+  data.tar.gz: e5eac3de0c0024e20bad63f82a32a57973d50081df75bf789f7d76bfda413bb8a180bb5ae6919be3aff91c4fa809d8596bfa26a02b0f3bc995b023801cbf3133

data/lib/ione/future.rb

@@ -91,10 +91,14 @@ module Ione
     # @return [Ione::Future<Array>] an array of the values of the constituent
     #   futures
     def all(*futures)
-      return resolved([]) if futures.empty?
-      futures = futures.size == 1 && futures.first.is_a?(Enumerable) ? futures.first : futures
-      return futures.first.map { |v| [v] } if futures.is_a?(Array) && futures.size == 1
-      CombinedFuture.new(futures)
+      if futures.size == 1 && (fs = futures.first).is_a?(Enumerable)
+        futures = fs
+      end
+      if futures.count == 0
+        resolved([])
+      else
+        CombinedFuture.new(futures)
+      end
     end
 
     # Returns a future which will be resolved with the value of the first
@@ -741,7 +745,7 @@ module Ione
       true
     end
 
-    def resolvesd?
+    def resolved?
       true
     end
 

data/lib/ione/io/base_connection.rb

@@ -19,7 +19,10 @@ module Ione
       #
       # @return [true, false] returns false if the connection was already closed
       def close(cause=nil)
-        return false if @state == :closed
+        @lock.synchronize do
+          return false if @state == :closed
+          @state = :closed
+        end
         if @io
           begin
             @io.close
@@ -28,7 +31,6 @@ module Ione
             # nothing to do, the socket was most likely already closed
           end
         end
-        @state = :closed
         if cause && !cause.is_a?(IoError)
           cause = ConnectionClosedError.new(cause.message)
         end

data/lib/ione/io/ssl_connection.rb

@@ -45,7 +45,7 @@ module Ione
             new_data = @io.read_nonblock(2**16)
             @data_listener.call(new_data) if @data_listener
           end
-        rescue IO::WaitReadable
+        rescue IO::WaitReadable, IO::WaitWritable
           # no more data available
         rescue => e
           close(e)
@@ -59,6 +59,8 @@ module Ione
             @data_listener.call(new_data) if @data_listener
             read_size = @io.pending
           end
+        rescue IO::WaitReadable, IO::WaitWritable
+          # no more data available
         rescue => e
           close(e)
         end

data/lib/ione/version.rb

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

data/spec/ione/future_spec.rb

@@ -979,6 +979,14 @@ module Ione
           Future.all.value.should == []
         end
 
+        it 'completes with an empty list when an empty list is given' do
+          Future.all([]).value.should == []
+        end
+
+        it 'completes with an empty list when an empty enumerable is given' do
+          Future.all([].to_enum).value.should == []
+        end
+
         it 'completes with a list of one item when a single future is given' do
           f = Future.resolved(1)
           Future.all(f).value.should == [1]
@@ -1000,6 +1008,14 @@ module Ione
           f.value.should have(3).items
         end
 
+        it 'accepts an enumerable of one future' do
+          promises = [Promise.new]
+          futures = promises.map(&:future).to_enum
+          f = Future.all(futures)
+          promises.each(&:fulfill)
+          f.value.should have(1).item
+        end
+
         it 'accepts anything that implements #on_complete as futures' do
           ff1, ff2, ff3 = double, double, double
           ff1.stub(:on_complete) { |&listener| listener.call(1, nil) }

data/spec/ione/io/ssl_connection_spec.rb

@@ -153,6 +153,24 @@ module Ione
           end
         end
 
+        it 'does not close the socket when #read_nonblock raises IO::WaitWritable' do
+          error = OpenSSL::SSL::SSLError.new
+          error.extend(IO::WaitWritable) unless error.is_a?(IO::WaitWritable)
+          ssl_socket.stub(:read_nonblock).and_raise(error)
+          handler.connect
+          handler.read
+          ssl_socket.should_not have_received(:close)
+        end
+
+        it 'does not close the socket when #read_nonblock raises IO::WaitReadable' do
+          error = OpenSSL::SSL::SSLError.new
+          error.extend(IO::WaitReadable) unless error.is_a?(IO::WaitReadable)
+          ssl_socket.stub(:read_nonblock).and_raise(error)
+          handler.connect
+          handler.read
+          ssl_socket.should_not have_received(:close)
+        end
+
         it 'closes the connection when an error occurs' do
           ssl_socket.stub(:read_nonblock).and_raise('boork')
           handler.connect

metadata

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