RUBY-265 semantics should == Hash#reject!

mongodb · Apr 15, 2011 · af6552e · af6552e
1 parent d0a4483
commit af6552e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/bson/ordered_hash.rb b/lib/bson/ordered_hash.rb
@@ -125,11 +125,11 @@ def delete(key, &block)
       end
 
       def delete_if(&block)
-        self.each { |k,v|
+        self.each do |k,v|
           if yield k, v
             delete(k)
           end
-        }
+        end
       end
 
       def reject(&block)
@@ -139,7 +139,14 @@ def reject(&block)
       end
 
       def reject!(&block)
-        delete_if(&block)
+        changed = false
+        self.each do |k,v|
+          if yield k, v
+            changed = true
+            delete(k)
+          end
+        end
+        changed ? self : nil
       end
 
       def clear

diff --git a/test/bson/ordered_hash_test.rb b/test/bson/ordered_hash_test.rb
@@ -189,7 +189,8 @@ def test_reject
 
   def test_reject_bang
     @oh.reject! { |k, v| k == 'z' }
-    assert !@ok.keys.include?('z')
+    assert !@oh.keys.include?('z')
+    assert_nil @oh.reject! { |k, v| k == 'z' }
   end
 
   def test_clone