hamster 0.1.6 → 0.1.7

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.7 / 2009-11-27
+
+* Implemented eql?/== for Hash and Set.
+
 === 0.1.6 / 2009-11-23
 
 * First cut at finishing implementation of Hash.

data/lib/hamster/hash.rb

@@ -54,7 +54,9 @@ module Hamster
 
     # Returns <tt>true</tt> if . <tt>eql?</tt> is synonymous with <tt>==</tt>
     def eql?(other)
-      equal?(other) || (self.class.equal?(other.class) && @trie.eql?(other.instance_eval{@trie}))
+      return true if equal?(other)
+      return false unless self.class.equal?(other.class)
+      return @trie.eql?(other.instance_eval{@trie})
     end
     alias :== :eql?
 

data/lib/hamster/set.rb

@@ -50,7 +50,9 @@ module Hamster
 
     # Returns <tt>true</tt> if . <tt>eql?</tt> is synonymous with <tt>==</tt>
     def eql?(other)
-      equal?(other) || (self.class.equal?(other.class) && @trie.eql?(other.instance_eval{@trie}))
+      return true if equal?(other)
+      return false unless self.class.equal?(other.class)
+      return @trie.eql?(other.instance_eval{@trie})
     end
     alias :== :eql?
 

data/lib/hamster/trie.rb

@@ -37,7 +37,7 @@ module Hamster
     def put(key, value)
       index = index_for(key)
       entry = @entries[index]
-      if !entry || entry.key_eql?(key)
+      if !entry || entry.key.eql?(key)
         entries = @entries.dup
         entries[index] = Entry.new(key, value)
         self.class.new(@significant_bits, entries, @children)
@@ -57,7 +57,7 @@ module Hamster
     def get(key)
       index = index_for(key)
       entry = @entries[index]
-      if entry && entry.key_eql?(key)
+      if entry && entry.key.eql?(key)
         entry
       else
         child = @children[index]
@@ -69,12 +69,20 @@ module Hamster
 
     # Returns a copy of <tt>self</tt> with the given key (and associated value) removed. If not found, returns <tt>self</tt>.
     def remove(key)
-      xxx(key) || Trie.new(@significant_bits)
+      find_and_remove(key) || Trie.new(@significant_bits)
+    end
+
+    def include?(key, value)
+      entry = get(key)
+      entry && value.eql?(entry.value)
     end
 
     # Returns <tt>true</tt> if . <tt>eql?</tt> is synonymous with <tt>==</tt>
     def eql?(other)
-      false
+      return true if equal?(other)
+      return false unless self.class.equal?(other.class) && self.size == other.size
+      each { |entry| return false unless other.include?(entry.key, entry.value) }
+      true
     end
     alias :== :eql?
 
@@ -89,15 +97,15 @@ module Hamster
     # Returns a replacement instance after removing the specified key.
     # If not found, returns <tt>self</tt>.
     # If empty, returns <tt>nil</tt>.
-    def xxx(key)
+    def find_and_remove(key)
       index = index_for(key)
       entry = @entries[index]
-      if entry && entry.key_eql?(key)
+      if entry && entry.key.eql?(key)
         return remove_at(index)
       else
         child = @children[index]
         if child
-          copy = child.xxx(key)
+          copy = child.find_and_remove(key)
           if !copy.equal?(child)
             children = @children.dup
             children[index] = copy
@@ -141,10 +149,6 @@ module Hamster
         @value = value
       end
 
-      def key_eql?(key)
-        @key.eql?(key)
-      end
-
     end
 
   end

data/lib/hamster/version.rb

@@ -1,5 +1,5 @@
 module Hamster
 
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.7".freeze
 
 end

data/spec/hamster/hash/eql_spec.rb

@@ -10,20 +10,22 @@ describe Hamster::Hash do
     end
 
     it "is true for two empty instances" do
-      pending do
-        Hamster::Hash.new.should eql(Hamster::Hash.new)
-      end
+      Hamster::Hash.new.should eql(Hamster::Hash.new)
     end
 
     it "is true for two instances with the same key/value pairs" do
-      pending do
-        a = Hamster::Hash.new.put("a", "Aye").put("b", "Bee").put("c", "See")
-        b = Hamster::Hash.new.put("a", "Aye").put("b", "Bee").put("c", "See")
-        a.should eql(b)
-      end
+      a = Hamster::Hash.new.put("a", "Aye").put("b", "Bee").put("c", "See")
+      b = Hamster::Hash.new.put("a", "Aye").put("b", "Bee").put("c", "See")
+      a.should eql(b)
     end
 
     it "is false for two instances with different key/value pairs" do
+      a = Hamster::Hash.new.put("a", "Aye").put("b", "Bee").put("c", "See")
+      b = Hamster::Hash.new.put("a", "Aye").put("b", "Bee").put("d", "Dee")
+      a.should_not eql(b)
+    end
+
+    it "is false for two instances with different numbers of overlapping key/value pairs" do
       a = Hamster::Hash.new.put("a", "Aye").put("b", "Bee").put("c", "See")
       b = Hamster::Hash.new.put("a", "Aye").put("b", "Bee")
       a.should_not eql(b)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hamster
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Simon Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +11:00
+date: 2009-11-28 00:00:00 +11:00
 default_executable: 
 dependencies: []