Fixed ActiveSupport::OrderedHash #delete_if, #reject!, and #reject, which did not sync the @keys after the operation.

This probably holds true for other mutating methods as well.

Signed-off-by: Michael Koziarski <michael@koziarski.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 1ed7737017..fa68db5604 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -25,6 +25,25 @@ module ActiveSupport
         super
       end
 
+      def delete_if
+        super
+        sync_keys!
+        self
+      end
+
+      def reject!
+        super
+        sync_keys!
+        self
+      end
+
+      def reject(&block)
+        dup.reject!(&block)
+      end
+
+      alias_method :super_keys, :keys
+      private :super_keys
+
       def keys
         @keys
       end
@@ -48,6 +67,12 @@ module ActiveSupport
       def each
         keys.each {|key| yield [key, self[key]]}
       end
+
+      private
+
+      def sync_keys!
+        (@keys - super_keys).each { |k| @keys.delete(k) }
+      end
     end
   end
 end