ione 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3ef9ccb78957f99a401f9d3808fa74ea940ff17
-  data.tar.gz: 081d0432ba2a6960d84ee527c9ff10474b4ce31e
+  metadata.gz: 443070cc0eb7a65e30942699de1c6435af5b07e1
+  data.tar.gz: 50d81a6204f39103bcfbdadfdf4b5a764207ecf3
 SHA512:
-  metadata.gz: 8c4624c05b932671afdd0c8406e345cd3476bfad89b2118fabf3ce4101ba3849dc98ad0f32168c7c8b255c0f20bec9961d016f469a516dae20db7792294829ca
-  data.tar.gz: 6a1ec1a33dbdb4f9bdaf0faffd68e4e23019763ab4a3a90e232144ebea228eff1d865ec6094b323b908fc63e419c993cb02183acb39f7f5d5632dc735ab3b0f7
+  metadata.gz: 596feb59ad89022c6ef6150b3cd5fc6903965108a4f7c219f2fdef612c3e83f76ed7750516c6381b29c8bfea7ae987301859b17a62339f43abf79ed223cf1810
+  data.tar.gz: 1cae4a2e82976c0d5eda3ba67fd2bb59ef6bb5853ab645bdccc1e268587cab1a24cc7eca42aa076ac2b0bb4737a33c6a6590916c3dc3b83e2b51b28e3178bc38

data/lib/ione/future.rb

@@ -599,6 +599,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,
@@ -859,9 +861,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

@@ -95,6 +95,7 @@ module Ione
         @clock = options[:clock] || Time
         @state = PENDING_STATE
         @error_listeners = []
+        @unblocker = nil
         @io_loop = IoLoopBody.new(@options)
         @scheduler = Scheduler.new
         @lock = Mutex.new
@@ -570,8 +571,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
@@ -592,8 +593,8 @@ module Ione
             ensure
               @lock.unlock
             end
-            expired_timers.each do |timer|
-              timer.fulfill
+            expired_timers.each do |t|
+              t.fulfill
             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.2.3'.freeze
+  VERSION = '1.2.4'.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
@@ -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 == 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
@@ -352,14 +352,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

data/spec/ione/future_spec.rb

@@ -91,7 +91,7 @@ module Ione
         promise.try do
           3 + 4
         end
-        promise.future.value.should == 7
+        promise.future.value.should eq(7)
       end
 
       it 'fails the promise when the block raises an error' do
@@ -105,7 +105,7 @@ module Ione
         promise.try(:foo, 3) do |a, b|
           a.length + b
         end
-        promise.future.value.should == 6
+        promise.future.value.should eq(6)
       end
 
       it 'returns nil' do
@@ -216,8 +216,8 @@ module Ione
           future.on_complete { |v, _| v1 = v }
           future.on_complete { |v, _| v2 = v }
           promise.fulfill('bar')
-          v1.should == 'bar'
-          v2.should == 'bar'
+          v1.should eq('bar')
+          v2.should eq('bar')
         end
 
         it 'passes future as the third parameter to the block when it expects three arguments' do
@@ -319,15 +319,15 @@ module Ione
           future.on_complete { |f| raise 'Blurgh' }
           future.on_complete { |f| value = f.value }
           promise.fulfill('bar')
-          value.should == 'bar'
+          value.should eq('bar')
         end
 
         it 'notifies all listeners when the promise fails, even when one raises an error' do
           err = nil
           future.on_complete { |f| raise 'Blurgh' }
-          future.on_complete { |f| begin; f.value; rescue => err; e = err; end }
+          future.on_complete { |f| begin; f.value; rescue => e; err = e; end }
           promise.fail(error)
-          err.message.should == 'bork'
+          err.message.should eq('bork')
         end
 
         it 'notifies listeners registered after the promise was fulfilled' do
@@ -335,7 +335,7 @@ module Ione
           promise.fulfill('bar')
           future.on_complete { |vv, ee, ff| v = vv; e = ee; f = ff }
           f.should equal(future)
-          v.should == 'bar'
+          v.should eq('bar')
           e.should be_nil
         end
 
