Added to_s(:db) to Range
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2506 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
2ed689745c
commit
5ef931a4b8
@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Added to_s(:db) to Range, so you can get "BETWEEN '2005-12-10' AND '2005-12-12'" from Date.new(2005, 12, 10)..Date.new(2005, 12, 12) (and likewise with Times)
|
||||
|
||||
* Moved require_library_or_gem into Kernel. #1992 [Michael Schuerig <michael@schuerig.de>]
|
||||
|
||||
* Add :rfc822 as an option for Time#to_s (to get rfc822-formatted times)
|
||||
|
@ -8,8 +8,7 @@ module Conversions
|
||||
: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
|
||||
|
5
activesupport/lib/active_support/core_ext/range.rb
Normal file
5
activesupport/lib/active_support/core_ext/range.rb
Normal file
@ -0,0 +1,5 @@
|
||||
require File.dirname(__FILE__) + '/range/conversions'
|
||||
|
||||
class Range #:nodoc:
|
||||
include ActiveSupport::CoreExtensions::Range::Conversions
|
||||
end
|
@ -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
|
16
activesupport/test/core_ext/range_ext_test.rb
Normal file
16
activesupport/test/core_ext/range_ext_test.rb
Normal file
@ -0,0 +1,16 @@
|
||||
require 'test/unit'
|
||||
require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/date'
|
||||
require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/time'
|
||||
require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/range'
|
||||
|
||||
class RangeTest < Test::Unit::TestCase
|
||||
def test_to_s_from_dates
|
||||
date_range = Date.new(2005, 12, 10)..Date.new(2005, 12, 12)
|
||||
assert_equal "BETWEEN '2005-12-10' AND '2005-12-12'", date_range.to_s(:db)
|
||||
end
|
||||
|
||||
def test_to_s_from_times
|
||||
date_range = Time.utc(2005, 12, 10, 15, 30)..Time.utc(2005, 12, 10, 17, 30)
|
||||
assert_equal "BETWEEN '2005-12-10 15:30:00' AND '2005-12-10 17:30:00'", date_range.to_s(:db)
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user