From 8689989a52fb673650c45322f060093678c6b91e Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Fri, 26 Feb 2010 17:31:32 -0800 Subject: Make ActionController::Routing::Routes a DeprecatedProxy --- actionpack/lib/action_controller/deprecated.rb | 2 -- actionpack/lib/action_controller/railtie.rb | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/deprecated.rb b/actionpack/lib/action_controller/deprecated.rb index 6088d97abe..9f2de57033 100644 --- a/actionpack/lib/action_controller/deprecated.rb +++ b/actionpack/lib/action_controller/deprecated.rb @@ -1,5 +1,3 @@ ActionController::AbstractRequest = ActionController::Request = ActionDispatch::Request ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response ActionController::Routing = ActionDispatch::Routing -# ROUTES TODO: Figure out how to deprecate this. -# ActionController::UrlWriter = ActionController::UrlFor diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 69ee4b04ec..07c6b8f2b6 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -2,6 +2,7 @@ require "rails" require "action_controller" require "action_view/railtie" require "active_support/core_ext/class/subclasses" +require "active_support/deprecation/proxy_wrappers" module ActionController class Railtie < Rails::Railtie @@ -32,7 +33,12 @@ module ActionController initializer "action_controller.url_helpers" do |app| ActionController::Base.extend ::ActionController::Railtie::UrlHelpers.with(app.routes) - ActionController::Routing::Routes = app.routes + + message = "ActionController::Routing::Routes is deprecated. " \ + "Instead, use Rails.application.routes" + + proxy = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(app.routes, message) + ActionController::Routing::Routes = proxy end end end \ No newline at end of file -- cgit v1.2.3