Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added Date#change (like Time#change) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6910 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit ff5c7c8c40ba24431ec5c9cdad23ddb9963d2c67 1 parent 1edd21b
@dhh dhh authored
View
2  activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added Date#change (like Time#change) [DHH]
+
* DateTime#to_time converts to Time unless out of range. #8512 [Geoff Buesing]
* Date#to_datetime, #to_s(:rfc822). #8512 [Geoff Buesing]
View
14 activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -38,6 +38,20 @@ def advance(options)
d = d + options.delete(:days) if options[:days]
d
end
+
+ # Returns a new Date where one or more of the elements have been changed according to the +options+ parameter.
+ #
+ # Examples:
+ #
+ # Date.new(2007, 5, 12).change(:day => 1) # => Date.new(2007, 5, 12)
+ # Date.new(2007, 5, 12).change(:year => 2005, :month => 1) # => Date.new(2005, 1, 12)
+ def change(options)
+ ::Date.new(
+ options[:year] || self.year,
+ options[:month] || self.month,
+ options[:day] || options[:mday] || self.day # mday is deprecated
+ )
+ end
end
end
end
View
2  activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -61,7 +61,7 @@ def change(options)
self.utc? ? :utc_time : :local_time,
options[:year] || self.year,
options[:month] || self.month,
- options[:mday] || self.mday,
+ options[:day] || options[:mday] || self.day, # mday is deprecated
options[:hour] || self.hour,
options[:min] || (options[:hour] ? 0 : self.min),
options[:sec] || ((options[:hour] || options[:min]) ? 0 : self.sec),
View
5 activesupport/test/core_ext/date_ext_test.rb
@@ -21,4 +21,9 @@ def test_to_datetime
def test_to_date
assert_equal Date.new(2005, 2, 21), Date.new(2005, 2, 21).to_date
end
+
+ def test_change
+ assert_equal Date.new(2005, 2, 21), Date.new(2005, 2, 11).change(:day => 21)
+ assert_equal Date.new(2007, 5, 11), Date.new(2005, 2, 11).change(:year => 2007, :month => 5)
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.