ione 1.3.0.pre2 → 1.3.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 21dcca9fc4413a5b2487e3773e276ef7b3ae0814
-  data.tar.gz: 641d648b3d338383fe12e724afcace063043c18a
+SHA256:
+  metadata.gz: 78ca22da674434afcf1293e1b7d70bb3f13a0080b7c492f5016fb6f4f2428702
+  data.tar.gz: a50ef526b8a0163a3c2dd116a75d83b48cb6bbb79f80a4cdb0ba9e66c5c2e4b3
 SHA512:
-  metadata.gz: 39f1108d6069ed37f168d68219ad6aebbe06fda839c7c238eea0cdf30bd27e4c15cf2aedd533e49b08abef170cfa2ef480a72471e9e44ca86b3e30dc491044be
-  data.tar.gz: 8faf34f893c4b913473734c66239145d41c0c1374c4db6571c03207c55d6bd8a5a38fe94724a2193541697f19cbf0c408cd19cacdd0382da87a4664b7be9ea91
+  metadata.gz: 8eb9100fc86fb57bff7a048f2d97411764df9e00fd5ec5afa921470283161a282686b9fdeea6cccd750b3dce5ea7efce666c9f6b98ef65ec3df2a3076e39c73d
+  data.tar.gz: be2df17439ad63370e7b980ab99e526080e995d65a25c3547fdfbeca34db25548ff6ba9c7b665cb1f7e4d6603d3a33398a16f9628fc5e9ad53f57f3fe9a8c455

data/lib/ione/future.rb

@@ -625,6 +625,8 @@ 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,
@@ -869,9 +871,9 @@ module Ione
         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)
+          @futures.pop.on_complete do |value, error|
+            if error || @futures.empty? || !looping || !Thread.current.equal?(outer)
+              await_next(value, error)
             else
               more = true
             end

data/lib/ione/io/acceptor.rb

@@ -22,6 +22,7 @@ module Ione
         @backlog = backlog
         @unblocker = unblocker
         @reactor = reactor
+        @io = nil
         @socket_impl = socket_impl || ServerSocket
         @accept_listeners = []
         @lock = Mutex.new

data/lib/ione/io/base_connection.rb

@@ -15,10 +15,12 @@ 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

data/lib/ione/io/connection.rb

@@ -14,6 +14,7 @@ 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

@@ -97,7 +97,7 @@ module Ione
         @error_listeners = []
         @unblocker = Unblocker.new
         @io_loop = IoLoopBody.new(@unblocker, @options)
-        @scheduler = Scheduler.new
+        @scheduler = Scheduler.new(@options)
         @lock = Mutex.new
       end
 
@@ -582,8 +582,8 @@ module Ione
         ensure
           @lock.unlock
         end
-        timers.each do |timer|
-          timer.fail(CancelledError.new)
+        timers.each do |t|
+          t.fail(CancelledError.new)
         end
         nil
       end
@@ -604,8 +604,8 @@ module Ione
             ensure
               @lock.unlock
             end
-            expired_timers.each do |timer|
-              timer.fulfill
+            expired_timers.each do |t|
+              t.fulfill
             end
           end
         end
@@ -616,4 +616,4 @@ module Ione
       end
     end
   end
-end
+end

data/lib/ione/io/ssl_connection.rb