@@ -345,7 +345,7 @@ module Ione
           future.on_complete { |vv, ee, ff| v = vv; e = ee; f = ff }
           f.should equal(future)
           v.should be_nil
-          e.message.should == 'bork'
+          e.message.should eq('bork')
         end
 
         it 'notifies listeners registered after the promise failed' do
@@ -376,8 +376,8 @@ module Ione
           future.on_value { |v| v1 = v }
           future.on_value { |v| v2 = v }
           promise.fulfill('bar')
-          v1.should == 'bar'
-          v2.should == 'bar'
+          v1.should eq('bar')
+          v2.should eq('bar')
         end
 
         it 'notifies all listeners even when one raises an error' do
@@ -385,7 +385,7 @@ module Ione
           future.on_value { |v| raise 'Blurgh' }
           future.on_value { |v| value = v }
           promise.fulfill('bar')
-          value.should == 'bar'
+          value.should eq('bar')
         end
 
         it 'notifies listeners registered after the promise was resolved' do
@@ -393,8 +393,8 @@ module Ione
           promise.fulfill('bar')
           future.on_value { |v| v1 = v }
           future.on_value { |v| v2 = v }
-          v1.should == 'bar'
-          v2.should == 'bar'
+          v1.should eq('bar')
+          v2.should eq('bar')
         end
 
         it 'does not raise any error when the listener raises an error when already resolved' do
@@ -479,7 +479,7 @@ module Ione
           p.fulfill('bar')
         end
         d.value
-        future.value.should == 'bar'
+        future.value.should eq('bar')
       end
 
       it 'blocks on #value until completed, when value is nil' do
@@ -506,7 +506,7 @@ module Ione
         end
         sleep 0.1
         promise.fulfill(:hello)
-        listeners.map(&:value).should == Array.new(10, :hello)
+        listeners.map(&:value).should eq(Array.new(10, :hello))
       end
 
       it 'is aliased as #get' do
@@ -524,7 +524,7 @@ module Ione
           f = p.future.map { |v| v * 2 }
           f.on_value { |v| mapped_value = v }
           p.fulfill(3)
-          mapped_value.should == 3 * 2
+          mapped_value.should eq(3 * 2)
         end
 
         it 'will be resolved with the specified value' do
@@ -533,7 +533,7 @@ module Ione
           f = p.future.map(7)
           f.on_value { |v| mapped_value = v }
           p.fulfill(3)
-          mapped_value.should == 7
+          mapped_value.should eq(7)
         end
 
         it 'will be resolved with the result of the given block, even if a value is specified' do
@@ -542,7 +542,7 @@ module Ione
           f = p.future.map(7) { |v| v * 2 }
           f.on_value { |v| mapped_value = v }
           p.fulfill(3)
-          mapped_value.should == 3 * 2
+          mapped_value.should eq(3 * 2)
         end
 
         it 'will be resolved with nil when neither value nor block is specified' do
@@ -581,7 +581,7 @@ module Ione
           p = Promise.new
           f = p.future.flat_map { |v| Future.resolved(v * 2) }
           p.fulfill(3)
-          f.value.should == 3 * 2
+          f.value.should eq(3 * 2)
         end
 
         it 'fails when the block raises an error' do
@@ -598,7 +598,7 @@ module Ione
         p = Promise.new
         f = p.future.flat_map { fake_future }
         p.fulfill
-        f.value.should == :foobar
+        f.value.should eq(:foobar)
       end
     end
 
@@ -608,7 +608,7 @@ module Ione
           p = Promise.new
           f = p.future.then { |v| Future.resolved(v * 2) }
           p.fulfill(3)
-          f.value.should == 3 * 2
+          f.value.should eq(3 * 2)
         end
       end
 
@@ -620,7 +620,7 @@ module Ione
             p = Promise.new
             f = p.future.then { |v| fake_future }
             p.fulfill
-            f.value.should == :foobar
+            f.value.should eq(:foobar)
           end
         end
 
@@ -641,7 +641,7 @@ module Ione
           p = Promise.new
           f = p.future.then { |v| v * 2 }
           p.fulfill(3)
-          f.value.should == 3 * 2
+          f.value.should eq(3 * 2)
         end
       end
 
