Added Date::Conversions for getting dates in different convenient string representations and other objects

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

6 files changed, 61 insertions, 3 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index d576e6a383..12ed008151 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,3 +1,5 @@
+* Added Date::Conversions for getting dates in different convenient string representations and other objects
+
 * Added Time::Conversions for getting times in different convenient string representations and other objects
 
 * Added Time::Calculations to ask for things like Time.now.tomorrow, Time.now.yesterday, Time.now.months_ago(4) #580 [DP|Flurin]. Examples:
diff --git a/activesupport/lib/active_support/core_ext/date.rb b/activesupport/lib/active_support/core_ext/date.rb
new file mode 100644
index 0000000000..239b8c140a
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/date.rb
@@ -0,0 +1,6 @@
+require 'date'
+require File.dirname(__FILE__) + '/date/conversions'
+
+class Date#:nodoc:
+  include ActiveSupport::CoreExtensions::Date::Conversions
+end
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
new file mode 100644
index 0000000000..3520b7a6b9
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -0,0 +1,31 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Date #:nodoc:
+      # Getting dates in different convenient string representations and other objects
+      module Conversions
+        def self.append_features(klass)
+          super
+          klass.send(:alias_method, :to_default_s, :to_s)
+          klass.send(:alias_method, :to_s, :to_formatted_s)
+        end
+        
+        def to_formatted_s(format = :default)
+          case format
+            when :default then to_default_s
+            when :short   then strftime("%e %b").strip
+            when :long    then strftime("%B %e, %Y").strip
+          end
+        end
+
+        # To be able to keep Dates and Times interchangeable on conversions
+        def to_date
+          self
+        end
+
+        def to_time(form = :local)
+          ::Time.send(form, year, month, day)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index b79acf9f75..689da6db52 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -1,3 +1,5 @@
+require 'date'
+
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Time #:nodoc:
@@ -14,12 +16,12 @@ module ActiveSupport #:nodoc:
             when :default then to_default_s
             when :db      then strftime("%Y-%m-%d %H:%M:%S")
             when :short   then strftime("%e %b %H:%M").strip
-            when :long    then strftime("%e %B, %Y %H:%M").strip
+            when :long    then strftime("%B %e, %Y %H:%M").strip
           end
         end
 
         def to_date
-          Date.new(year, month, day)
+          ::Date.new(year, month, day)
         end
 
         # To be able to keep Dates and Times interchangeable on conversions
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
new file mode 100644
index 0000000000..63a0cf5e6d
--- /dev/null
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -0,0 +1,17 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/date'
+
+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)
+  end
+  
+  def test_to_time
+    assert_equal Time.local(2005, 2, 21), Date.new(2005, 2, 21).to_time
+  end
+  
+  def test_to_date
+    assert_equal Date.new(2005, 2, 21), Date.new(2005, 2, 21).to_date
+  end
+end
\ No newline at end of file
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index dabc433c1f..5bdabb387e 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -90,7 +90,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
   def test_to_s
     assert_equal "2005-02-21 17:44:30",     Time.local(2005, 2, 21, 17, 44, 30).to_s(:db)
     assert_equal "21 Feb 17:44",            Time.local(2005, 2, 21, 17, 44, 30).to_s(:short)
-    assert_equal "21 February, 2005 17:44", Time.local(2005, 2, 21, 17, 44, 30).to_s(:long)
+    assert_equal "February 21, 2005 17:44", Time.local(2005, 2, 21, 17, 44, 30).to_s(:long)
   end
   
   def test_to_date