From b753b4a076d7067efccbd1ad384829f77e62a064 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 19 May 2010 00:20:10 +0200 Subject: removes deprecations of last_(month|year) from master, they will be deprecated in 2.3 instead --- .../lib/active_support/core_ext/date/calculations.rb | 11 ----------- .../lib/active_support/core_ext/time/calculations.rb | 11 ----------- 2 files changed, 22 deletions(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb index 755d96ce91..579079d4f1 100644 --- a/activesupport/lib/active_support/core_ext/date/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date/calculations.rb @@ -2,7 +2,6 @@ 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' @@ -147,11 +146,6 @@ class Date advance(:years => years) end - 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) @@ -161,11 +155,6 @@ class Date 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 prev_month diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index e27b08ec2e..3c218d88e5 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -2,7 +2,6 @@ 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] @@ -133,11 +132,6 @@ 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 prev_year years_ago(1) @@ -148,11 +142,6 @@ 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 prev_month months_ago(1) -- cgit v1.2.3