aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-09-03 01:25:44 -0700
committerJosé Valim <jose.valim@gmail.com>2011-09-03 01:25:44 -0700
commitd50c0acc95d9ac9b258594c7d68e1eeef9b6d41e (patch)
tree635b66122692178c86cdbf3560d752f7eb757f85 /activesupport/lib
parent5912ed99029f76b3ec51955f05323b77fa0b22f2 (diff)
parent9984266c041e1079a09140f9307fc1ca13858988 (diff)
downloadrails-d50c0acc95d9ac9b258594c7d68e1eeef9b6d41e.tar.gz
rails-d50c0acc95d9ac9b258594c7d68e1eeef9b6d41e.tar.bz2
rails-d50c0acc95d9ac9b258594c7d68e1eeef9b6d41e.zip
Merge pull request #2827 from sikachu/extractable_ordered_hash
Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/ordered_hash.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 7f70628933..0264133581 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -47,6 +47,11 @@ module ActiveSupport
self
end
+ # Returns true to make sure that this hash is extractable via <tt>Array#extract_options!</tt>
+ def extractable_options?
+ true
+ end
+
# Hash is ordered in Ruby 1.9!
if RUBY_VERSION < '1.9'