@@ -662,21 +662,21 @@ module Ione
           p = Promise.new
           f = p.future.recover { 'foo' }
           p.fail(error)
-          f.value.should == 'foo'
+          f.value.should eq('foo')
         end
 
         it 'resolves to a specfied value when the source future fails' do
           p = Promise.new
           f = p.future.recover('bar')
           p.fail(error)
-          f.value.should == 'bar'
+          f.value.should eq('bar')
         end
 
         it 'resovles to a value created by the block even when a value is specified when the source future fails' do
           p = Promise.new
           f = p.future.recover('bar') { 'foo' }
           p.fail(error)
-          f.value.should == 'foo'
+          f.value.should eq('foo')
         end
 
         it 'resolves to nil value when no value nor block is specified and the source future fails' do
@@ -690,14 +690,14 @@ module Ione
           p = Promise.new
           f = p.future.recover { |e| e.message }
           p.fail(error)
-          f.value.should == error.message
+          f.value.should eq(error.message)
         end
 
         it 'resolves to the value of the source future when the source future is resolved' do
           p = Promise.new
           f = p.future.recover { 'foo' }
           p.fulfill('bar')
-          f.value.should == 'bar'
+          f.value.should eq('bar')
         end
 
         it 'fails with the error raised in the given block' do
@@ -717,17 +717,16 @@ module Ione
           f = p1.future.fallback { p2.future }
           p1.fail(error)
           p2.fulfill('foo')
-          f.value.should == 'foo'
+          f.value.should eq('foo')
         end
 
         it 'yields the error to the block' do
-          p1 = Promise.new
-          p2 = Promise.new
-          f = p1.future.fallback do |error|
+          p = Promise.new
+          f = p.future.fallback do |error|
             Future.resolved(error.message)
           end
-          p1.fail(error)
-          f.value.should == error.message
+          p.fail(error)
+          f.value.should eq(error.message)
         end
 
         it 'is resolved with the value of the source future when the source future fullfills' do
@@ -736,7 +735,7 @@ module Ione
           f = p1.future.fallback { p2.future }
           p2.fulfill('bar')
           p1.fulfill('foo')
-          f.value.should == 'foo'
+          f.value.should eq('foo')
         end
 
         it 'fails when the block raises an error' do
@@ -761,7 +760,7 @@ module Ione
           p = Promise.new
           f = p.future.fallback { fake_future }
           p.fail(error)
-          f.value.should == 'foo'
+          f.value.should eq('foo')
         end
       end
     end
@@ -771,7 +770,7 @@ module Ione
         future = Future.traverse([1, 2, 3]) do |element|
           Future.resolved(element * 2)
         end
-        future.value.should == [2, 4, 6]
+        future.value.should eq([2, 4, 6])
       end
 
       it 'fails if any of the source futures fail' do
@@ -800,12 +799,12 @@ module Ione
         fake_future = double(:fake_future)
         fake_future.stub(:on_complete) { |&listener| listener.call(:foobar, nil) }
         future = Future.traverse([1, 2, 3]) { fake_future }
-        future.value.should == [:foobar, :foobar, :foobar]
+        future.value.should eq([:foobar, :foobar, :foobar])
       end
 
       it 'accepts an enumerable of values' do
         future = Future.traverse([1, 2, 3].to_enum) { |v| Future.resolved(v * 2) }
-        future.value.should == [2, 4, 6]
+        future.value.should eq([2, 4, 6])
       end
     end
 
@@ -819,7 +818,7 @@ module Ione
         future = Future.reduce(futures, {}) do |accumulator, value|
           accumulator.merge(value)
         end
-        future.value.should == {'foo' => 'bar', 'qux' => 'baz', 'hello' => 'world'}
+        future.value.should eq({'foo' => 'bar', 'qux' => 'baz', 'hello' => 'world'})
       end
 
       it 'accepts boolean accumulators' do
@@ -830,7 +829,7 @@ module Ione
         future = Future.reduce(futures, false) do |accumulator, value|
           accumulator || value.empty?
         end
-        future.value.should == true
+        future.value.should eq(true)
       end
 
       it 'calls the block with the values in the order of the source futures' do
