Introduce :almost keyword for distance_of_time_in_words. Make 1.75 days - 2 days return '2 days'.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3266 state:committed]

2 files changed, 37 insertions, 21 deletions

diff --git a/actionpack/test/template/date_helper_i18n_test.rb b/actionpack/test/template/date_helper_i18n_test.rb
index bc011f59b8..b69a449617 100644
--- a/actionpack/test/template/date_helper_i18n_test.rb
+++ b/actionpack/test/template/date_helper_i18n_test.rb
@@ -20,15 +20,16 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
       [60.seconds, true]  => [:'x_minutes',           1],
 
       # without include_seconds
-      [29.seconds, false] => [:'less_than_x_minutes', 1],
-      [60.seconds, false] => [:'x_minutes',           1],
-      [44.minutes, false] => [:'x_minutes',           44],
-      [61.minutes, false] => [:'about_x_hours',       1],
-      [24.hours,   false] => [:'x_days',              1],
-      [30.days,    false] => [:'about_x_months',      1],
-      [60.days,    false] => [:'x_months',            2],
-      [1.year,     false] => [:'about_x_years',       1],
-      [3.years,    false] => [:'over_x_years',        3]
+      [29.seconds,          false] => [:'less_than_x_minutes', 1],
+      [60.seconds,          false] => [:'x_minutes',           1],
+      [44.minutes,          false] => [:'x_minutes',           44],
+      [61.minutes,          false] => [:'about_x_hours',       1],
+      [24.hours,            false] => [:'x_days',              1],
+      [30.days,             false] => [:'about_x_months',      1],
+      [60.days,             false] => [:'x_months',            2],
+      [1.year,              false] => [:'about_x_years',       1],
+      [3.years + 6.months,  false] => [:'over_x_years',        3],
+      [3.years + 10.months, false] => [:'almost_x_years',      4]
 
       }.each do |passed, expected|
       assert_distance_of_time_in_words_translates_key passed, expected
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 51a340d907..9fb2080f77 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -53,13 +53,14 @@ class DateHelperTest < ActionView::TestCase
     assert_equal "about 2 hours", distance_of_time_in_words(from, to + 89.minutes + 30.seconds)
     assert_equal "about 24 hours", distance_of_time_in_words(from, to + 23.hours + 59.minutes + 29.seconds)
 
-    # 1440..2879
+    # 1440..2529
     assert_equal "1 day", distance_of_time_in_words(from, to + 23.hours + 59.minutes + 30.seconds)
-    assert_equal "1 day", distance_of_time_in_words(from, to + 47.hours + 59.minutes + 29.seconds)
+    assert_equal "1 day", distance_of_time_in_words(from, to + 41.hours + 59.minutes + 29.seconds)
 
-    # 2880..43199
-    assert_equal "2 days", distance_of_time_in_words(from, to + 47.hours + 59.minutes + 30.seconds)
-    assert_equal "29 days", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 29.seconds)
+    # 2530..43199
+    assert_equal "2 days", distance_of_time_in_words(from, to + 42.hours + 59.minutes + 30.seconds)
+    assert_equal "3 days", distance_of_time_in_words(from, to + 2.days + 12.hours)
+    assert_equal "30 days", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 29.seconds)
 
     # 43200..86399
     assert_equal "about 1 month", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 30.seconds)
@@ -70,13 +71,27 @@ class DateHelperTest < ActionView::TestCase
     assert_equal "12 months", distance_of_time_in_words(from, to + 1.years - 31.seconds)
 
     # > 525599
-    assert_equal "about 1 year", distance_of_time_in_words(from, to + 1.years - 30.seconds)
-    assert_equal "about 1 year", distance_of_time_in_words(from, to + 1.years + 6.months - 1.day)
-    assert_equal "over 1 year", distance_of_time_in_words(from, to + 1.years + 6.months)
-    assert_equal "about 2 years", distance_of_time_in_words(from, to + 2.years + 30.seconds)
-    assert_equal "about 5 years", distance_of_time_in_words(from, to + 5.years + 5.months)
-    assert_equal "over 5 years", distance_of_time_in_words(from, to + 5.years + 6.months)
-    assert_equal "about 10 years", distance_of_time_in_words(from, to + 10.years)
+    assert_equal "about 1 year",    distance_of_time_in_words(from, to + 1.years - 30.seconds)
+    assert_equal "about 1 year",    distance_of_time_in_words(from, to + 1.years + 3.months - 1.day)
+    assert_equal "over 1 year",     distance_of_time_in_words(from, to + 1.years + 6.months)
+
+    assert_equal "almost 2 years",  distance_of_time_in_words(from, to + 2.years - 3.months + 1.day)
+    assert_equal "about 2 years",   distance_of_time_in_words(from, to + 2.years + 3.months - 1.day)
+    assert_equal "over 2 years",    distance_of_time_in_words(from, to + 2.years + 3.months + 1.day)
+    assert_equal "over 2 years",    distance_of_time_in_words(from, to + 2.years + 9.months - 1.day)
+    assert_equal "almost 3 years",  distance_of_time_in_words(from, to + 2.years + 9.months + 1.day)
+
+    assert_equal "almost 5 years",  distance_of_time_in_words(from, to + 5.years - 3.months + 1.day)
+    assert_equal "about 5 years",   distance_of_time_in_words(from, to + 5.years + 3.months - 1.day)
+    assert_equal "over 5 years",    distance_of_time_in_words(from, to + 5.years + 3.months + 1.day)
+    assert_equal "over 5 years",    distance_of_time_in_words(from, to + 5.years + 9.months - 1.day)
+    assert_equal "almost 6 years",  distance_of_time_in_words(from, to + 5.years + 9.months + 1.day)
+
+    assert_equal "almost 10 years", distance_of_time_in_words(from, to + 10.years - 3.months + 1.day)
+    assert_equal "about 10 years",  distance_of_time_in_words(from, to + 10.years + 3.months - 1.day)
+    assert_equal "over 10 years",   distance_of_time_in_words(from, to + 10.years + 3.months + 1.day)
+    assert_equal "over 10 years",   distance_of_time_in_words(from, to + 10.years + 9.months - 1.day)
+    assert_equal "almost 11 years", distance_of_time_in_words(from, to + 10.years + 9.months + 1.day)
 
     # test to < from
     assert_equal "about 4 hours", distance_of_time_in_words(from + 4.hours, to)