ione 1.3.0.pre0 → 1.3.0.pre3

data/spec/ione/io/io_reactor_spec.rb

@@ -90,7 +90,7 @@ module Ione
             restarted_future.value
             await { sequence.size >= 2 }
             begin
-              sequence.should == [:stopped, :restarted]
+              sequence.should eq([:stopped, :restarted])
             ensure
               reactor.stop
               barrier.push(nil) while reactor.running?
@@ -141,8 +141,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
@@ -184,18 +182,17 @@ module Ione
         end
 
         it 'keeps running until stop completes' do
-          running_barrier = Queue.new
-          stop_barrier = Queue.new
+          barrier = Queue.new
           selector.handler do
-            running_barrier.push(nil)
-            stop_barrier.pop
+            barrier.pop
             [[], [], []]
           end
           reactor.start.value
           future = reactor.stop
-          running_barrier.pop
+          barrier.push(nil)
           reactor.should be_running
-          stop_barrier.push(nil) until future.completed?
+          barrier.push(nil) until future.completed?
+          reactor.should_not be_running
         end
 
         it 'unblocks the reactor' do
@@ -215,7 +212,7 @@ module Ione
         it 'drains all sockets' do
           reactor.start.value
           TCPServer.open(0) do |server|
-            lazy_socket = Thread.start { server.accept }
+            Thread.start { server.accept }
             connection = reactor.connect(server.addr[3], server.addr[1], 5).value
             writable = false
             connection.stub(:stub_writable?) { writable }
@@ -251,7 +248,7 @@ module Ione
           end
           reactor.start.value
           TCPServer.open(0) do |server|
-            lazy_socket = Thread.start { server.accept }
+            Thread.start { server.accept }
             connection = reactor.connect(server.addr[3], server.addr[1], 5).value
             stopped_future = nil
             mutex.synchronize do
@@ -358,7 +355,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
@@ -389,16 +386,16 @@ module Ione
           await { !reactor.running? }
           await { calls.size >= 2 }
           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,
@@ -406,7 +403,7 @@ module Ione
             :post_started,
             :pre_restarted,
             :post_restarted,
-          ]
+          ])
         end
       end
 
@@ -426,7 +423,7 @@ module Ione
           with_server do |host, port|
             reactor.start.value
             x = reactor.connect(host, port, 5) { :foo }.value
-            x.should == :foo
+            x.should eq(:foo)
           end
         end
 
@@ -434,7 +431,7 @@ module Ione
           with_server do |host, port|
             reactor.start.value
             connection = reactor.connect(host, port).value
-            connection.connection_timeout.should == 5
+            connection.connection_timeout.should eq(5)
           end
         end
 
@@ -442,7 +439,7 @@ module Ione
           with_server do |host, port|
             reactor.start.value
             connection = reactor.connect(host, port, timeout: 9).value
-            connection.connection_timeout.should == 9
+            connection.connection_timeout.should eq(9)
           end
         end
 
@@ -519,19 +516,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
@@ -584,10 +581,12 @@ module Ione
           end
 
           it 'returns a future that is resolved after the specified duration' do
+            start = Time.now
             clock.stub(:now).and_return(1)
-            f = reactor.schedule_timer(0.1)
-            clock.stub(:now).and_return(1.1)
+            f = reactor.schedule_timer(8)
+            clock.stub(:now).and_return(10.1)
             await { f.resolved? }
+            expect(Time.now - start).to be < 1
           end
         end
 
@@ -713,7 +712,11 @@ module Ione
 
     describe IoLoopBody do
       let :loop_body do
-        described_class.new(selector: selector, clock: clock)
+        described_class.new(unblocker, selector: selector, clock: clock)
+      end
+
+      let :unblocker do
+        double(:unblocker, connected?: true, connecting?: false, writable?: false, closed?: false)
       end
 
       let :selector do
@@ -728,14 +731,24 @@ module Ione
         double(:socket, connected?: false, connecting?: false, writable?: false, closed?: false)
       end
 