@@ -844,7 +843,7 @@ module Ione
         promises[2].fulfill(2)
         promises[4].fulfill(4)
         promises[3].fulfill(3)
-        future.value.should == [0, 1, 2, 3, 4]
+        future.value.should eq([0, 1, 2, 3, 4])
       end
 
       it 'uses the first value as initial value when no intial value is given' do
@@ -856,7 +855,7 @@ module Ione
         promises[1].fulfill(2)
         promises[0].fulfill(1)
         promises[2].fulfill(3)
-        future.value.should == 6
+        future.value.should eq(6)
       end
 
       it 'fails if any of the source futures fail' do
@@ -893,7 +892,7 @@ module Ione
 
       context 'when the list of futures is empty' do
         it 'returns a future that resolves to the initial value' do
-          Future.reduce([], :foo).value.should == :foo
+          Future.reduce([], :foo).value.should eq(:foo)
         end
 
         it 'returns a future that resolves to nil there is also no initial value' do
@@ -907,13 +906,13 @@ module Ione
         ff2.stub(:on_complete) { |&listener| listener.call(2, nil) }
         ff3.stub(:on_complete) { |&listener| listener.call(3, nil) }
         future = Future.reduce([ff1, ff2, ff3], 0) { |sum, n| sum + n }
-        future.value.should == 6
+        future.value.should eq(6)
       end
 
       it 'accepts an enumerable of futures' do
         futures = [Future.resolved(1), Future.resolved(2), Future.resolved(3)].to_enum
         future = Future.reduce(futures, 0) { |sum, n| sum + n }
-        future.value.should == 6
+        future.value.should eq(6)
       end
 
       it 'handles a really long list of futures' do
@@ -932,7 +931,7 @@ module Ione
           promises[1].fulfill(1)
           promises[0].fulfill(0)
           promises[2].fulfill(2)
-          future.value.should == [1, 0, 2]
+          future.value.should eq([1, 0, 2])
         end
 
         it 'fails if any of the source futures fail' do
@@ -963,7 +962,7 @@ module Ione
 
         context 'when the list of futures is empty' do
           it 'returns a future that resolves to the initial value' do
-            Future.reduce([], :foo, ordered: false).value.should == :foo
+            Future.reduce([], :foo, ordered: false).value.should eq(:foo)
           end
 
           it 'returns a future that resolves to nil there is also no initial value' do
@@ -1088,7 +1087,7 @@ module Ione
           p2.fulfill(2)
           p1.fulfill(1)
           p3.fulfill(3)
-          f.value.should == [1, 2, 3]
+          f.value.should eq([1, 2, 3])
         end
 
         it 'fails if any of the source futures fail' do
@@ -1106,20 +1105,20 @@ module Ione
         end
 
         it 'completes with an empty list when no futures are given' do
-          Future.all.value.should == []
+          Future.all.value.should eq([])
         end
 
         it 'completes with an empty list when an empty list is given' do
-          Future.all([]).value.should == []
+          Future.all([]).value.should eq([])
         end
 
         it 'completes with an empty list when an empty enumerable is given' do
-          Future.all([].to_enum).value.should == []
+          Future.all([].to_enum).value.should eq([])
         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]
+          Future.all(f).value.should eq([1])
         end
 
         it 'accepts a list of futures' do
@@ -1152,7 +1151,7 @@ module Ione
           ff2.stub(:on_complete) { |&listener| listener.call(2, nil) }
           ff3.stub(:on_complete) { |&listener| listener.call(3, nil) }
           future = Future.all(ff1, ff2, ff3)
-          future.value.should == [1, 2, 3]
+          future.value.should eq([1, 2, 3])
         end
       end
     end
@@ -1174,7 +1173,7 @@ module Ione
           p3 = Promise.new
           f = Future.first(p1.future, p2.future, p3.future)
           p2.fulfill('foo')
-          f.value.should == 'foo'
+          f.value.should eq('foo')
         end
 
         it 'is unaffected by the fullfillment of the other futures' do
@@ -1226,7 +1225,7 @@ module Ione
         end
 
         it 'completes with the value of the given future, when only one is given' do
