Fixed OrderedHash key deletion.

lib/mongo/util/ordered_hash.rb

@@ -63,6 +63,24 @@ class OrderedHash < Hash
     str << '}'
   end
 
+  def delete(key, &block)
+    @ordered_keys.delete(key)
+    super
+  end
+
+  def delete_if(&block)
+    self.each { |k,v|
+      if yield k, v
+        delete(k)
+      end
+    }
+  end
+
+  def clear
+    super
+    @ordered_keys = []
+  end
+
   end                           # Ruby before 1.9
 
 end

tests/test_ordered_hash.rb

@@ -82,4 +82,21 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal '{"c"=>1, "a"=>2, "z"=>3}', @oh.inspect
   end
 
+  def test_clear
+    @oh.clear
+    assert @oh.keys.empty?
+  end
+
+  def test_delete
+    assert @oh.keys.include?('z')
+    @oh.delete('z')
+    assert !@oh.keys.include?('z')
+  end
+
+  def test_delete_if
+    assert @oh.keys.include?('z')
+    @oh.delete_if { |k,v| k == 'z' }
+    assert !@oh.keys.include?('z')
+  end
+
 end