ione 1.2.5 → 1.3.0.pre0

data/spec/ione/future_spec.rb

@@ -91,7 +91,7 @@ module Ione
         promise.try do
           3 + 4
         end
-        promise.future.value.should eq(7)
+        promise.future.value.should == 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 eq(6)
+        promise.future.value.should == 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 eq('bar')
-          v2.should eq('bar')
+          v1.should == 'bar'
+          v2.should == '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 eq('bar')
+          value.should == '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 => e; err = e; end }
+          future.on_complete { |f| begin; f.value; rescue => err; e = err; end }
           promise.fail(error)
-          err.message.should eq('bork')
+          err.message.should == '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 eq('bar')
+          v.should == '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 eq('bork')
+          e.message.should == '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 eq('bar')
-          v2.should eq('bar')
+          v1.should == 'bar'
+          v2.should == '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 eq('bar')
+          value.should == '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 eq('bar')
-          v2.should eq('bar')
+          v1.should == 'bar'
+          v2.should == '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 eq('bar')
+        future.value.should == '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 eq(Array.new(10, :hello))
+        listeners.map(&:value).should == 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 eq(3 * 2)
+          mapped_value.should == 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 eq(7)
+          mapped_value.should == 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 eq(3 * 2)
+          mapped_value.should == 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 eq(3 * 2)
+          f.value.should == 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 eq(:foobar)
+        f.value.should == :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 eq(3 * 2)
+          f.value.should == 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 eq(:foobar)
+            f.value.should == :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 eq(3 * 2)
+          f.value.should == 3 * 2
         end
       end
 
@@ -662,21 +662,21 @@ module Ione
           p = Promise.new
           f = p.future.recover { 'foo' }
           p.fail(error)
-          f.value.should eq('foo')
+          f.value.should == '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 eq('bar')
+          f.value.should == '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 eq('foo')
+          f.value.should == '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 eq(error.message)
+          f.value.should == 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 eq('bar')
+          f.value.should == 'bar'
         end
 
         it 'fails with the error raised in the given block' do
@@ -717,16 +717,17 @@ module Ione
           f = p1.future.fallback { p2.future }
           p1.fail(error)
           p2.fulfill('foo')
-          f.value.should eq('foo')
+          f.value.should == 'foo'
         end
 
         it 'yields the error to the block' do
-          p = Promise.new
-          f = p.future.fallback do |error|
+          p1 = Promise.new
+          p2 = Promise.new
+          f = p1.future.fallback do |error|
             Future.resolved(error.message)
           end
-          p.fail(error)
-          f.value.should eq(error.message)
+          p1.fail(error)
+          f.value.should == error.message
         end
 
         it 'is resolved with the value of the source future when the source future fullfills' do
@@ -735,7 +736,7 @@ module Ione
           f = p1.future.fallback { p2.future }
           p2.fulfill('bar')
           p1.fulfill('foo')
-          f.value.should eq('foo')
+          f.value.should == 'foo'
         end
 
         it 'fails when the block raises an error' do
@@ -760,7 +761,7 @@ module Ione
           p = Promise.new
           f = p.future.fallback { fake_future }
           p.fail(error)
-          f.value.should eq('foo')
+          f.value.should == 'foo'
         end
       end
     end
@@ -770,7 +771,7 @@ module Ione
         future = Future.traverse([1, 2, 3]) do |element|
           Future.resolved(element * 2)
         end
-        future.value.should eq([2, 4, 6])
+        future.value.should == [2, 4, 6]
       end
 
       it 'fails if any of the source futures fail' do