-          Future.first(Future.resolved('foo')).value.should == 'foo'
+          Future.first(Future.resolved('foo')).value.should eq('foo')
         end
 
         it 'accepts a list of futures' do
@@ -1250,7 +1249,7 @@ module Ione
           ff1.stub(:on_complete) { |&listener| listener.call(1, nil) }
           ff2.stub(:on_complete) { |&listener| listener.call(2, nil) }
           future = Future.first(ff1, ff2)
-          future.value.should == 1
+          future.value.should eq(1)
         end
       end
     end
@@ -1276,14 +1275,14 @@ module Ione
         it 'calls its value callbacks immediately' do
           value = nil
           future.on_value { |v| value = v }
-          value.should == 'hello world'
+          value.should eq('hello world')
         end
 
         it 'calls its complete callbacks immediately' do
           f, v = nil, nil
           future.on_complete { |vv, _, ff| f = ff; v = vv }
           f.should equal(future)
-          v.should == 'hello world'
+          v.should eq('hello world')
         end
 
         it 'calls its complete callbacks with the right arity' do
@@ -1293,11 +1292,11 @@ module Ione
           future.on_complete { |vv, ee, ff| f2 = ff }
           f1.should equal(future)
           f2.should equal(future)
-          v.should == 'hello world'
+          v.should eq('hello world')
         end
 
         it 'does not block on #value' do
-          future.value.should == 'hello world'
+          future.value.should eq('hello world')
         end
 
         it 'defaults to the value nil' do
@@ -1327,14 +1326,14 @@ module Ione
         it 'call its failure callbacks immediately' do
           error = nil
           future.on_failure { |e| error = e }
-          error.message.should == 'bork'
+          error.message.should eq('bork')
         end
 
         it 'calls its complete callbacks immediately' do
           f, e = nil, nil
           future.on_complete { |_, ee, ff| f = ff; e = ee }
           f.should equal(future)
-          e.message.should == 'bork'
+          e.message.should eq('bork')
         end
 
         it 'calls its complete callbacks with the right arity' do
@@ -1344,7 +1343,7 @@ module Ione
           future.on_complete { |vv, ee, ff| f2 = ff }
           f1.should equal(future)
           f2.should equal(future)
-          e.message.should == 'bork'
+          e.message.should eq('bork')
         end
 
         it 'does not block on #value' do

data/spec/ione/heap_spec.rb

@@ -17,9 +17,9 @@ module Ione
       it 'returns the number of items in the heap' do
         heap.push(13)
         heap.push(100)
-        heap.size.should == 2
+        heap.size.should eq(2)
         heap.push(101)
-        heap.size.should == 3
+        heap.size.should eq(3)
       end
     end
 
@@ -40,7 +40,7 @@ module Ione
         heap.push(3)
         heap.push(6)
         heap.push(5)
-        heap.size.should == 4
+        heap.size.should eq(4)
       end
 
       it 'is aliased as #<<' do
@@ -48,14 +48,14 @@ module Ione
         heap << 3
         heap << 6
         heap << 5
-        heap.size.should == 4
+        heap.size.should eq(4)
       end
 
       it 'does not add duplicates' do
         heap << 3
         heap << 3
         heap << 3
-        heap.size.should == 1
+        heap.size.should eq(1)
       end
     end
 
@@ -66,21 +66,21 @@ module Ione
 
       it 'returns the only item when there is only one' do
         heap.push(3)
-        heap.peek.should == 3
+        heap.peek.should eq(3)
       end
 
       it 'returns the smallest item' do
         heap.push(10)
         heap.push(3)
         heap.push(7)
-        heap.peek.should == 3
+        heap.peek.should eq(3)
       end
 
       it 'does not remove the item from the heap' do
         heap.push(3)
-        heap.peek.should == 3
-        heap.peek.should == 3
-        heap.peek.should == 3
+        heap.peek.should eq(3)
+        heap.peek.should eq(3)
+        heap.peek.should eq(3)
       end
     end
 
@@ -91,7 +91,7 @@ module Ione
 
       it 'returns and removes the only item when there is only one' do
         heap.push(3)
-        heap.pop.should == 3
+        heap.pop.should eq(3)
         heap.should be_empty
       end
 
