ione 1.2.4 → 1.3.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 443070cc0eb7a65e30942699de1c6435af5b07e1
-  data.tar.gz: 50d81a6204f39103bcfbdadfdf4b5a764207ecf3
+  metadata.gz: 6374a6945473a540ef416dec0eaef9f2c5a23913
+  data.tar.gz: c4b5defcacf2770af407842ee88edc7f9e172a6b
 SHA512:
-  metadata.gz: 596feb59ad89022c6ef6150b3cd5fc6903965108a4f7c219f2fdef612c3e83f76ed7750516c6381b29c8bfea7ae987301859b17a62339f43abf79ed223cf1810
-  data.tar.gz: 1cae4a2e82976c0d5eda3ba67fd2bb59ef6bb5853ab645bdccc1e268587cab1a24cc7eca42aa076ac2b0bb4737a33c6a6590916c3dc3b83e2b51b28e3178bc38
+  metadata.gz: 72ee4392985a601b028b4e6aa170accff6e8e50c27fc2cb7674cb9b3dd5b29091e8f92b3b5e26a515f372036fcaf1727bb866e1e8165a0f9567fd1749be91bac
+  data.tar.gz: 231ee2abbb3d771d56d0fdab4c26b42f0684254b13056bf898dbce22d3ea2031e34aacc096a04dae6ee08a394ca880f03a362d7bbf9a96598becdbaaeec7e84c

data/lib/ione/future.rb

@@ -599,8 +599,6 @@ module Ione
       @lock = Mutex.new
       @state = PENDING_STATE
       @listeners = []
-      @value = nil
-      @error = nil
     end
 
     # Registers a listener that will be called when this future completes,
@@ -861,9 +859,9 @@ module Ione
         looping = more = true
         while more
           more = false
-          @futures.pop.on_complete do |value, error|
-            if error || @futures.empty? || !looping || !Thread.current.equal?(outer)
-              await_next(value, error)
+          @futures.pop.on_complete do |v, e|
+            if e || @futures.empty? || !looping || !Thread.current.equal?(outer)
+              await_next(v, e)
             else
               more = true
             end

data/lib/ione/io/acceptor.rb

@@ -22,7 +22,6 @@ module Ione
         @backlog = backlog
         @unblocker = unblocker
         @reactor = reactor
-        @io = nil
         @socket_impl = socket_impl || ServerSocket
         @accept_listeners = []
         @lock = Mutex.new
@@ -77,6 +76,9 @@ module Ione
         true
       end
 
+      # @private
+      alias_method :drain, :close
+
       # @private
       def to_io
         @io

data/lib/ione/io/base_connection.rb

@@ -15,12 +15,10 @@ module Ione
       def initialize(host, port, unblocker)
         @host = host
         @port = port
-        @io = nil
         @unblocker = unblocker
         @state = CONNECTING_STATE
         @writable = false
         @lock = Mutex.new
-        @data_listener = nil
         @write_buffer = ByteBuffer.new
         @closed_promise = Promise.new
       end
@@ -61,8 +59,24 @@ module Ione
       #   has closed
       # @since v1.1.0
       def drain
-        @state = DRAINING_STATE
-        close unless @writable
+        @lock.lock
+        begin
+          return if @state == DRAINING_STATE || @state == CLOSED_STATE
+          @state = DRAINING_STATE
+        ensure
+          @lock.unlock
+        end
+        if writable?
+          if @io.respond_to?(:close_read)
+            begin
+              @io.close_read
+            rescue SystemCallError, IOError
+              # nothing to do, the socket was most likely already closed
+            end
+          end
+        else
+          close
+        end
         @closed_promise.future
       end
 

data/lib/ione/io/connection.rb

@@ -14,7 +14,6 @@ module Ione
         @connection_timeout = connection_timeout
         @clock = clock
         @socket_impl = socket_impl
-        @addrinfos = nil
         @connected_promise = Promise.new
         on_closed(&method(:cleanup_on_close))
       end

data/lib/ione/io/io_reactor.rb

@@ -95,7 +95,6 @@ module Ione
         @clock = options[:clock] || Time
         @state = PENDING_STATE
         @error_listeners = []
-        @unblocker = nil
         @io_loop = IoLoopBody.new(@options)
         @scheduler = Scheduler.new
         @lock = Mutex.new
@@ -164,6 +163,11 @@ module Ione
             error = e
           ensure
             begin
+              begin
+                @io_loop.drain_sockets
+              rescue => ee
+                error ||= ee
+              end
               @io_loop.close_sockets
               @scheduler.cancel_timers
               @unblocker = nil
