From ad4f1fd630dbeeb66b9cde0979518b4af96201ad Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 25 May 2007 21:43:19 +0000 Subject: 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 --- .../active_support/core_ext/date/conversions.rb | 17 ++++++++++---- .../core_ext/date_time/conversions.rb | 22 +++++++++++++----- .../active_support/core_ext/time/conversions.rb | 27 ++++++++++++++-------- 3 files changed, 47 insertions(+), 19 deletions(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb index 8f48ccacde..01dd8461e4 100644 --- a/activesupport/lib/active_support/core_ext/date/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date/conversions.rb @@ -4,9 +4,10 @@ module ActiveSupport #:nodoc: # Getting dates in different convenient string representations and other objects module Conversions DATE_FORMATS = { - :short => "%e %b", - :long => "%B %e, %Y", - :db => "%Y-%m-%d" + :short => "%e %b", + :long => "%B %e, %Y", + :db => "%Y-%m-%d", + :long_ordinal => lambda { |date| date.strftime("%B #{date.day.ordinalize}, %Y") } # => "April 25th, 2007" } def self.included(klass) #:nodoc: @@ -15,7 +16,15 @@ module ActiveSupport #:nodoc: end def to_formatted_s(format = :default) - DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s + if formatter = DATE_FORMATS[format] + if formatter.respond_to?(:call) + formatter.call(self).to_s + else + strftime(formatter).strip + end + else + to_default_s + end end # To be able to keep Dates and Times interchangeable on conversions diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb index 926a168cec..f0a0b5892b 100644 --- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb @@ -8,26 +8,36 @@ module ActiveSupport #:nodoc: :time => "%H:%M", :short => "%d %b %H:%M", :long => "%B %d, %Y %H:%M", - :rfc822 => "%a, %d %b %Y %H:%M:%S %z" + :long_ordinal => lambda { |datetime| datetime.strftime("%B #{datetime.day.ordinalize}, %Y %H:%M") }, + :rfc822 => "%a, %d %b %Y %H:%M:%S %z", } + def self.included(klass) klass.send(:alias_method, :to_datetime_default_s, :to_s) klass.send(:alias_method, :to_s, :to_formatted_s) end - + def to_formatted_s(format = :default) - DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_datetime_default_s + if formatter = DATE_FORMATS[format] + if formatter.respond_to?(:call) + formatter.call(self).to_s + else + strftime(formatter).strip + end + else + to_datetime_default_s + end end def to_date ::Date.new(year, month, day) end - + # To be able to keep Times and DateTimes interchangeable on conversions def to_datetime self - end + end end end end -end \ No newline at end of file +end diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index 903dd02031..3945fe8f8c 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -4,20 +4,29 @@ module ActiveSupport #:nodoc: # Getting times in different convenient string representations and other objects module Conversions DATE_FORMATS = { - :db => "%Y-%m-%d %H:%M:%S", - :time => "%H:%M", - :short => "%d %b %H:%M", - :long => "%B %d, %Y %H:%M", - :rfc822 => "%a, %d %b %Y %H:%M:%S %z" + :db => "%Y-%m-%d %H:%M:%S", + :time => "%H:%M", + :short => "%d %b %H:%M", + :long => "%B %d, %Y %H:%M", + :long_ordinal => lambda { |time| time.strftime("%B #{time.day.ordinalize}, %Y %H:%M") }, + :rfc822 => "%a, %d %b %Y %H:%M:%S %z" } def self.included(klass) 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) - DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s + if formatter = DATE_FORMATS[format] + if formatter.respond_to?(:call) + formatter.call(self).to_s + else + strftime(formatter).strip + end + else + to_default_s + end end def to_date @@ -28,11 +37,11 @@ module ActiveSupport #:nodoc: def to_time self end - + # converts to a Ruby DateTime instance; preserves utc offset def to_datetime ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400), 0) - end + end end end end -- cgit v1.2.3