aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/duration.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-12-15 02:30:17 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-12-15 02:30:17 +0000
commit6743504ba2091d180f8f9318bec4d97d6ab347c3 (patch)
treed9d4d50b7d1f3e31ca9203532f0eb34985117a7b /activesupport/lib/active_support/duration.rb
parent3df9fb53acb7b2fb445ba197da7340cfdf4fc78c (diff)
downloadrails-6743504ba2091d180f8f9318bec4d97d6ab347c3.tar.gz
rails-6743504ba2091d180f8f9318bec4d97d6ab347c3.tar.bz2
rails-6743504ba2091d180f8f9318bec4d97d6ab347c3.zip
Revert const_missing bypass in favor of Duration constant lookup tweak
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8412 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/duration.rb')
-rw-r--r--activesupport/lib/active_support/duration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index cbee4fd0ca..82b38e79b5 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -64,7 +64,7 @@ module ActiveSupport
alias :until :ago
def inspect #:nodoc:
- consolidated = parts.inject(Hash.new(0)) { |h,part| h[part.first] += part.last; h }
+ consolidated = parts.inject(::Hash.new(0)) { |h,part| h[part.first] += part.last; h }
[:years, :months, :days, :minutes, :seconds].map do |length|
n = consolidated[length]
"#{n} #{n == 1 ? length.to_s.singularize : length.to_s}" if n.nonzero?