diff options
Diffstat (limited to 'activesupport/lib')
3 files changed, 27 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb index 048a260ada..a9d7eb0976 100644 --- a/activesupport/lib/active_support/core_ext/date/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date/conversions.rb @@ -8,8 +8,7 @@ module ActiveSupport #:nodoc: :long => "%B %e, %Y" } - def self.append_features(klass) #:nodoc: - super + def self.included(klass) #:nodoc: klass.send(:alias_method, :to_default_s, :to_s) klass.send(:alias_method, :to_s, :to_formatted_s) end diff --git a/activesupport/lib/active_support/core_ext/range.rb b/activesupport/lib/active_support/core_ext/range.rb new file mode 100644 index 0000000000..ca77511521 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/range.rb @@ -0,0 +1,5 @@ +require File.dirname(__FILE__) + '/range/conversions' + +class Range #:nodoc: + include ActiveSupport::CoreExtensions::Range::Conversions +end diff --git a/activesupport/lib/active_support/core_ext/range/conversions.rb b/activesupport/lib/active_support/core_ext/range/conversions.rb new file mode 100644 index 0000000000..677ba639ec --- /dev/null +++ b/activesupport/lib/active_support/core_ext/range/conversions.rb @@ -0,0 +1,21 @@ +module ActiveSupport #:nodoc: + module CoreExtensions #:nodoc: + module Range #:nodoc: + # Getting dates in different convenient string representations and other objects + module Conversions + DATE_FORMATS = { + :db => Proc.new { |start, stop| "BETWEEN '#{start.to_s(:db)}' AND '#{stop.to_s(:db)}'" } + } + + def self.included(klass) #:nodoc: + 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] ? DATE_FORMATS[format].call(first, last) : to_default_s + end + end + end + end +end
\ No newline at end of file |