github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-30 00:38:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Deprecation: remove deprecated :mday option from Time, Date, and DateTime#change.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7508 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2007-09-18 06:38:28 +00:00
parent 4f375d5b82
commit 3a696dd290
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activesupport/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Deprecation: remove deprecated :mday option from Time, Date, and DateTime#change. [Jeremy Kemper]
* Fix JSON decoder with nested quotes and commas. #9579 [zdennis]
* Hash#to_xml doesn't double-unescape. #8806 [Ezran]

2
activesupport/lib/active_support/core_ext/date/calculations.rb
View File

@@ -87,7 +87,7 @@ module ActiveSupport #:nodoc:
::Date.new(
options[:year] || self.year,
options[:month] || self.month,
options[:day] || options[:mday] || self.day # mday is deprecated
options[:day] || self.day
)
end

2
activesupport/lib/active_support/core_ext/date_time/calculations.rb
View File

@@ -18,7 +18,7 @@ module ActiveSupport #:nodoc:
::DateTime.civil(
options[:year] || self.year,
options[:month] || self.month,
options[:day] || options[:mday] || self.day, # mday is deprecated
options[:day] || self.day,
options[:hour] || self.hour,
options[:min] || (options[:hour] ? 0 : self.min),
options[:sec] || ((options[:hour] || options[:min]) ? 0 : self.sec),

10
activesupport/lib/active_support/core_ext/time/calculations.rb
View File

@@ -63,7 +63,7 @@ module ActiveSupport #:nodoc:
self.utc? ? :utc_time : :local_time,
options[:year] || self.year,
options[:month] || self.month,
options[:day] || options[:mday] || self.day, # mday is deprecated
options[:day] || self.day,
options[:hour] || self.hour,
options[:min] || (options[:hour] ? 0 : self.min),
options[:sec] || ((options[:hour] || options[:min]) ? 0 : self.sec),
@@ -121,7 +121,7 @@ module ActiveSupport #:nodoc:
max = ::Time.days_in_month(month, year)
mday = max if mday > max
change(:year => year, :month => month, :mday => mday)
change(:year => year, :month => month, :day => mday)
end
# Returns a new Time representing the time a number of specified years ago
@@ -184,7 +184,7 @@ module ActiveSupport #:nodoc:
# Returns a new Time representing the start of the month (1st of the month, 0:00)
def beginning_of_month
#self - ((self.mday-1).days + self.seconds_since_midnight)
change(:mday => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
change(:day => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
end
alias :at_beginning_of_month :beginning_of_month
@@ -192,7 +192,7 @@ module ActiveSupport #:nodoc:
def end_of_month
#self - ((self.mday-1).days + self.seconds_since_midnight)
last_day = ::Time.days_in_month( self.month, self.year )
change(:mday => last_day,:hour => 0, :min => 0, :sec => 0, :usec => 0)
change(:day => last_day,:hour => 0, :min => 0, :sec => 0, :usec => 0)
end
alias :at_end_of_month :end_of_month
@@ -204,7 +204,7 @@ module ActiveSupport #:nodoc:
# Returns a new Time representing the start of the year (1st of january, 0:00)
def beginning_of_year
change(:month => 1,:mday => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
change(:month => 1,:day => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
end
alias :at_beginning_of_year :beginning_of_year