@@ -194,6 +198,7 @@ module Ione
             Future.resolved(self)
           elsif @state != STOPPED_STATE && @state != CRASHED_STATE
             @state = STOPPING_STATE
+            @unblocker.unblock
             @stopped_promise.future
           else
             @stopped_promise.future
@@ -423,6 +428,9 @@ module Ione
         @out = nil
       end
 
+      def drain
+      end
+
       def to_io
         @out
       end
@@ -468,6 +476,7 @@ module Ione
         @selector = options[:selector] || IO
         @clock = options[:clock] || Time
         @timeout = options[:tick_resolution] || 1
+        @drain_timeout = options[:drain_timeout] || 5
         @lock = Mutex.new
         @sockets = []
       end
@@ -487,6 +496,18 @@ module Ione
         end
       end
 
+      def drain_sockets
+        threshold = @clock.now + @drain_timeout
+        until @clock.now >= threshold || @sockets.none?(&:writable?)
+          @sockets.each(&:drain)
+          tick
+          @lock.synchronize { @sockets = @sockets.reject(&:closed?) }
+        end
+        if @clock.now >= threshold
+          raise ReactorError, sprintf('Socket drain timeout after %p s', @drain_timeout)
+        end
+      end
+
       def close_sockets
         @sockets.each do |s|
           begin
@@ -571,8 +592,8 @@ module Ione
         ensure
           @lock.unlock
         end
-        timers.each do |t|
-          t.fail(CancelledError.new)
+        timers.each do |timer|
+          timer.fail(CancelledError.new)
         end
         nil
       end
@@ -593,8 +614,8 @@ module Ione
             ensure
               @lock.unlock
             end
-            expired_timers.each do |t|
-              t.fulfill
+            expired_timers.each do |timer|
+              timer.fulfill
             end
           end
         end

data/lib/ione/io/ssl_connection.rb

@@ -12,7 +12,6 @@ module Ione
         @socket_impl = socket_impl
         @ssl_context = ssl_context
         @raw_io = io
-        @io = nil
         @connected_promise = Promise.new
         on_closed(&method(:cleanup_on_close))
       end

data/lib/ione/version.rb

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

data/spec/integration/io_spec.rb

@@ -37,7 +37,7 @@ describe 'An IO reactor' do
       fake_server.await_connects(1)
       fake_server.broadcast('hello world')
       await { protocol_handler.data.bytesize > 0 }
-      protocol_handler.data.should eq('hello world')
+      protocol_handler.data.should == 'hello world'
     end
 
     it 'receives data on multiple connections' do
@@ -45,7 +45,7 @@ describe 'An IO reactor' do
       fake_server.await_connects(10)
       fake_server.broadcast('hello world')
       await { protocol_handlers.all? { |c| c.data.bytesize > 0 } }
-      protocol_handlers.sample.data.should eq('hello world')
+      protocol_handlers.sample.data.should == 'hello world'
     end
   end
 
@@ -81,7 +81,7 @@ describe 'An IO reactor' do
       socket = TCPSocket.new(ENV['SERVER_HOST'], port)
       socket.puts('HELLO')
       result = socket.read(5)
-      result.should eq('HELLO')
+      result.should == 'HELLO'
       socket.close
     end
   end

data/spec/integration/ssl_spec.rb

@@ -49,7 +49,6 @@ describe 'SSL' do
     ssl_context = OpenSSL::SSL::SSLContext.new
     ssl_context.key = OpenSSL::PKey::RSA.new(ssl_key)
     ssl_context.cert = OpenSSL::X509::Certificate.new(ssl_cert)
-    ssl_context.tmp_dh_callback = proc { SslSpec::DH_PARAMS }
 
     f = io_reactor.start
     f = f.flat_map do
@@ -81,8 +80,8 @@ describe 'SSL' do
     end
     client.write('hello world')
     response_received.future.value
-    server_received_data.to_s.should eq('hello world')
-    client_received_data.to_s.should eq('dlrow olleh')
+    server_received_data.to_s.should == 'hello world'
+    client_received_data.to_s.should == 'dlrow olleh'
   end
 
   it 'fails to send a message when not using encryption' do
@@ -96,7 +95,3 @@ describe 'SSL' do
     client.should be_closed
   end
 end
-
-module SslSpec
-  DH_PARAMS = OpenSSL::PKey::DH.new(File.read(File.expand_path('../../resources/dh.pem', __FILE__)))
-end

data/spec/ione/byte_buffer_spec.rb

@@ -15,28 +15,28 @@ module Ione
       end
 
       it 'can be initialized with bytes' do
