Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" (closes #5611) [pjhyett@gmail.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4674 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 21 insertions, 5 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index f5a41251b3..4bcc860e09 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
+
 * Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
 
 * Make controller_path available as an instance method.  #5724 [jmckible@gmail.com]
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 4920763b50..7c65b0db39 100755
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -39,11 +39,15 @@ module ActionView
               else             '1 minute'
             end
                                 
-          when 2..45      then "#{distance_in_minutes} minutes"
-          when 46..90     then 'about 1 hour'
-          when 90..1440   then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
-          when 1441..2880 then '1 day'
-          else                 "#{(distance_in_minutes / 1440).round} days"
+          when 2..45           then "#{distance_in_minutes} minutes"
+          when 46..90          then 'about 1 hour'
+          when 90..1440        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
+          when 1441..2880      then '1 day'
+          when 2881..43220     then "#{(distance_in_minutes / 1440).round} days"
+          when 43201..86400    then 'about 1 month'
+          when 86401..525960   then "#{(distance_in_minutes / 43200).round} months"
+          when 525961..1051920 then 'about 1 year'
+          else                      "over #{(distance_in_minutes / 525600).round} years"
         end
       end
       
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 0e838c07cf..a3010fa7f8 100755
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -18,6 +18,16 @@ class DateHelperTest < Test::Unit::TestCase
     assert_equal "about 3 hours", distance_of_time_in_words(from, Time.mktime(2004, 3, 7, 0, 41))
     assert_equal "about 4 hours", distance_of_time_in_words(from, Time.mktime(2004, 3, 7, 1, 20))
     assert_equal "2 days", distance_of_time_in_words(from, Time.mktime(2004, 3, 9, 15, 40))
+    
+    # test greater date separation
+    assert_equal "29 days", distance_of_time_in_words(from, Time.mktime(2004, 4, 5, 21, 41, 18))
+    assert_equal "about 1 month", distance_of_time_in_words(from, Time.mktime(2004, 4, 6, 21, 41, 18))
+    assert_equal "about 1 month", distance_of_time_in_words(from, Time.mktime(2004, 4, 7, 21, 41, 18))
+    assert_equal "2 months", distance_of_time_in_words(from, Time.mktime(2004, 5, 6, 21, 41, 18))
+    assert_equal "11 months", distance_of_time_in_words(from, Time.mktime(2005, 2, 6, 21, 41, 18))
+    assert_equal "about 1 year", distance_of_time_in_words(from, Time.mktime(2005, 4, 6, 21, 41, 18))
+    assert_equal "about 1 year", distance_of_time_in_words(from, Time.mktime(2005, 4, 12, 21, 41, 18))
+    assert_equal "over 2 years", distance_of_time_in_words(from, Time.mktime(2006, 4, 6, 21, 41, 18))
 
     # include seconds 
     assert_equal "less than a minute", distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 41, 19), false)