Skip to content
Browse files

Added Date::Conversions for getting dates in different convenient str…

…ing representations and other objects

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@738 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 8401218 commit cf659de14140950638f2f02831a42721fd8d2f75 @dhh dhh committed Feb 21, 2005
View
2 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:
View
6 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
View
31 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
View
6 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 @@ def to_formatted_s(format = :default)
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
View
17 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
View
2 activesupport/test/core_ext/time_ext_test.rb
@@ -90,7 +90,7 @@ def test_next_week
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

0 comments on commit cf659de

Please sign in to comment.
Something went wrong with that request. Please try again.