From 8401218becb5150c722f275cc4d7397fad24c201 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 21 Feb 2005 17:02:08 +0000 Subject: Added Time::Conversions for getting times in different convenient string representations and other objects git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@737 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/CHANGELOG | 2 ++ activesupport/lib/active_support/core_ext/time.rb | 2 ++ .../active_support/core_ext/time/conversions.rb | 32 ++++++++++++++++++++++ activesupport/test/core_ext/time_ext_test.rb | 14 ++++++++++ 4 files changed, 50 insertions(+) create mode 100644 activesupport/lib/active_support/core_ext/time/conversions.rb (limited to 'activesupport') diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 22e5ed8224..d576e6a383 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,3 +1,5 @@ +* 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: "Later today" => now.in(3.hours), diff --git a/activesupport/lib/active_support/core_ext/time.rb b/activesupport/lib/active_support/core_ext/time.rb index e13cb07def..9e3c7a0329 100644 --- a/activesupport/lib/active_support/core_ext/time.rb +++ b/activesupport/lib/active_support/core_ext/time.rb @@ -1,5 +1,7 @@ require File.dirname(__FILE__) + '/time/calculations' +require File.dirname(__FILE__) + '/time/conversions' class Time#:nodoc: include ActiveSupport::CoreExtensions::Time::Calculations + include ActiveSupport::CoreExtensions::Time::Conversions end diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb new file mode 100644 index 0000000000..b79acf9f75 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -0,0 +1,32 @@ +module ActiveSupport #:nodoc: + module CoreExtensions #:nodoc: + module Time #:nodoc: + # Getting times 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 :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 + end + end + + def to_date + Date.new(year, month, day) + end + + # To be able to keep Dates and Times interchangeable on conversions + def to_time + self + end + end + end + 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 a948d21e17..dabc433c1f 100644 --- a/activesupport/test/core_ext/time_ext_test.rb +++ b/activesupport/test/core_ext/time_ext_test.rb @@ -86,4 +86,18 @@ class TimeExtCalculationsTest < Test::Unit::TestCase assert_equal Time.local(2005,2,29), Time.local(2005,2,22,15,15,10).next_week(:tuesday) assert_equal Time.local(2005,3,4), Time.local(2005,2,22,15,15,10).next_week(:friday) end + + 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) + end + + def test_to_date + assert_equal Date.new(2005, 2, 21), Time.local(2005, 2, 21, 17, 44, 30).to_date + end + + def test_to_time + assert_equal Time.local(2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30).to_time + end end \ No newline at end of file -- cgit v1.2.3