Browse files

Make `ActiveSupport::OrderedHash` extractable when using `Array#extra…

…ct_options!`

`ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.
  • Loading branch information...
1 parent 4b39d4d commit d1a27013fc6501a185b05a4d8d1bff52ab3c012d @sikachu sikachu committed Sep 3, 2011
View
4 activesupport/CHANGELOG
@@ -1,3 +1,7 @@
+*Rails 3.1.1 (unreleased)*
+
+* ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! [Prem Sichanugrist]
+
*Rails 3.1.0 (August 30, 2011)*
* ActiveSupport::Dependencies#load and ActiveSupport::Dependencies#require now
View
5 activesupport/lib/active_support/ordered_hash.rb
@@ -47,6 +47,11 @@ def nested_under_indifferent_access
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'
View
5 activesupport/test/ordered_hash_test.rb
@@ -306,4 +306,9 @@ def test_invert
assert_equal expected, @ordered_hash.invert
assert_equal @values.zip(@keys), @ordered_hash.invert.to_a
end
+
+ def test_extractable
+ @ordered_hash[:rails] = "snowman"
+ assert_equal @ordered_hash, [1, 2, @ordered_hash].extract_options!
+ end
end

0 comments on commit d1a2701

Please sign in to comment.