diff options
author | José Valim <jose.valim@gmail.com> | 2011-09-03 01:25:44 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-09-03 01:25:44 -0700 |
commit | d50c0acc95d9ac9b258594c7d68e1eeef9b6d41e (patch) | |
tree | 635b66122692178c86cdbf3560d752f7eb757f85 /activesupport | |
parent | 5912ed99029f76b3ec51955f05323b77fa0b22f2 (diff) | |
parent | 9984266c041e1079a09140f9307fc1ca13858988 (diff) | |
download | rails-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')
-rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
-rw-r--r-- | activesupport/lib/active_support/ordered_hash.rb | 5 | ||||
-rw-r--r-- | activesupport/test/ordered_hash_test.rb | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 3508ec0f34..18164234a5 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *Rails 3.2.0 (unreleased)* +* ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! [Prem Sichanugrist] + * Added Array#prepend as an alias for Array#unshift and Array#append as an alias for Array#<< [DHH] * The definition of blank string for Ruby 1.9 has been extended to Unicode whitespace. 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' diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb index bf851dbcbc..0b5f912dc4 100644 --- a/activesupport/test/ordered_hash_test.rb +++ b/activesupport/test/ordered_hash_test.rb @@ -329,4 +329,9 @@ class OrderedHashTest < Test::Unit::TestCase 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 |