ione 1.2.0.pre8 → 1.2.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7877b339794b199432492b1cdb1eee2661ea1cad
-  data.tar.gz: fed2cbd02eda48abd7aa225740de42b039bc56cc
+  metadata.gz: 269fc51bb786b26f473b2eec82fb37495832842e
+  data.tar.gz: 7c709b42991c6879f9a0cd1df579e31b158a0d32
 SHA512:
-  metadata.gz: 82a13a762739bb9302f600d1ea3061391432b8e8a98e294808dae0d12db7865dbeac989ead14c440cdc866e4dc29e6e2761a14eb7508d96d812147c03aa9db24
-  data.tar.gz: 81adb0b983ace8e30f8cd27bd0061e6e230dded1ef68d46632b7a5ca2f08d87132bb32197bcfeb6a4ba8f2da06c9f394515ee7a6d972f233b235b6176f78ac58
+  metadata.gz: 5e984ed67e16f8dcbcd10671e3033f911b17af68eb5cb2e11231c01dd4dd83fdaff70681e928100226dafbd7fb027ebe64bc20d178a3e216945ce7bd7134a9a2
+  data.tar.gz: 37dc89c4553b85de563ea94caffc8d07f555e622c1ab3d00170be9dfb6c47ae0d7c754ce6eac09a586eaff3040ad065db6a05e61eca35201737f6ab397a0b96c

data/lib/ione/heap.rb

@@ -5,6 +5,7 @@ module Ione
   class Heap
     def initialize
       @items = []
+      @indexes = {}
     end
 
     def size
@@ -16,8 +17,11 @@ module Ione
     end
 
     def push(item)
-      @items << item
-      bubble_up(@items.size - 1)
+      unless @indexes.include?(item)
+        @items << item
+        @indexes[item] = @items.size - 1
+        bubble_up(@items.size - 1)
+      end
     end
     alias_method :<<, :push
 
@@ -29,10 +33,14 @@ module Ione
       if @items.size == 0
         nil
       elsif @items.size == 1
-        @items.pop
+        item = @items.pop
+        @indexes.delete(item)
+        item
       else
         item = @items.first
+        @indexes.delete(item)
         @items[0] = @items.pop
+        @indexes[@items[0]] = 0
         bubble_down(0)
         item
       end
@@ -42,10 +50,14 @@ module Ione
       if item == @items.first
         pop
       elsif item == @items.last
-        @items.pop
-      elsif (i = index(item))
+        item = @items.pop
+        @indexes.delete(item)
+        item
+      elsif (i = @indexes[item])
         item = @items[i]
+        @indexes.delete(item)
         @items[i] = @items.pop
+        @indexes[@items[i]] = i
         bubble_up(bubble_down(i))
         item
       end
@@ -53,25 +65,14 @@ module Ione
 
     private
 
-    def index(item, root_index=0)
-      left_index = (root_index * 2) + 1
-      right_index = (root_index * 2) + 2
-      root_item = @items[root_index]
-      if root_item == item
-        root_index
-      elsif left_index < @items.length && item >= @items[left_index] && (i = index(item, left_index))
-        i
-      elsif right_index < @items.length && item >= @items[right_index] && (i = index(item, right_index))
-        i
-      end
-    end
-
     def bubble_up(index)
       parent_index = (index - 1)/2
       if parent_index >= 0 && @items[parent_index] > @items[index]
         item = @items[index]
         @items[index] = @items[parent_index]
         @items[parent_index] = item
+        @indexes[@items[index]] = index
+        @indexes[@items[parent_index]] = parent_index
         bubble_up(parent_index)
       else
         index
@@ -80,16 +81,18 @@ module Ione
 
     def bubble_down(index)
       child_index = (index * 2) + 1
-      if child_index >= @items.length
+      if child_index >= @items.size
         index
       else
-        if child_index + 1 < @items.length && @items[child_index] > @items[child_index + 1]
+        if child_index + 1 < @items.size && @items[child_index] > @items[child_index + 1]
           child_index += 1
         end
         if @items[index] > @items[child_index]
           item = @items[index]
           @items[index] = @items[child_index]
           @items[child_index] = item
+          @indexes[@items[index]] = index
+          @indexes[@items[child_index]] = child_index
           bubble_down(child_index)
         else
           index

data/lib/ione/version.rb

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

data/spec/ione/heap_spec.rb

@@ -43,13 +43,20 @@ module Ione
         heap.size.should == 4
       end
 
-      it 'is aliase as #<<' do
+      it 'is aliased as #<<' do
         heap << 4
         heap << 3
         heap << 6
         heap << 5
         heap.size.should == 4
       end
+
+      it 'does not add duplicates' do
+        heap << 3
+        heap << 3
+        heap << 3
+        heap.size.should == 1
+      end
     end
 
     describe '#peek' do
@@ -102,17 +109,6 @@ module Ione
         heap.pop.should == 3
         heap.pop.should be_nil
       end
-
-      it 'returns each duplicate' do
-        heap.push(3)
-        heap.push(4)
-        heap.push(3)
-        heap.push(3)
-        heap.pop.should == 3
-        heap.pop.should == 3
-        heap.pop.should == 3
-        heap.pop.should == 4
-      end
     end
 
     describe '#delete' do
@@ -168,15 +164,6 @@ module Ione
         heap.push(5)
         heap.delete(6).should be_nil
       end
-
-      it 'removes the first instance of the item from the heap' do
-        heap.push(3)
-        heap.push(3)
-        heap.push(5)
-        heap.delete(3).should == 3
-        heap.delete(3).should == 3
-        heap.size.should == 1
-      end
     end
   end
 end

metadata

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