ione 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e616ec4a5f533a25efb171aa4e6ede4b1ca5de6f
-  data.tar.gz: 433284b5a259cb2db15f8ac95882d13d1e63507a
+  metadata.gz: 941fc3fd59d15b806854ddd8ff0f30f645ff51bf
+  data.tar.gz: 1b89b672b8b69eda9561138190aed7d35d677538
 SHA512:
-  metadata.gz: f80b6f25ac0192d10eac99cc8e2dd15b373944bb89e3125f378ff17df4a7a07caf0f35955e5772b322911560a8dff3cc42704c4c25dc67c952cd8c15269e5c8b
-  data.tar.gz: 885562d9eb7bb0cd1e6499a0b975fb2d82dee2298918fef4887ca66b5b9d4959c4bdacdd8c2aa2deb2a8e0f44187017dcc44dd9b801a5432bf0888caa720cac9
+  metadata.gz: f26209edcf366c70ac80a913901f4c6db5a7a15e2e4a9c53e0d73f99b9d1e25e98bd4f0533dc4e88d3ec846abd538b6f80cb9d877ae547091a363121d1a05992
+  data.tar.gz: 6c5565772dd3994caac71ffd2a63cf25f2c595161eeb501928050123c59b5579cf1d5a45ac4a0e585ca15fd9c82b9c7f1253135c2e6f74cf0e9569a89e66d1dc

data/lib/ione/future.rb

@@ -226,7 +226,7 @@ module Ione
       # @param [Array<Ione::Future>] futures the futures to combine (this argument
       #   can be a splatted array or a regular array passed as sole argument)
       # @return [Ione::Future] with a nil value once all futures have succeeded
-      # @since v1.3.0
+      # @since v1.2.1
       def after(*futures)
         if futures.size == 1 && (fs = futures.first).is_a?(Enumerable)
           *futures = *fs
@@ -850,7 +850,19 @@ module Ione
         @futures = nil
         resolve
       else
-        @futures.pop.on_complete(&method(:await_next))
+        outer = Thread.current
+        looping = more = true
+        while more
+          more = false
+          @futures.pop.on_complete do |v, e|
+            if e || @futures.empty? || !looping || !Thread.current.equal?(outer)
+              await_next(v, e)
+            else
+              more = true
+            end
+          end
+        end
+        looping = false
       end
     end
   end

data/lib/ione/io/base_connection.rb

@@ -145,6 +145,7 @@ module Ione
 
       # @private
       def flush
+        should_close = false
         if @state == CONNECTED_STATE || @state == DRAINING_STATE
           @lock.lock
           begin
@@ -154,11 +155,12 @@ module Ione
             end
             @writable = !@write_buffer.empty?
             if @state == DRAINING_STATE && !@writable
-              close
+              should_close = true
             end
           ensure
             @lock.unlock
           end
+          close if should_close
         end
       rescue => e
         close(e)

data/lib/ione/io/io_reactor.rb

@@ -153,20 +153,23 @@ module Ione
         end
         Thread.start do
           @started_promise.fulfill(self)
+          error = nil
           begin
             while @state == RUNNING_STATE
               @io_loop.tick
               @scheduler.tick
             end
+          rescue => e
+            error = e
           ensure
             begin
               @io_loop.close_sockets
               @scheduler.cancel_timers
               @unblocker = nil
             ensure
-              if $!
+              if error
                 @state = CRASHED_STATE
-                @stopped_promise.fail($!)
+                @stopped_promise.fail(error)
               else
                 @state = STOPPED_STATE
                 @stopped_promise.fulfill(self)

data/lib/ione/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Ione
-  VERSION = '1.2.1'.freeze
-end
+  VERSION = '1.2.2'.freeze
+end

data/spec/ione/future_spec.rb

@@ -1047,6 +1047,12 @@ module Ione
           future = Future.after(ff1, ff2, ff3)
           future.value.should be_nil
         end
+
+        it 'handles a really long list of futures' do
+          futures = Array.new(10000, Future.resolved)
+          future = Future.after(futures)
+          future.value.should be_nil
+        end
       end
     end
 

data/spec/ione/io/connection_common.rb

@@ -90,6 +90,13 @@ shared_examples_for 'a connection' do |options|
       handler.flush
       f.should be_completed
     end
+
+    it 'does not attempt to acquire the lock multiple times from the same thread' do
+      handler.write('hello world')
+      f = handler.drain
+      handler.flush
+      expect { f.value }.to_not raise_error
+    end
   end
 
   describe '#write/#flush' do

metadata

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