diff options
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 32 |
2 files changed, 34 insertions, 0 deletions
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 |