Protect against Ruby Hash regression

Author: samantharitter

lib/bson/ordered_hash.rb

@@ -41,6 +41,16 @@ def extractable_options?
       instance_of?(BSON::OrderedHash)
     end
 
+    def reject(&block)
+      return to_enum(:reject) unless block_given?
+      dup.tap {|hash| hash.reject!(&block)}
+    end
+
+    def select(&block)
+      return to_enum(:select) unless block_given?
+      dup.tap {|hash| hash.reject!{|k, v| ! yield k,v}}
+    end
+
     # We only need the body of this class if the RUBY_VERSION is before 1.9
     if RUBY_VERSION < '1.9'
       attr_accessor :ordered_keys
@@ -142,21 +152,16 @@ def delete_if(&block)
         self
       end
 
-      def reject(&block)
-        clone = self.clone
-        return clone unless block_given?
-        clone.delete_if(&block)
-      end
-
       def reject!(&block)
-        changed = false
-        self.each do |k,v|
-          if yield k, v
-            changed = true
-            delete(k)
+        return to_enum(:reject!) unless block_given?
+        raise "can't modify frozen BSON::OrderedHash" if frozen?
+        keys = @ordered_keys.dup
+        @ordered_keys.each do |k|
+          if yield k, self[k]
+            keys.delete(k)
           end
         end
-        changed ? self : nil
+        keys == @ordered_keys ? nil : @ordered_keys = keys
       end
 
       def clear

lib/bson/support/hash_with_indifferent_access.rb

@@ -49,6 +49,16 @@ def self.new_from_hash_copying_default(hash)
       end
     end
 
+    def reject(&block)
+      return to_enum(:reject) unless block_given?
+      dup.tap {|hash| hash.reject!(&block)}
+    end
+
+    def select(&block)
+      return to_enum(:select) unless block_given?
+      dup.tap {|hash| hash.reject!{|k, v| ! yield k, v}}
+    end
+    
     alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
     alias_method :regular_update, :update unless method_defined?(:regular_update)