From cf659de14140950638f2f02831a42721fd8d2f75 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 21 Feb 2005 17:09:20 +0000
Subject: 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
---
 activesupport/lib/active_support/core_ext/date.rb  |  6 +++++
 .../active_support/core_ext/date/conversions.rb    | 31 ++++++++++++++++++++++
 .../active_support/core_ext/time/conversions.rb    |  6 +++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 activesupport/lib/active_support/core_ext/date.rb
 create mode 100644 activesupport/lib/active_support/core_ext/date/conversions.rb

(limited to 'activesupport/lib/active_support/core_ext')

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
-- 
cgit v1.2.3