ione 1.2.2 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 941fc3fd59d15b806854ddd8ff0f30f645ff51bf
-  data.tar.gz: 1b89b672b8b69eda9561138190aed7d35d677538
+SHA256:
+  metadata.gz: 9c062de288365ad9e47516ad7b9d3ab028ab9449964c88675c0b913657a8ef07
+  data.tar.gz: f349d422d1df3001a9c5fb5df55c329ed60cebc9dad20ddf1a97f52883c53093
 SHA512:
-  metadata.gz: f26209edcf366c70ac80a913901f4c6db5a7a15e2e4a9c53e0d73f99b9d1e25e98bd4f0533dc4e88d3ec846abd538b6f80cb9d877ae547091a363121d1a05992
-  data.tar.gz: 6c5565772dd3994caac71ffd2a63cf25f2c595161eeb501928050123c59b5579cf1d5a45ac4a0e585ca15fd9c82b9c7f1253135c2e6f74cf0e9569a89e66d1dc
+  metadata.gz: 4523ab1052502a8da1879f73481f8326b260b478d71c7e9d882b264e2c274092ae0801a43c5884492ea06fd69dd3ac02ab184ef309dbcf1cf5b8d441f37e8bd6
+  data.tar.gz: 1e5d1c7f51593988a2270ec4c6b74cd61d72a1dd2c6a69d5c6f4b2053052aa4ee3bd52375c4e419d423110bd70994350662a61850907570db47ea45c24a7575b

data/lib/ione/byte_buffer.rb

@@ -179,10 +179,12 @@ module Ione
         swap_buffers
       end
       read_buffer_length = @read_buffer.bytesize
-      if start_index < read_buffer_length - @offset && (index = @read_buffer.index(substring, @offset + start_index))
+      if start_index + substring.bytesize <= read_buffer_length - @offset && (index = @read_buffer.index(substring, @offset + start_index))
         index - @offset
-      elsif (index = @write_buffer.index(substring, start_index - read_buffer_length + @offset))
-        index + read_buffer_length - @offset
+      elsif start_index + substring.bytesize <= read_buffer_length - @offset + @write_buffer.bytesize
+        merge_read_buffer
+        start_index = read_buffer_length - substring.bytesize if read_buffer_length - substring.bytesize > start_index
+        @read_buffer.index(substring, start_index)
       else
         nil
       end
@@ -298,5 +300,11 @@ module Ione
       @read_buffer = @write_buffer
       @write_buffer = ''
     end
+
+    def merge_read_buffer
+      @read_buffer = @read_buffer[@offset, @read_buffer.length - @offset] << @write_buffer
+      @write_buffer = ''
+      @offset = 0
+    end
   end
 end

data/lib/ione/future.rb

@@ -209,6 +209,8 @@ module Ione
         end
         if futures.count == 0
           resolved([])
+        elsif (failed = futures.find { |f| f.respond_to?(:failed?) && f.failed? })
+          failed
         else
           CombinedFuture.new(futures)
         end
@@ -231,6 +233,7 @@ module Ione
         if futures.size == 1 && (fs = futures.first).is_a?(Enumerable)
           *futures = *fs
         end
+        futures.reject! { |f| f.respond_to?(:resolved?) && f.resolved? }
         if futures.count == 0
           ResolvedFuture::NIL
         elsif futures.count == 1
@@ -262,7 +265,9 @@ module Ione
           futures = fs
         end
         if futures.count == 0
-          resolved
+          ResolvedFuture::NIL
+        elsif (done = futures.find { |f| f.respond_to?(:resolved?) && f.resolved? })
+          done
         else
           FirstFuture.new(futures)
         end
@@ -594,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,
@@ -854,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
@@ -874,64 +881,56 @@ module Ione
     def initialize(futures, initial_value, reducer)
       super()
       @futures = Array(futures)
-      @remaining = @futures.size
-      @initial_value = initial_value
-      @accumulator = initial_value.nil? ? NO_INITIAL_VALUE : initial_value
+      @initial_value = initial_value.nil? ? NO_INITIAL_VALUE : initial_value
       @reducer = reducer
     end