@@ -99,14 +99,14 @@ module Ione
         heap.push(10)
         heap.push(3)
         heap.push(7)
-        heap.pop.should == 3
-        heap.pop.should == 7
-        heap.size.should == 1
+        heap.pop.should eq(3)
+        heap.pop.should eq(7)
+        heap.size.should eq(1)
       end
 
       it 'removes the item from the heap' do
         heap.push(3)
-        heap.pop.should == 3
+        heap.pop.should eq(3)
         heap.pop.should be_nil
       end
     end
@@ -125,8 +125,8 @@ module Ione
         heap.push(101)
         heap.delete(4)
         heap.pop
-        heap.peek.should == 100
-        heap.size.should == 2
+        heap.peek.should eq(100)
+        heap.size.should eq(2)
       end
 
       it 'removes the last item from the heap' do
@@ -155,7 +155,7 @@ module Ione
         heap.push(3)
         heap.push(4)
         heap.push(5)
-        heap.delete(4).should == 4
+        heap.delete(4).should eq(4)
       end
 
       it 'returns nil when the item is not found' do

data/spec/ione/io/acceptor_spec.rb

@@ -174,8 +174,8 @@ module Ione
           acceptor.bind
           acceptor.read
           accepted_handlers.should have(1).item
-          accepted_handlers.first.host.should == 'example.com'
-          accepted_handlers.first.port.should == 3333
+          accepted_handlers.first.host.should eq('example.com')
+          accepted_handlers.first.port.should eq(3333)
         end
 
         it 'passes the unblocker along to the connection handler' do
@@ -197,9 +197,9 @@ module Ione
           acceptor.on_accept { |c| received_connection2 = c }
           acceptor.bind
           acceptor.read
-          received_connection1.host.should == 'example.com'
-          received_connection2.host.should == 'example.com'
-          received_connection2.port.should == 3333
+          received_connection1.host.should eq('example.com')
+          received_connection2.host.should eq('example.com')
+          received_connection2.port.should eq(3333)
         end
 
         it 'ignores exceptions raised by the connection callback' do

data/spec/ione/io/connection_common.rb

@@ -40,7 +40,7 @@ shared_examples_for 'a connection' do |options|
       handler.on_closed { calls += 1 }
       handler.close
       handler.close
-      calls.should == 1
+      calls.should eq(1)
     end
 
     it 'returns false if it did nothing' do
@@ -238,7 +238,7 @@ shared_examples_for 'a connection' do |options|
         data = nil
         handler.on_data { |d| data = d }
         handler.read
-        data.should == 'foo bar'
+        data.should eq('foo bar')
       end
 
       context 'when #read_nonblock raises an error' do

data/spec/ione/io/io_reactor_spec.rb

@@ -85,7 +85,7 @@ module Ione
             stopped_future.value
             restarted_future.value
             begin
-              sequence.should == [:stopped, :restarted]
+              sequence.should eq([:stopped, :restarted])
             ensure
               reactor.stop
               barrier.push(nil) while reactor.running?
@@ -136,8 +136,6 @@ module Ione
 
         context 'when already started' do
           it 'is not started again' do
-            calls = 0
-            lock = Mutex.new
             ticks = Queue.new
             barrier = Queue.new
             selector.handler do
@@ -239,7 +237,7 @@ module Ione
           reactor.on_error { |e| error = e }
           reactor.start
           await { error }
-          error.message.should == 'Blurgh'
+          error.message.should eq('Blurgh')
         end
 
         it 'calls the listener immediately when the reactor has already crashed' do
@@ -269,16 +267,16 @@ module Ione
           barrier.push(nil)
           await { !reactor.running? }
           reactor.on_error { calls << :pre_restarted }
-          calls.should == [
+          calls.should eq([
             :pre_started,
             :post_started,
             :pre_restarted,
-          ]
+          ])
           reactor.start
           reactor.on_error { calls << :post_restarted }
           barrier.push(nil)
           await { !reactor.running? }
-          calls.should == [
+          calls.should eq([
             :pre_started,
             :post_started,
             :pre_restarted,
@@ -286,7 +284,7 @@ module Ione
             :post_started,
             :pre_restarted,
             :post_restarted,
-          ]
+          ])
         end
       end
 