-        described_class.new('hello').length.should eq(5)
+        described_class.new('hello').length.should == 5
       end
     end
 
     describe '#length/#size/#bytesize' do
       it 'returns the number of bytes in the buffer' do
         buffer << 'foo'
-        buffer.length.should eq(3)
+        buffer.length.should == 3
       end
 
       it 'is zero initially' do
-        buffer.length.should eq(0)
+        buffer.length.should == 0
       end
 
       it 'is aliased as #size' do
         buffer << 'foo'
-        buffer.size.should eq(3)
+        buffer.size.should == 3
       end
 
       it 'is aliased as #bytesize' do
         buffer << 'foo'
-        buffer.bytesize.should eq(3)
+        buffer.bytesize.should == 3
       end
     end
 
@@ -67,19 +67,19 @@ module Ione
       end
 
       it 'stores its bytes as binary' do
-        buffer.append('hällö').length.should eq(7)
-        buffer.to_s.encoding.should eq(::Encoding::BINARY)
+        buffer.append('hällö').length.should == 7
+        buffer.to_s.encoding.should == ::Encoding::BINARY
       end
 
       it 'handles appending with multibyte strings' do
         buffer.append('hello')
         buffer.append('würld')
-        buffer.to_s.should eq('hellowürld'.force_encoding(::Encoding::BINARY))
+        buffer.to_s.should == 'hellowürld'.force_encoding(::Encoding::BINARY)
       end
 
       it 'handles appending with another byte buffer' do
         buffer.append('hello ').append(ByteBuffer.new('world'))
-        buffer.to_s.should eq('hello world')
+        buffer.to_s.should == 'hello world'
       end
     end
 
@@ -105,7 +105,7 @@ module Ione
         b2 = described_class.new
         b1.append('foo')
         b2.append('foo')
-        b1.should eq(b2)
+        b1.should == b2
       end
 
       it 'is equal to another buffer when both are empty' do
@@ -121,7 +121,7 @@ module Ione
         b2 = described_class.new
         b1.append('foo')
         b2.append('foo')
-        b1.hash.should eq(b2.hash)
+        b1.hash.should == b2.hash
       end
 
       it 'is not equal to the hash code of another buffer with other contents' do
@@ -135,26 +135,26 @@ module Ione
       it 'is equal to the hash code of another buffer when both are empty' do
         b1 = described_class.new
         b2 = described_class.new
-        b1.hash.should eq(b2.hash)
+        b1.hash.should == b2.hash
       end
     end
 
     describe '#to_s' do
       it 'returns the bytes' do
-        buffer.append('hello world').to_s.should eq('hello world')
+        buffer.append('hello world').to_s.should == 'hello world'
       end
     end
 
     describe '#to_str' do
       it 'returns the bytes' do
-        buffer.append('hello world').to_str.should eq('hello world')
+        buffer.append('hello world').to_str.should == 'hello world'
       end
     end
 
     describe '#inspect' do
       it 'returns the bytes wrapped in ByteBuffer(...)' do
         buffer.append("\xca\xfe")
-        buffer.inspect.should eq('#<Ione::ByteBuffer: "\xCA\xFE">')
+        buffer.inspect.should == '#<Ione::ByteBuffer: "\xCA\xFE">'
       end
     end
 
@@ -162,12 +162,12 @@ module Ione
       it 'discards the specified number of bytes from the front of the buffer' do
         buffer.append('hello world')
         buffer.discard(4)
-        buffer.should eq(ByteBuffer.new('o world'))
+        buffer.should == ByteBuffer.new('o world')
       end
 
       it 'returns the byte buffer' do
         buffer.append('hello world')
-        buffer.discard(4).should eq(ByteBuffer.new('o world'))
+        buffer.discard(4).should == ByteBuffer.new('o world')
       end
 
       it 'raises an error if the number of bytes in the buffer is fewer than the number to discard' do
@@ -185,14 +185,14 @@ module Ione
     describe '#read' do
       it 'returns the specified number of bytes, as a string' do
         buffer.append('hello')
-        buffer.read(4).should eq('hell')
+        buffer.read(4).should == 'hell'
       end
 
       it 'removes the bytes from the buffer' do
         buffer.append('hello')
         buffer.read(3)
-        buffer.should eq(ByteBuffer.new('lo'))
-        buffer.read(2).should eq('lo')
+        buffer.should == ByteBuffer.new('lo')
+        buffer.read(2).should == 'lo'
       end
 
       it 'raises an error if there are not enough bytes' do
@@ -208,22 +208,22 @@ module Ione
 
       it 'returns a string with binary encoding' do
         buffer.append('hello')
