diff options
author | Xavier Noria <fxn@hashref.com> | 2010-05-12 23:04:17 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-05-12 23:04:17 +0200 |
commit | 2203c781a7dfa8b0c8b6c97cd318d941f9fbb26c (patch) | |
tree | 49573544181a36d9a2fee792a140a54c5947067e /activesupport/lib/active_support/core_ext/time/calculations.rb | |
parent | 903637f5f0a1a9789fa12da1519e028b9faa37d8 (diff) | |
download | rails-2203c781a7dfa8b0c8b6c97cd318d941f9fbb26c.tar.gz rails-2203c781a7dfa8b0c8b6c97cd318d941f9fbb26c.tar.bz2 rails-2203c781a7dfa8b0c8b6c97cd318d941f9fbb26c.zip |
defines prev_(month|year) in Date and Time to ease transition to 1.9, and deprecates last_(month|year)
Diffstat (limited to 'activesupport/lib/active_support/core_ext/time/calculations.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 2b47ecd543..e27b08ec2e 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -2,6 +2,7 @@ require 'active_support/duration' require 'active_support/core_ext/date/acts_like' require 'active_support/core_ext/date/calculations' require 'active_support/core_ext/date_time/conversions' +require 'active_support/deprecation' class Time COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] @@ -132,8 +133,13 @@ class Time advance(:years => years) end + def last_year # :nodoc: + ActiveSupport::Deprecation.warn("Time#last_year has been deprecated, please use Time#prev_year instead", caller) + prev_year + end + # Short-hand for years_ago(1) - def last_year + def prev_year years_ago(1) end @@ -142,9 +148,13 @@ class Time years_since(1) end + def last_month # :nodoc: + ActiveSupport::Deprecation.warn("Time#last_month has been deprecated, please use Time#prev_month instead", caller) + prev_month + end # Short-hand for months_ago(1) - def last_month + def prev_month months_ago(1) end |