ione 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 941fc3fd59d15b806854ddd8ff0f30f645ff51bf
-  data.tar.gz: 1b89b672b8b69eda9561138190aed7d35d677538
+  metadata.gz: c3ef9ccb78957f99a401f9d3808fa74ea940ff17
+  data.tar.gz: 081d0432ba2a6960d84ee527c9ff10474b4ce31e
 SHA512:
-  metadata.gz: f26209edcf366c70ac80a913901f4c6db5a7a15e2e4a9c53e0d73f99b9d1e25e98bd4f0533dc4e88d3ec846abd538b6f80cb9d877ae547091a363121d1a05992
-  data.tar.gz: 6c5565772dd3994caac71ffd2a63cf25f2c595161eeb501928050123c59b5579cf1d5a45ac4a0e585ca15fd9c82b9c7f1253135c2e6f74cf0e9569a89e66d1dc
+  metadata.gz: 8c4624c05b932671afdd0c8406e345cd3476bfad89b2118fabf3ce4101ba3849dc98ad0f32168c7c8b255c0f20bec9961d016f469a516dae20db7792294829ca
+  data.tar.gz: 6a1ec1a33dbdb4f9bdaf0faffd68e4e23019763ab4a3a90e232144ebea228eff1d865ec6094b323b908fc63e419c993cb02183acb39f7f5d5632dc735ab3b0f7

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
@@ -874,64 +879,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 +937,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/io_reactor.rb

@@ -124,7 +124,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

data/lib/ione/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Ione
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
 end

data/spec/ione/byte_buffer_spec.rb

@@ -354,6 +354,20 @@ module Ione
         buffer.append(' baz baz')
         buffer.index('baz', 8).should == 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
+      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
 
     context 'when reading and appending' do

data/spec/ione/future_spec.rb

@@ -916,6 +916,12 @@ module Ione
         future.value.should == 6
       end
 
+      it 'handles a really long list of futures' do
+        futures = Array.new(10000, Future.resolved(1))
+        future = Future.reduce(futures, 0, &:+)
+        future.value.should eq(10000)
+      end
+
       context 'when the :ordered option is false' do
         it 'calls the block with the values in the order of completion, when the :ordered option is false' do
           promises = [Promise.new, Promise.new, Promise.new]
@@ -949,6 +955,12 @@ module Ione
           future.should be_failed
         end
 
+        it 'handles a really long list of futures' do
+          futures = Array.new(10000, Future.resolved(1))
+          future = Future.reduce(futures, 0, ordered: false, &:+)
+          future.value.should eq(10000)
+        end
+
         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

data/spec/ione/io/io_reactor_spec.rb

@@ -93,6 +93,7 @@ module Ione
           end
 
           it 'restarts the reactor even when restarted before a failed stop' do
+            pending 'This test is broken in JRuby' if RUBY_ENGINE == 'jruby'
             barrier = Queue.new
             selector.handler do
               if barrier.pop == :fail
@@ -171,12 +172,27 @@ module Ione
           reactor.stop.value.should equal(reactor)
         end
 
-        it 'is not running after being stopped' do
+        it 'is not running after stop completed' do
           reactor.start.value
           reactor.stop.value
           reactor.should_not be_running
         end
 
+        it 'keeps running until stop completed' do
+          running_barrier = Queue.new
+          stop_barrier = Queue.new
+          selector.handler do
+            running_barrier.push(nil)
+            stop_barrier.pop
+            [[], [], []]
+          end
+          reactor.start.value
+          future = reactor.stop
+          running_barrier.pop
+          reactor.should be_running
+          stop_barrier.push(nil) until future.completed?
+        end
+
         it 'closes all sockets' do
           reactor.start.value
           connection = reactor.connect('example.com', 9999, 5).value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies: []
 description: Reactive programming framework for Ruby, painless evented IO, futures
   and an efficient byte buffer