@@ -799,12 +800,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 eq([:foobar, :foobar, :foobar])
+        future.value.should == [: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 eq([2, 4, 6])
+        future.value.should == [2, 4, 6]
       end
     end
 
@@ -818,7 +819,7 @@ module Ione
         future = Future.reduce(futures, {}) do |accumulator, value|
           accumulator.merge(value)
         end
-        future.value.should eq({'foo' => 'bar', 'qux' => 'baz', 'hello' => 'world'})
+        future.value.should == {'foo' => 'bar', 'qux' => 'baz', 'hello' => 'world'}
       end
 
       it 'accepts boolean accumulators' do
@@ -829,7 +830,7 @@ module Ione
         future = Future.reduce(futures, false) do |accumulator, value|
           accumulator || value.empty?
         end
-        future.value.should eq(true)
+        future.value.should == true
       end
 
       it 'calls the block with the values in the order of the source futures' do
@@ -843,7 +844,7 @@ module Ione
         promises[2].fulfill(2)
         promises[4].fulfill(4)
         promises[3].fulfill(3)
-        future.value.should eq([0, 1, 2, 3, 4])
+        future.value.should == [0, 1, 2, 3, 4]
       end
 
       it 'uses the first value as initial value when no intial value is given' do
@@ -855,7 +856,7 @@ module Ione
         promises[1].fulfill(2)
         promises[0].fulfill(1)
         promises[2].fulfill(3)
-        future.value.should eq(6)
+        future.value.should == 6
       end
 
       it 'fails if any of the source futures fail' do
@@ -892,7 +893,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 eq(:foo)
+          Future.reduce([], :foo).value.should == :foo
         end
 
         it 'returns a future that resolves to nil there is also no initial value' do
@@ -906,13 +907,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 eq(6)
+        future.value.should == 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 eq(6)
+        future.value.should == 6
       end
 
       it 'handles a really long list of futures' do
@@ -931,7 +932,7 @@ module Ione
           promises[1].fulfill(1)
           promises[0].fulfill(0)
           promises[2].fulfill(2)
-          future.value.should eq([1, 0, 2])
+          future.value.should == [1, 0, 2]
         end
 
         it 'fails if any of the source futures fail' do
@@ -962,7 +963,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 eq(:foo)
+            Future.reduce([], :foo, ordered: false).value.should == :foo
           end
 
           it 'returns a future that resolves to nil there is also no initial value' do
@@ -1087,7 +1088,7 @@ module Ione
           p2.fulfill(2)
           p1.fulfill(1)
           p3.fulfill(3)
-          f.value.should eq([1, 2, 3])
+          f.value.should == [1, 2, 3]
         end
 
         it 'fails if any of the source futures fail' do
@@ -1105,20 +1106,20 @@ module Ione
         end
 
         it 'completes with an empty list when no futures are given' do
-          Future.all.value.should eq([])
+          Future.all.value.should == []
         end
 
         it 'completes with an empty list when an empty list is given' do
-          Future.all([]).value.should eq([])
+          Future.all([]).value.should == []
         end
 
         it 'completes with an empty list when an empty enumerable is given' do
-          Future.all([].to_enum).value.should eq([])
+          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 eq([1])
+          Future.all(f).value.should == [1]
         end
 
         it 'accepts a list of futures' do
@@ -1151,7 +1152,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 eq([1, 2, 3])
+          future.value.should == [1, 2, 3]
         end
       end
     end
@@ -1173,7 +1174,7 @@ module Ione
           p3 = Promise.new
           f = Future.first(p1.future, p2.future, p3.future)
           p2.fulfill('foo')
-          f.value.should eq('foo')
+          f.value.should == 'foo'
         end
 
         it 'is unaffected by the fullfillment of the other futures' do
@@ -1225,7 +1226,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 eq('foo')
+          Future.first(Future.resolved('foo')).value.should == 'foo'
         end
 
         it 'accepts a list of futures' do
@@ -1249,7 +1250,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 eq(1)
+          future.value.should == 1
         end
       end
     end
@@ -1275,14 +1276,14 @@ module Ione
         it 'calls its value callbacks immediately' do
           value = nil
           future.on_value { |v| value = v }
-          value.should eq('hello world')
+          value.should == '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 eq('hello world')
+          v.should == 'hello world'
         end
 
         it 'calls its complete callbacks with the right arity' do
@@ -1292,11 +1293,11 @@ module Ione
           future.on_complete { |vv, ee, ff| f2 = ff }
           f1.should equal(future)
           f2.should equal(future)
-          v.should eq('hello world')
+          v.should == 'hello world'
         end
 
         it 'does not block on #value' do
-          future.value.should eq('hello world')
+          future.value.should == 'hello world'
         end
 
         it 'defaults to the value nil' do
@@ -1326,14 +1327,14 @@ module Ione
         it 'call its failure callbacks immediately' do
           error = nil
           future.on_failure { |e| error = e }
-          error.message.should eq('bork')
+          error.message.should == '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 eq('bork')
+          e.message.should == 'bork'
         end
 
         it 'calls its complete callbacks with the right arity' do
@@ -1343,7 +1344,7 @@ module Ione
           future.on_complete { |vv, ee, ff| f2 = ff }
           f1.should equal(future)
           f2.should equal(future)
-          e.message.should eq('bork')
+          e.message.should == '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 eq(2)
+        heap.size.should == 2
         heap.push(101)
-        heap.size.should eq(3)
+        heap.size.should == 3
       end
     end
 
@@ -40,7 +40,7 @@ module Ione
         heap.push(3)
         heap.push(6)
         heap.push(5)
-        heap.size.should eq(4)
+        heap.size.should == 4
       end
 
       it 'is aliased as #<<' do
@@ -48,14 +48,14 @@ module Ione
         heap << 3
         heap << 6
         heap << 5
-        heap.size.should eq(4)
+        heap.size.should == 4
       end
 
       it 'does not add duplicates' do
         heap << 3
         heap << 3
         heap << 3
-        heap.size.should eq(1)
+        heap.size.should == 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 eq(3)
+        heap.peek.should == 3
       end
 
       it 'returns the smallest item' do
         heap.push(10)
         heap.push(3)
         heap.push(7)
-        heap.peek.should eq(3)
+        heap.peek.should == 3
       end
 
       it 'does not remove the item from the heap' do
         heap.push(3)
-        heap.peek.should eq(3)
-        heap.peek.should eq(3)
-        heap.peek.should eq(3)
+        heap.peek.should == 3
+        heap.peek.should == 3
+        heap.peek.should == 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 eq(3)
+        heap.pop.should == 3
         heap.should be_empty
       end
 
@@ -99,14 +99,14 @@ module Ione
         heap.push(10)
         heap.push(3)
         heap.push(7)
-        heap.pop.should eq(3)
-        heap.pop.should eq(7)
-        heap.size.should eq(1)
+        heap.pop.should == 3
+        heap.pop.should == 7
+        heap.size.should == 1
       end
 
       it 'removes the item from the heap' do
         heap.push(3)
-        heap.pop.should eq(3)
+        heap.pop.should == 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 eq(100)
-        heap.size.should eq(2)
+        heap.peek.should == 100
+        heap.size.should == 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 eq(4)
+        heap.delete(4).should == 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 eq('example.com')
-          accepted_handlers.first.port.should eq(3333)
+          accepted_handlers.first.host.should == 'example.com'
+          accepted_handlers.first.port.should == 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 eq('example.com')
-          received_connection2.host.should eq('example.com')
-          received_connection2.port.should eq(3333)
+          received_connection1.host.should == 'example.com'
+          received_connection2.host.should == 'example.com'
+          received_connection2.port.should == 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 eq(1)
+      calls.should == 1
     end
 
     it 'returns false if it did nothing' do
@@ -83,6 +83,19 @@ shared_examples_for 'a connection' do |options|
       handler.should be_closed
     end
 
+    it 'closes the socket for reading if possible' do
+      socket.stub(:close_read)
+      handler.write('hello world')
+      handler.drain
+      socket.should have_received(:close_read)
+    end
+
+    it 'ignores IO errors when closing for reading' do
+      socket.stub(:close_read).and_raise(IOError, 'Boork')
+      handler.write('hello world')
+      expect { handler.drain }.to_not raise_error
+    end
+
     it 'returns a future that completes when the socket has closed' do
       handler.write('hello world')
       f = handler.drain
@@ -238,7 +251,7 @@ shared_examples_for 'a connection' do |options|
         data = nil
         handler.on_data { |d| data = d }
         handler.read
-        data.should eq('foo bar')
+        data.should == 'foo bar'
       end
 
       context 'when #read_nonblock raises an error' do