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/date/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/date/calculations.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date/calculations.rb | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb index 3038729d34..755d96ce91 100644 --- a/activesupport/lib/active_support/core_ext/date/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date/calculations.rb @@ -2,6 +2,7 @@ require 'date' require 'active_support/duration' require 'active_support/core_ext/time/zones' require 'active_support/core_ext/object/acts_like' +require 'active_support/deprecation' class Date if RUBY_VERSION < '1.9' @@ -146,20 +147,30 @@ class Date advance(:years => years) end - # Short-hand for years_ago(1) - def last_year - years_ago(1) + def last_year # :nodoc: + ActiveSupport::Deprecation.warn("Date#last_year has been deprecated, please use Date#prev_year instead", caller) + prev_year end + # Shorthand for years_ago(1) + def prev_year + years_ago(1) + end unless method_defined?(:prev_year) + # Short-hand for years_since(1) def next_year years_since(1) end unless method_defined?(:next_year) + def last_month # :nodoc: + ActiveSupport::Deprecation.warn("Date#last_month has been deprecated, please use Date#prev_month instead", caller) + prev_month + end + # Short-hand for months_ago(1) - def last_month + def prev_month months_ago(1) - end + end unless method_defined?(:prev_month) # Short-hand for months_since(1) def next_month |