ione 1.2.0.pre6 → 1.2.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 580012a6e7c6d917610532fc3fbd917ab9cd7a50
-  data.tar.gz: e5deb87d0deebb5d4cc9d3a1b516b672ef6848a5
+  metadata.gz: 9f489ef2fde881a219194d545c1c2ab5a80f3647
+  data.tar.gz: d6f2e0f0a5ae218c71a895c03b3635d74ef8c6cd
 SHA512:
-  metadata.gz: 5760948be8fe0975500e3f673ffc0b4b4be1ed04aaccbfc44bc4535c668c1d7fec678a2fd498e608fd642a9e6e7354df4e01863f632afff471c4e70b57b6d895
-  data.tar.gz: e912eadf89022cb82d6f65726d1f48ccd8f17c1b434eb0a70dc783adef9407941331830ddc3898fb206e84b34aa300f0ed1b86115e98b684bc20544d38caa36b
+  metadata.gz: 3d552c79337732c614279c4c531b42a20043f16949869a2587666b04cf59c4713ea85fbc09b2f6aa117f3706574c42168577db24db431d8528a5b13784064625
+  data.tar.gz: 6b807b0167c0f7aef38520fa181d2d391f046b5cf4faeaaa68fc1a3ba12f88a14ac1427bde9da9e4eac8f6168febdf5ad90eb2e8f24995ecf8301c4ae13340d9

data/lib/ione/future.rb

@@ -109,10 +109,14 @@ module Ione
     #   can be a splatted array or a regular array passed as sole argument)
     # @return [Ione::Future] a future which represents the first completing future
     def first(*futures)
-      return resolved if futures.empty?
-      futures = futures.size == 1 && futures.first.is_a?(Enumerable) ? futures.first : futures
-      return futures.first if futures.is_a?(Array) && futures.size == 1
-      FirstFuture.new(futures)
+      if futures.size == 1 && (fs = futures.first).is_a?(Enumerable)
+        futures = fs
+      end
+      if futures.count == 0
+        resolved
+      else
+        FirstFuture.new(futures)
+      end
     end
 
     # Takes calls the block once for each element in an array, expecting each
@@ -131,7 +135,7 @@ module Ione
     # @return [Ione::Future] a future that will resolve to an array of the values
     #   of the futures returned by the block
     def traverse(values, &block)
-      all(*values.map(&block))
+      all(values.map(&block))
     rescue => e
       failed(e)
     end

data/lib/ione/heap.rb

@@ -39,12 +39,14 @@ module Ione
     end
 
     def delete(item)
-      if item == @items[0]
+      if item == @items.first
         pop
+      elsif item == @items.last
+        @items.pop
       elsif (i = index(item))
         item = @items[i]
         @items[i] = @items.pop
-        bubble_down(i)
+        bubble_up(bubble_down(i))
         item
       end
     end
@@ -71,12 +73,16 @@ module Ione
         @items[index] = @items[parent_index]
         @items[parent_index] = item
         bubble_up(parent_index)
+      else
+        index
       end
     end
 
     def bubble_down(index)
       child_index = (index * 2) + 1
-      unless child_index >= @items.length
+      if child_index >= @items.length
+        index
+      else
         if child_index + 1 < @items.length && @items[child_index] > @items[child_index + 1]
           child_index += 1
         end
@@ -85,6 +91,8 @@ module Ione
           @items[index] = @items[child_index]
           @items[child_index] = item
           bubble_down(child_index)
+        else
+          index
         end
       end
     end

data/lib/ione/io/io_reactor.rb

@@ -255,6 +255,7 @@ module Ione
       def initialize
         @out, @in = IO.pipe
         @lock = Mutex.new
+        @state = :open
       end
 
       def connected?
@@ -270,21 +271,31 @@ module Ione
       end
 
       def closed?
-        @in.nil?
+        @state == :closed
       end
 
       def unblock
-        @lock.lock
-        @in.write(PING_BYTE)
-      ensure
-        @lock.unlock
+        unless closed?
+          @lock.lock
+          begin
+            @in.write(PING_BYTE)
+          ensure
+            @lock.unlock
+          end
+        end
       end
 
       def read
-        @out.read_nonblock(2**16)
+        unless closed?
+          @out.read_nonblock(2**16)
+        end
       end
 
       def close
+        @lock.synchronize do
+          return if @state == :closed
+          @state = :closed
+        end
         @in.close
         @out.close
         @in = nil
@@ -302,7 +313,6 @@ module Ione
       private
 
       PING_BYTE = "\0".freeze
-      DEFAULT_CONNECT_OPTIONS = {:timeout => 5}.freeze
     end
 
     # @private
@@ -326,7 +336,7 @@ module Ione
       end
 
       def to_s
-        "#<Timer @time=#{@time}>"
+        "#<#{self.class.name}:#{object_id} @time=#{@time.to_f}>"
       end
       alias_method :inspect, :to_s
     end

data/lib/ione/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Ione
-  VERSION = '1.2.0.pre6'.freeze
+  VERSION = '1.2.0.pre7'.freeze
 end

data/spec/ione/heap_spec.rb

@@ -133,6 +133,28 @@ module Ione
         heap.size.should == 2
       end
 
+      it 'removes the last item from the heap' do
+        heap.push(1)
+        heap.push(2)
+        heap.push(3)
+        heap.delete(3).should_not be_nil
+        heap.delete(3).should be_nil
+        heap.delete(2).should_not be_nil
+        heap.delete(2).should be_nil
+      end
+
+      it 'correctly re-heapifies the heap after a delete' do
+        heap.push(2)
+        heap.push(6)
+        heap.push(7)
+        heap.push(8)
+        heap.push(9)
+        heap.push(3)
+        heap.push(4)
+        heap.delete(8).should_not be_nil
+        heap.delete(4).should_not be_nil
+      end
+
       it 'returns the item' do
         heap.push(3)
         heap.push(4)

metadata

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