+      before do
+        unblocker.stub(:close) { unblocker.stub(:closed?).and_return(true) }
+      end
+
       describe '#tick' do
         before do
           loop_body.add_socket(socket)
         end
 
+        it 'passes the unblocker to the selector as the first readable' do
+          socket.stub(:connected?).and_return(true)
+          selector.should_receive(:select).with([unblocker, socket], anything, anything, anything).and_return([nil, nil, nil])
+          loop_body.tick
+        end
+
         it 'passes connected sockets as readables to the selector' do
           socket.stub(:connected?).and_return(true)
-          selector.should_receive(:select).with([socket], anything, anything, anything).and_return([nil, nil, nil])
+          selector.should_receive(:select).with([unblocker, socket], anything, anything, anything).and_return([nil, nil, nil])
           loop_body.tick
         end
 
@@ -748,7 +761,7 @@ module Ione
         it 'passes writable sockets as both readable and writable to the selector' do
           socket.stub(:connected?).and_return(true)
           socket.stub(:writable?).and_return(true)
-          selector.should_receive(:select).with([socket], [socket], anything, anything).and_return([nil, nil, nil])
+          selector.should_receive(:select).with([unblocker, socket], [socket], anything, anything).and_return([nil, nil, nil])
           loop_body.tick
         end
 
@@ -761,7 +774,7 @@ module Ione
 
         it 'filters out closed sockets' do
           socket.stub(:closed?).and_return(true)
-          selector.should_receive(:select).with([], [], anything, anything).and_return([nil, nil, nil])
+          selector.should_receive(:select).with([unblocker], [], anything, anything).and_return([nil, nil, nil])
           loop_body.tick
         end
 
@@ -805,7 +818,7 @@ module Ione
         end
 
         it 'allows the caller to specify a custom timeout' do
-          loop_body = described_class.new(selector: selector, clock: clock, tick_resolution: 99)
+          loop_body = described_class.new(unblocker, selector: selector, clock: clock, tick_resolution: 99)
           selector.should_receive(:select).with(anything, anything, anything, 99).and_return([[], [], []])
           loop_body.tick
         end
@@ -900,4 +913,4 @@ module IoReactorSpec
       @body.call(*args)
     end
   end
-end
+end

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

@@ -24,4 +24,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.3.0.pre0
+  version: 1.3.0.pre3
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies: []
 description: Reactive programming framework for Ruby, painless evented IO, futures
   and an efficient byte buffer
@@ -53,7 +53,7 @@ files:
 - spec/support/server_helper.rb
 homepage: http://github.com/iconara/ione
 licenses:
-- Apache License 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -70,27 +70,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Reactive programming framework for Ruby
 test_files:
-- spec/integration/io_spec.rb
-- spec/integration/ssl_spec.rb
-- spec/ione/byte_buffer_spec.rb
-- spec/ione/future_spec.rb
-- spec/ione/heap_spec.rb
+- spec/spec_helper.rb
+- spec/ione/io/ssl_acceptor_spec.rb
+- spec/ione/io/server_connection_spec.rb
+- spec/ione/io/ssl_server_connection_spec.rb
 - spec/ione/io/acceptor_spec.rb
-- spec/ione/io/connection_common.rb
 - spec/ione/io/connection_spec.rb
-- spec/ione/io/io_reactor_spec.rb
-- spec/ione/io/server_connection_spec.rb
-- spec/ione/io/ssl_acceptor_spec.rb
 - spec/ione/io/ssl_connection_spec.rb
-- spec/ione/io/ssl_server_connection_spec.rb
-- spec/spec_helper.rb
+- spec/ione/io/io_reactor_spec.rb
+- spec/ione/io/connection_common.rb
+- spec/ione/heap_spec.rb
+- spec/ione/byte_buffer_spec.rb
+- spec/ione/future_spec.rb
+- spec/integration/ssl_spec.rb
+- spec/integration/io_spec.rb
+- spec/support/server_helper.rb
 - spec/support/await_helper.rb
 - spec/support/fake_server.rb
-- spec/support/server_helper.rb
-has_rdoc: