Date, Time, and DateTime support formatting blocks in addition to strftime strings. Introduce :long_ordinal format, e.g. 'February 21st, 2005'. Closes #8191.

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

3 files changed, 17 insertions, 12 deletions

diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index 055b3659fd..6a0508b8c4 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -2,9 +2,10 @@ require File.dirname(__FILE__) + '/../abstract_unit'
 
 class DateExtCalculationsTest < Test::Unit::TestCase
   def test_to_s
-    assert_equal "21 Feb",            Date.new(2005, 2, 21).to_s(:short)
-    assert_equal "February 21, 2005", Date.new(2005, 2, 21).to_s(:long)
-    assert_equal "2005-02-21",        Date.new(2005, 2, 21).to_s(:db)
+    assert_equal "21 Feb",              Date.new(2005, 2, 21).to_s(:short)
+    assert_equal "February 21, 2005",   Date.new(2005, 2, 21).to_s(:long)
+    assert_equal "February 21st, 2005", Date.new(2005, 2, 21).to_s(:long_ordinal)
+    assert_equal "2005-02-21",          Date.new(2005, 2, 21).to_s(:db)
   end
 
   def test_to_time
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index a0c52e3dac..a6fb8dd7e7 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -2,11 +2,14 @@ require File.dirname(__FILE__) + '/../abstract_unit'
 
 class DateTimeExtCalculationsTest < Test::Unit::TestCase
   def test_to_s
-    assert_equal "2005-02-21 14:30:00",               DateTime.new(2005, 2, 21, 14, 30, 0).to_s(:db)
-    assert_equal "14:30",                             DateTime.new(2005, 2, 21, 14, 30, 0).to_s(:time)
-    assert_equal "21 Feb 14:30",                      DateTime.new(2005, 2, 21, 14, 30, 0).to_s(:short)
-    assert_equal "February 21, 2005 14:30",           DateTime.new(2005, 2, 21, 14, 30, 0).to_s(:long)
-    assert_equal "Mon, 21 Feb 2005 14:30:00 +0000",   DateTime.new(2005, 2, 21, 14, 30, 0).to_s(:rfc822)
+    datetime = DateTime.new(2005, 2, 21, 14, 30, 0)
+
+    assert_equal "2005-02-21 14:30:00",               datetime.to_s(:db)
+    assert_equal "14:30",                             datetime.to_s(:time)
+    assert_equal "21 Feb 14:30",                      datetime.to_s(:short)
+    assert_equal "February 21, 2005 14:30",           datetime.to_s(:long)
+    assert_equal "Mon, 21 Feb 2005 14:30:00 +0000",   datetime.to_s(:rfc822)
+    assert_equal "February 21st, 2005 14:30",         datetime.to_s(:long_ordinal)
   end
 
   def test_to_date
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 5b7cb1fde7..87ee8c2894 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -272,10 +272,11 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
 
   def test_to_s
     time = Time.local(2005, 2, 21, 17, 44, 30)
-    assert_equal "2005-02-21 17:44:30",     time.to_s(:db)
-    assert_equal "21 Feb 17:44",            time.to_s(:short)
-    assert_equal "17:44",                   time.to_s(:time)
-    assert_equal "February 21, 2005 17:44", time.to_s(:long)
+    assert_equal "2005-02-21 17:44:30",       time.to_s(:db)
+    assert_equal "21 Feb 17:44",              time.to_s(:short)
+    assert_equal "17:44",                     time.to_s(:time)
+    assert_equal "February 21, 2005 17:44",   time.to_s(:long)
+    assert_equal "February 21st, 2005 17:44", time.to_s(:long_ordinal)
 
     time = Time.utc(2005, 2, 21, 17, 44, 30)
     assert_equal "Mon, 21 Feb 2005 17:44:30 +0000", time.to_s(:rfc822)