2010-03-04 20:21:49 +00:00
module ActionController
class Base
class << self
def deprecated_config_accessor ( option , message = nil )
deprecated_config_reader ( option , message )
deprecated_config_writer ( option , message )
end
def deprecated_config_reader ( option , message = nil )
message || = " Reading #{ option } directly from ActionController::Base is deprecated. " \
" Please read it from config. #{ option } "
self . class_eval <<-RUBY, __FILE__, __LINE__ + 1
def #{option}
ActiveSupport :: Deprecation . warn #{message.inspect}, caller
config . #{option}
end
RUBY
end
def deprecated_config_writer ( option , message = nil )
message || = " Setting #{ option } directly on ActionController::Base is deprecated. " \
" Please set it on config.action_controller. #{ option } "
self . class_eval <<-RUBY, __FILE__, __LINE__ + 1
def #{option}=(val)
ActiveSupport :: Deprecation . warn #{message.inspect}, caller
config . #{option} = val
end
RUBY
end
def consider_all_requests_local
ActiveSupport :: Deprecation . warn " ActionController::Base.consider_all_requests_local is deprecated, " <<
" use Rails.application.config.consider_all_requests_local instead " , caller
Rails . application . config . consider_all_requests_local
end
def consider_all_requests_local = ( value )
ActiveSupport :: Deprecation . warn " ActionController::Base.consider_all_requests_local= is deprecated. " <<
" Please configure it on your application with config.consider_all_requests_local= " , caller
Rails . application . config . consider_all_requests_local = value
end
def allow_concurrency
ActiveSupport :: Deprecation . warn " ActionController::Base.allow_concurrency is deprecated, " <<
" use Rails.application.config.allow_concurrency instead " , caller
Rails . application . config . allow_concurrency
end
def allow_concurrency = ( value )
ActiveSupport :: Deprecation . warn " ActionController::Base.allow_concurrency= is deprecated. " <<
" Please configure it on your application with config.allow_concurrency= " , caller
Rails . application . config . allow_concurrency = value
end
def ip_spoofing_check = ( value )
ActiveSupport :: Deprecation . warn " ActionController::Base.ip_spoofing_check= is deprecated. " <<
" Please configure it on your application with config.action_dispatch.ip_spoofing_check= " , caller
2010-03-08 05:27:25 +00:00
Rails . application . config . action_dispatch . ip_spoofing_check = value
2010-03-04 20:21:49 +00:00
end
def ip_spoofing_check
ActiveSupport :: Deprecation . warn " ActionController::Base.ip_spoofing_check is deprecated. " <<
" Configuring ip_spoofing_check on the application configures a middleware. " , caller
2010-03-27 03:07:00 +00:00
Rails . application . config . action_dispatch . ip_spoofing_check
2010-03-04 20:21:49 +00:00
end
2010-03-31 10:59:10 +00:00
def cookie_verifier_secret = ( value )
ActiveSupport :: Deprecation . warn " ActionController::Base.cookie_verifier_secret= is deprecated. " <<
2010-04-05 08:52:47 +00:00
" Please configure it on your application with config.secret_token= " , caller
2010-03-31 10:59:10 +00:00
end
def cookie_verifier_secret
2010-04-05 08:52:47 +00:00
ActiveSupport :: Deprecation . warn " ActionController::Base.cookie_verifier_secret is deprecated. " , caller
2010-03-31 10:59:10 +00:00
end
2010-03-04 20:21:49 +00:00
def trusted_proxies = ( value )
ActiveSupport :: Deprecation . warn " ActionController::Base.trusted_proxies= is deprecated. " <<
" Please configure it on your application with config.action_dispatch.trusted_proxies= " , caller
Rails . application . config . action_dispatch . ip_spoofing_check = value
end
def trusted_proxies
ActiveSupport :: Deprecation . warn " ActionController::Base.trusted_proxies is deprecated. " <<
" Configuring trusted_proxies on the application configures a middleware. " , caller
Rails . application . config . action_dispatch . ip_spoofing_check = value
end
2010-03-04 23:06:25 +00:00
def session ( * args )
ActiveSupport :: Deprecation . warn (
" Disabling sessions for a single controller has been deprecated. " +
" Sessions are now lazy loaded. So if you don't access them, " +
" consider them off. You can still modify the session cookie " +
" options with request.session_options. " , caller )
end
2010-03-04 20:21:49 +00:00
def session = ( value )
ActiveSupport :: Deprecation . warn " ActionController::Base.session= is deprecated. " <<
2010-03-04 23:06:25 +00:00
" Please configure it on your application with config.session_store :cookie_store, :key => '....' " , caller
if value . delete ( :disabled )
Rails . application . config . session_store :disabled
else
store = Rails . application . config . session_store
Rails . application . config . session_store store , value
end
2010-03-04 20:21:49 +00:00
end
# Controls the resource action separator
def resource_action_separator
@resource_action_separator || = " / "
end
def resource_action_separator = ( val )
ActiveSupport :: Deprecation . warn " ActionController::Base.resource_action_separator is deprecated and only " \
" works with the deprecated router DSL. "
@resource_action_separator = val
end
def use_accept_header
ActiveSupport :: Deprecation . warn " ActionController::Base.use_accept_header doesn't do anything anymore. " \
" The accept header is always taken into account. "
end
def use_accept_header = ( val )
use_accept_header
end
end
2010-04-10 09:47:20 +00:00
module DeprecatedBehavior
# This method has been moved to ActionDispatch::Request.filter_parameters
def filter_parameter_logging ( * args , & block )
ActiveSupport :: Deprecation . warn ( " Setting filter_parameter_logging in ActionController is deprecated and has no longer effect, please set 'config.filter_parameters' in config/application.rb instead " , caller )
filter = Rails . application . config . filter_parameters
filter . concat ( args )
filter << block if block
filter
end
# This was moved to a plugin
def verify ( * args )
ActiveSupport :: Deprecation . warn " verify was removed from Rails and is now available as a plugin. " <<
" Please install it with `rails plugin install git://github.com/rails/verification.git`. " , caller
end
end
extend DeprecatedBehavior
2010-03-04 20:21:49 +00:00
deprecated_config_writer :session_store
deprecated_config_writer :session_options
deprecated_config_accessor :relative_url_root , " relative_url_root is ineffective. Please stop using it "
deprecated_config_accessor :assets_dir
deprecated_config_accessor :javascripts_dir
deprecated_config_accessor :stylesheets_dir
delegate :consider_all_requests_local , :consider_all_requests_local = ,
:allow_concurrency , :allow_concurrency = , :to = > :" self.class "
end
end