diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-04-05 14:33:47 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-04-05 14:33:47 -0700 |
| commit | 29089bf6faeb496f0cb7d439b848bc6ee4f40e9e (patch) | |
| tree | 536b479242482e120917e1051e9d3fc8d34c47aa /activesupport/lib | |
| parent | 8927987506b25269e021024140b256c20cafa978 (diff) | |
| download | rails-29089bf6faeb496f0cb7d439b848bc6ee4f40e9e.tar.gz rails-29089bf6faeb496f0cb7d439b848bc6ee4f40e9e.tar.bz2 rails-29089bf6faeb496f0cb7d439b848bc6ee4f40e9e.zip | |
revises requires of some AS deprecation files
Diffstat (limited to 'activesupport/lib')
3 files changed, 4 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/module/deprecation.rb b/activesupport/lib/active_support/core_ext/module/deprecation.rb index 9c169a2598..9e77ac3c45 100644 --- a/activesupport/lib/active_support/core_ext/module/deprecation.rb +++ b/activesupport/lib/active_support/core_ext/module/deprecation.rb @@ -1,4 +1,4 @@ -require 'active_support/deprecation' +require 'active_support/deprecation/method_wrappers' class Module # Declare that a method has been deprecated. diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index 45b9dda5ca..176edefa42 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext/module/deprecation' require 'active_support/deprecation/behaviors' require 'active_support/deprecation/reporting' require 'active_support/deprecation/method_wrappers' diff --git a/activesupport/lib/active_support/deprecation/method_wrappers.rb b/activesupport/lib/active_support/deprecation/method_wrappers.rb index 8be8665e40..c5de5e6a95 100644 --- a/activesupport/lib/active_support/deprecation/method_wrappers.rb +++ b/activesupport/lib/active_support/deprecation/method_wrappers.rb @@ -2,9 +2,9 @@ require 'active_support/core_ext/module/aliasing' require 'active_support/core_ext/array/extract_options' module ActiveSupport - class << Deprecation + module Deprecation # Declare that a method has been deprecated. - def deprecate_methods(target_module, *method_names) + def self.deprecate_methods(target_module, *method_names) options = method_names.extract_options! method_names += options.keys |