@@ -303,19 +301,19 @@ module Ione
         it 'returns a future that resolves to what the given block returns' do
           reactor.start.value
           x = reactor.connect('example.com', 9999, 5) { :foo }.value
-          x.should == :foo
+          x.should eq(:foo)
         end
 
         it 'defaults to 5 as the connection timeout' do
           reactor.start.value
           connection = reactor.connect('example.com', 9999).value
-          connection.connection_timeout.should == 5
+          connection.connection_timeout.should eq(5)
         end
 
         it 'takes the connection timeout from the :timeout option' do
           reactor.start.value
           connection = reactor.connect('example.com', 9999, timeout: 9).value
-          connection.connection_timeout.should == 9
+          connection.connection_timeout.should eq(9)
         end
 
         it 'returns the connection when no block is given' do
@@ -379,19 +377,19 @@ module Ione
         it 'returns a future that resolves to what the given block returns' do
           reactor.start.value
           x = reactor.bind(ENV['SERVER_HOST'], port, 5) { |acceptor| :foo }.value
-          x.should == :foo
+          x.should eq(:foo)
         end
 
         it 'defaults to a backlog of 5' do
           reactor.start.value
           acceptor = reactor.bind(ENV['SERVER_HOST'], port).value
-          acceptor.backlog.should == 5
+          acceptor.backlog.should eq(5)
         end
 
         it 'takes the backlog from the :backlog option' do
           reactor.start.value
           acceptor = reactor.bind(ENV['SERVER_HOST'], port, backlog: 9).value
-          acceptor.backlog.should == 9
+          acceptor.backlog.should eq(9)
         end
 
         it 'returns the acceptor when no block is given' do

data/spec/ione/io/ssl_acceptor_spec.rb

@@ -7,7 +7,7 @@ module Ione
   module Io
     describe SslAcceptor do
       let :acceptor do
-        described_class.new('example.com', 4321, backlog = 3, unblocker, reactor, ssl_context, socket_impl, ssl_socket_impl)
+        described_class.new('example.com', 4321, 3, unblocker, reactor, ssl_context, socket_impl, ssl_socket_impl)
       end
 
       let :unblocker do
@@ -80,8 +80,8 @@ module Ione
             acceptor.bind
             acceptor.read
             accepted_handlers.should have(1).item
-            accepted_handlers.first.host.should == 'example.com'
-            accepted_handlers.first.port.should == 3333
+            accepted_handlers.first.host.should eq('example.com')
+            accepted_handlers.first.port.should eq(3333)
           end
 
           it 'returns the raw socket from #to_io' do

data/spec/ione/io/ssl_connection_spec.rb

@@ -124,7 +124,7 @@ module Ione
             end
             handler.connect
             handler.read
-            read_sizes.drop(1).should == [read_sizes.first] * 3
+            read_sizes.drop(1).should eq([read_sizes.first] * 3)
           end
         else
           it 'reads and initial chunk of data' do
@@ -134,7 +134,7 @@ module Ione
             ssl_socket.stub(:read_nonblock).and_return('fooo')
             handler.connect
             handler.read
-            data.should == ['fooo']
+            data.should eq(['fooo'])
           end
 
           it 'reads once, and then again with the value of #pending, until #pending returns zero' do
@@ -149,7 +149,7 @@ module Ione
             end
             handler.connect
             handler.read
-            read_sizes.drop(1).should == [3, 2, 1]
+            read_sizes.drop(1).should eq([3, 2, 1])
           end
         end
 

data/spec/spec_helper.rb

@@ -23,4 +23,8 @@ unless ENV['COVERAGE'] == 'no' || RUBY_ENGINE == 'rbx'
   end
 end
 
+RSpec.configure do |config|
+  config.warnings = true
+end
+
 require 'ione'

data/spec/support/fake_server.rb

@@ -11,6 +11,7 @@ class FakeServer
     @disconnects = 0
     @connections = []
     @received_bytes = ''
+    @running = false
   end
 
   def start(options={})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies: []
 description: Reactive programming framework for Ruby, painless evented IO, futures
   and an efficient byte buffer
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Reactive programming framework for Ruby