Hash compares

topazproject · May 17, 2013 · cd9064e · cd9064e
1 parent 4b12dbf
commit cd9064e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 27 deletions.
diff --git a/lib-topaz/hash.rb b/lib-topaz/hash.rb
@@ -60,21 +60,27 @@ def to_a
   end
 
   def ==(other)
-    if self.equal?(other)
-      return true
-    end
-    if !other.kind_of?(Hash)
-      return false
-    end
-    if self.size != other.size
-      return false
+    return true if self.equal?(other)
+    return false unless other.kind_of?(Hash)
+    return false unless self.size == other.size
+    Thread.current.recursion_guard(:hash_compare, self) do
+      self.each do |key, value|
+        return false unless other.has_key?(key) && value == other[key]
+      end
     end
-    self.each do |key, value|
-      if !other.has_key?(key) || other[key] != value
-        return false
+    true
+  end
+
+  def eql?(other)
+    return true if self.equal?(other)
+    return false unless other.kind_of?(Hash)
+    return false unless self.size == other.size
+    Thread.current.recursion_guard(:hash_eql, self) do
+      self.each do |key, value|
+        return false unless other.has_key?(key) && value.eql?(other[key])
       end
     end
-    return true
+    true
   end
 
   def merge!(other, &block)

diff --git a/spec/tags/core/hash/eql_tags.txt b/spec/tags/core/hash/eql_tags.txt
diff --git a/spec/tags/core/hash/equal_value_tags.txt b/spec/tags/core/hash/equal_value_tags.txt
diff --git a/spec/tags/core/hash/merge_tags.txt b/spec/tags/core/hash/merge_tags.txt
diff --git a/spec/tags/core/hash/reject_tags.txt b/spec/tags/core/hash/reject_tags.txt