@@ -12,6 +12,7 @@ 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.3.0.pre2'.freeze
+  VERSION = '1.3.0.pre3'.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 == 'hello world'
+      protocol_handler.data.should eq('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 == 'hello world'
+      protocol_handlers.sample.data.should eq('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 == 'HELLO'
+      result.should eq('HELLO')
       socket.close
     end
   end

data/spec/integration/ssl_spec.rb

@@ -49,6 +49,7 @@ 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
@@ -80,8 +81,8 @@ describe 'SSL' do
     end
     client.write('hello world')
     response_received.future.value
-    server_received_data.to_s.should == 'hello world'
-    client_received_data.to_s.should == 'dlrow olleh'
+    server_received_data.to_s.should eq('hello world')
+    client_received_data.to_s.should eq('dlrow olleh')
   end
 
   it 'fails to send a message when not using encryption' do
@@ -95,3 +96,7 @@ 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 == 5
+        described_class.new('hello').length.should eq(5)
       end
     end
 
     describe '#length/#size/#bytesize' do
       it 'returns the number of bytes in the buffer' do
         buffer << 'foo'
-        buffer.length.should == 3
+        buffer.length.should eq(3)
       end
 
       it 'is zero initially' do
-        buffer.length.should == 0
+        buffer.length.should eq(0)
       end
 
       it 'is aliased as #size' do
         buffer << 'foo'
-        buffer.size.should == 3
+        buffer.size.should eq(3)
       end
 
       it 'is aliased as #bytesize' do
         buffer << 'foo'
-        buffer.bytesize.should == 3
+        buffer.bytesize.should eq(3)
       end
     end
 
@@ -67,19 +67,19 @@ module Ione
       end
 
       it 'stores its bytes as binary' do
-        buffer.append('hällö').length.should == 7
-        buffer.to_s.encoding.should == ::Encoding::BINARY
+        buffer.append('hällö').length.should eq(7)
+        buffer.to_s.encoding.should eq(::Encoding::BINARY)
       end
 
       it 'handles appending with multibyte strings' do
         buffer.append('hello')
         buffer.append('würld')
-        buffer.to_s.should == 'hellowürld'.force_encoding(::Encoding::BINARY)
+        buffer.to_s.should eq('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 == 'hello world'
+        buffer.to_s.should eq('hello world')
       end
     end
 
@@ -105,7 +105,7 @@ module Ione
         b2 = described_class.new
         b1.append('foo')
         b2.append('foo')
-        b1.should == b2
+        b1.should eq(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 == b2.hash
+        b1.hash.should eq(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 == b2.hash
+        b1.hash.should eq(b2.hash)
       end
     end
 
     describe '#to_s' do
       it 'returns the bytes' do
-        buffer.append('hello world').to_s.should == 'hello world'
+        buffer.append('hello world').to_s.should eq('hello world')
       end
     end
 
     describe '#to_str' do
       it 'returns the bytes' do
-        buffer.append('hello world').to_str.should == 'hello world'
+        buffer.append('hello world').to_str.should eq('hello world')
       end
     end
 
     describe '#inspect' do
       it 'returns the bytes wrapped in ByteBuffer(...)' do
         buffer.append("\xca\xfe")
-        buffer.inspect.should == '#<Ione::ByteBuffer: "\xCA\xFE">'
+        buffer.inspect.should eq('#<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 == ByteBuffer.new('o world')
+        buffer.should eq(ByteBuffer.new('o world'))
       end
 
       it 'returns the byte buffer' do
         buffer.append('hello world')
-        buffer.discard(4).should == ByteBuffer.new('o world')
+        buffer.discard(4).should eq(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 == 'hell'
+        buffer.read(4).should eq('hell')
       end
 
       it 'removes the bytes from the buffer' do
         buffer.append('hello')
         buffer.read(3)
-        buffer.should == ByteBuffer.new('lo')
-        buffer.read(2).should == 'lo'
+        buffer.should eq(ByteBuffer.new('lo'))
+        buffer.read(2).should eq('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 == ::Encoding::BINARY
+        buffer.read(4).encoding.should eq(::Encoding::BINARY)
         buffer.append('∆')
-        buffer.read(2).encoding.should == ::Encoding::BINARY
+        buffer.read(2).encoding.should eq(::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 == 0xcafebabe
+        buffer.read_int.should eq(0xcafebabe)
       end
 
       it 'removes the bytes from the buffer' do
         buffer.append("\xca\xfe\xba\xbe\x01")
         buffer.read_int
-        buffer.should == ByteBuffer.new("\x01")
+        buffer.should eq(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 == 0xcafe
+        buffer.read_short.should eq(0xcafe)
       end
 
       it 'removes the bytes from the buffer' do
         buffer.append("\xca\xfe\x01")
         buffer.read_short
-        buffer.should == ByteBuffer.new("\x01")
+        buffer.should eq(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 == 0x10
-        buffer.read_byte.should == 0x01
+        buffer.read_byte.should eq(0x10)
+        buffer.read_byte.should eq(0x01)
       end
 
       it 'removes the byte from the buffer' do
         buffer.append("\x10\x01")
         buffer.read_byte
-        buffer.should == ByteBuffer.new("\x01")
+        buffer.should eq(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 == -127
-        buffer.read_byte(true).should == 2
+        buffer.read_byte(true).should eq(-127)
+        buffer.read_byte(true).should eq(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 == 'foo baz'
+        buffer.to_s.should eq('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 == 'oo baz'
+        buffer.to_s.should eq('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 == 'o bbazyyyy'
+        buffer.to_s.should eq('o bbazyyyy')
       end
 
       it 'returns itself' do
@@ -388,12 +388,12 @@ module Ione
     describe '#index' do
       it 'returns the first index of the specified substring' do
         buffer.append('fizz buzz')
-        buffer.index('zz').should == 2
+        buffer.index('zz').should eq(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 == 7
+        buffer.index('zz', 3).should eq(7)
       end
 
       it 'returns nil when the substring is not found' do
@@ -405,14 +405,14 @@ module Ione
         buffer.append('foo bar')
         buffer.read(1)
         buffer.append(' baz baz')
-        buffer.index('baz', 8).should == 11
+        buffer.index('baz', 8).should eq(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 == 3
+        buffer.index('barbar', 0).should eq(3)
       end
 
       it 'returns nil when the substring does not fit in the search space' do