Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Hash is ordered in Ruby 1.9

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit fba05826dc0433e177e8cf72b9ef12878fd97586 1 parent aa04635
@jeremy jeremy authored
Showing with 22 additions and 17 deletions.
  1. +22 −17 activesupport/lib/active_support/ordered_options.rb
View
39 activesupport/lib/active_support/ordered_options.rb
@@ -1,26 +1,31 @@
# OrderedHash is namespaced to prevent conflicts with other implementations
module ActiveSupport
- class OrderedHash < Array #:nodoc:
- def []=(key, value)
- if pair = assoc(key)
- pair.pop
- pair << value
- else
- self << [key, value]
+ # Hash is ordered in Ruby 1.9!
+ if RUBY_VERSION >= '1.9'
+ OrderedHash = ::Hash
+ else
+ class OrderedHash < Array #:nodoc:
+ def []=(key, value)
+ if pair = assoc(key)
+ pair.pop
+ pair << value
+ else
+ self << [key, value]
+ end
end
- end
- def [](key)
- pair = assoc(key)
- pair ? pair.last : nil
- end
+ def [](key)
+ pair = assoc(key)
+ pair ? pair.last : nil
+ end
- def keys
- collect { |key, value| key }
- end
+ def keys
+ collect { |key, value| key }
+ end
- def values
- collect { |key, value| value }
+ def values
+ collect { |key, value| value }
+ end
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.