-
-    private
-
-    def reduce_one(value)
-      unless failed?
-        @lock.lock
-        begin
-          if @accumulator.equal?(NO_INITIAL_VALUE)
-            @accumulator = value
-          else
-            @accumulator = @reducer.call(@accumulator, value)
-          end
-          @remaining -= 1
-        rescue => e
-          @lock.unlock
-          fail(e)
-        else
-          @lock.unlock
-        end
-        unless failed?
-          if @remaining == 0
-            resolve(@accumulator)
-            :done
-          else
-            :continue
-          end
-        end
-      end
-    end
   end
 
   # @private
   class OrderedReducingFuture < ReducingFuture
     def initialize(futures, initial_value, reducer)
       super
-      if @remaining > 0
-        reduce_next(0)
+      if @futures.empty?
+        resolve(@initial_value.equal?(NO_INITIAL_VALUE) ? nil : @initial_value)
+      elsif @initial_value.equal?(NO_INITIAL_VALUE)
+        @futures.shift.on_complete(&method(:reduce_next))
       else
-        resolve(@initial_value)
+        reduce_next(@initial_value, nil)
       end
     end
 
     private
 
-    def reduce_next(i)
-      @futures[i].on_complete do |v, e|
-        unless failed?
-          if e
-            fail(e)
-          elsif reduce_one(v) == :continue
-            reduce_next(i + 1)
+    def reduce_next(accumulator, e)
+      if e
+        @futures = nil
+        fail(e)
+      elsif @futures.empty?
+        @futures = nil
+        resolve(accumulator)
+      else
+        outer = Thread.current
+        looping = more = true
+        while more
+          more = false
+          @futures.shift.on_complete do |v, ee|
+            if ee
+              reduce_next(nil, ee)
+            else
+              begin
+                accumulator = @reducer.call(accumulator, v)
+                if @futures.empty? || !looping || !Thread.current.equal?(outer)
+                  reduce_next(accumulator, nil)
+                else
+                  more = true
+                end
+              rescue => eee
+                reduce_next(nil, eee)
+              end
+            end
           end
         end
+        looping = false
       end
     end
   end
@@ -940,20 +939,37 @@ module Ione
   class UnorderedReducingFuture < ReducingFuture
     def initialize(futures, initial_value, reducer)
       super
-      if @remaining > 0
-        futures.each do |f|
+      if @futures.empty?
+        resolve(@initial_value.equal?(NO_INITIAL_VALUE) ? nil : @initial_value)
+      else
+        accumulator = @initial_value
+        remaining = @futures.size
+        @futures.each do |f|
           f.on_complete do |v, e|
             unless failed?
               if e
                 fail(e)
               else
-                reduce_one(v)
+                done = false
+                @lock.lock
+                begin
+                  accumulator = accumulator.equal?(NO_INITIAL_VALUE) ? v : @reducer.call(accumulator, v)
+                  remaining -= 1
+                  done = (remaining == 0)
+                rescue => ee
+                  @lock.unlock
+                  fail(ee)
+                else
+                  @lock.unlock
+                end
+                if done
+                  @futures = nil
+                  resolve(accumulator)
+                end
               end
             end
           end
         end
-      else
-        resolve(@initial_value)
       end
     end
   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,8 +95,9 @@ module Ione
         @clock = options[:clock] || Time
         @state = PENDING_STATE
         @error_listeners = []
+        @unblocker = nil
         @io_loop = IoLoopBody.new(@options)
-        @scheduler = Scheduler.new
+        @scheduler = Scheduler.new(@options)
         @lock = Mutex.new
       end
 
@@ -124,7 +125,7 @@ module Ione
       # after {#stop} has been called, but false when the future returned by
       # {#stop} completes.
       def running?
-        @state == RUNNING_STATE
+        (state = @state) == RUNNING_STATE || state == STOPPING_STATE
       end
 
       # Starts the reactor. This will spawn a background thread that will manage
@@ -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
@@ -604,4 +605,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.2.2'.freeze
+  VERSION = '1.2.5'.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,7 +352,21 @@ 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 eq(3)
+      end
+
+      it 'returns nil when the substring does not fit in the search space' do
+        buffer.append('foo')
+        buffer.read(1)
+        buffer.append('bar')
+        buffer.index('bar', 3).should be_nil
       end
     end