diff options
author | Jamis Buck <jamis@37signals.com> | 2005-08-31 10:47:05 +0000 |
---|---|---|
committer | Jamis Buck <jamis@37signals.com> | 2005-08-31 10:47:05 +0000 |
commit | 2fed808ee4d572da5d86cb91c704e569589bd7cc (patch) | |
tree | ffe742ef68a0164976f64902cc955b4723565514 /activesupport/lib | |
parent | 70e96c9f5c1bfcbb056c34fe7afe3d39226d1cc6 (diff) | |
download | rails-2fed808ee4d572da5d86cb91c704e569589bd7cc.tar.gz rails-2fed808ee4d572da5d86cb91c704e569589bd7cc.tar.bz2 rails-2fed808ee4d572da5d86cb91c704e569589bd7cc.zip |
Make Time#last_month work when invoked on the 31st of a month.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2083 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 76d6d4c176..451be56599 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -9,9 +9,13 @@ module ActiveSupport #:nodoc: end module ClassMethods + # Return the number of days in the given month. If a year is given, + # February will return the correct number of days for leap years. + # Otherwise, this method will always report February as having 28 + # days. def days_in_month(month, year=nil) if month == 2 - (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)) ? 29 : 28 + !year.nil? && (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)) ? 29 : 28 elsif month <= 7 month % 2 == 0 ? 30 : 31 else @@ -56,17 +60,21 @@ module ActiveSupport #:nodoc: # Returns a new Time representing the time a number of specified months ago def months_ago(months) - if months >= self.month - change(:year => self.year - 1, :month => 12).months_ago(months - self.month) - else - change(:year => self.year, :month => self.month - months) - end + months_since(-months) end def months_since(months) year, month, mday = self.year, self.month, self.mday month += months + + # in case months is negative + while month < 1 + month += 12 + year -= 1 + end + + # in case months is positive while month > 12 month -= 12 year += 1 |