-        buffer.read(4).encoding.should eq(::Encoding::BINARY)
+        buffer.read(4).encoding.should == ::Encoding::BINARY
         buffer.append('∆')
-        buffer.read(2).encoding.should eq(::Encoding::BINARY)
+        buffer.read(2).encoding.should == ::Encoding::BINARY
       end
     end
 
     describe '#read_int' do
       it 'returns the first four bytes interpreted as an int' do
         buffer.append("\xca\xfe\xba\xbe\x01")
-        buffer.read_int.should eq(0xcafebabe)
+        buffer.read_int.should == 0xcafebabe
       end
 
       it 'removes the bytes from the buffer' do
         buffer.append("\xca\xfe\xba\xbe\x01")
         buffer.read_int
-        buffer.should eq(ByteBuffer.new("\x01"))
+        buffer.should == ByteBuffer.new("\x01")
       end
 
       it 'raises an error if there are not enough bytes' do
@@ -235,13 +235,13 @@ module Ione
     describe '#read_short' do
       it 'returns the first two bytes interpreted as a short' do
         buffer.append("\xca\xfe\x01")
-        buffer.read_short.should eq(0xcafe)
+        buffer.read_short.should == 0xcafe
       end
 
       it 'removes the bytes from the buffer' do
         buffer.append("\xca\xfe\x01")
         buffer.read_short
-        buffer.should eq(ByteBuffer.new("\x01"))
+        buffer.should == ByteBuffer.new("\x01")
       end
 
       it 'raises an error if there are not enough bytes' do
@@ -253,14 +253,14 @@ module Ione
     describe '#read_byte' do
       it 'returns the first bytes interpreted as an int' do
         buffer.append("\x10\x01")
-        buffer.read_byte.should eq(0x10)
-        buffer.read_byte.should eq(0x01)
+        buffer.read_byte.should == 0x10
+        buffer.read_byte.should == 0x01
       end
 
       it 'removes the byte from the buffer' do
         buffer.append("\x10\x01")
         buffer.read_byte
-        buffer.should eq(ByteBuffer.new("\x01"))
+        buffer.should == ByteBuffer.new("\x01")
       end
 
       it 'raises an error if there are no bytes' do
@@ -269,8 +269,8 @@ module Ione
 
       it 'can interpret the byte as signed' do
         buffer.append("\x81\x02")
-        buffer.read_byte(true).should eq(-127)
-        buffer.read_byte(true).should eq(2)
+        buffer.read_byte(true).should == -127
+        buffer.read_byte(true).should == 2
       end
     end
 
@@ -278,14 +278,14 @@ module Ione
       it 'changes the bytes at the specified location' do
         buffer.append('foo bar')
         buffer.update(4, 'baz')
-        buffer.to_s.should eq('foo baz')
+        buffer.to_s.should == 'foo baz'
       end
 
       it 'handles updates after a read' do
         buffer.append('foo bar')
         buffer.read(1)
         buffer.update(3, 'baz')
-        buffer.to_s.should eq('oo baz')
+        buffer.to_s.should == 'oo baz'
       end
 
       it 'handles updates after multiple reads and appends' do
@@ -295,7 +295,7 @@ module Ione
         buffer.update(4, 'baz')
         buffer.append('yyyy')
         buffer.read(1)
-        buffer.to_s.should eq('o bbazyyyy')
+        buffer.to_s.should == 'o bbazyyyy'
       end
 
       it 'returns itself' do
@@ -335,12 +335,12 @@ module Ione
     describe '#index' do
       it 'returns the first index of the specified substring' do
         buffer.append('fizz buzz')
-        buffer.index('zz').should eq(2)
+        buffer.index('zz').should == 2
       end
 
       it 'returns the first index of the specified substring, after the specified index' do
         buffer.append('fizz buzz')
-        buffer.index('zz', 3).should eq(7)
+        buffer.index('zz', 3).should == 7
       end
 
       it 'returns nil when the substring is not found' do
@@ -352,14 +352,14 @@ module Ione
         buffer.append('foo bar')
         buffer.read(1)
         buffer.append(' baz baz')
-        buffer.index('baz', 8).should eq(11)
+        buffer.index('baz', 8).should == 11
       end
 
       it 'returns the first index when the matching substring spans the read and write buffer' do
         buffer.append('foo bar')
         buffer.read(1)
         buffer.append('bar barbar')
-        buffer.index('barbar', 0).should eq(3)
+        buffer.index('barbar', 0).should == 3
       end
 
       it 'returns nil when the substring does not fit in the search space' do