Move stuff from compatibility.rb to deprecated.rb
This commit is contained in:
Carlhuda
parent
5e3e5ac12b
commit
48bb3b3904
|
|
@ -60,3 +60,5 @@ module ActionController
|
|||
|
||||
end
|
||||
end
|
||||
|
||||
require "action_controller/deprecated/base"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,118 @@
|
|||
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
|
||||
Rails.application.config.action_disaptch.ip_spoofing_check = value
|
||||
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
|
||||
Rails.application.config.action_disaptch.ip_spoofing_check
|
||||
end
|
||||
|
||||
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
|
||||
|
||||
def session=(value)
|
||||
ActiveSupport::Deprecation.warn "ActionController::Base.session= is deprecated. " <<
|
||||
"Please configure it on your application with config.action_dispatch.session=", caller
|
||||
Rails.application.config.action_dispatch.session = value.delete(:disabled) ? nil : value
|
||||
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
|
||||
|
||||
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
|
||||
|
|
@ -31,139 +31,6 @@ module ActionController
|
|||
@before_filter_chain_aborted @_headers @_params
|
||||
@_response)
|
||||
|
||||
# Controls the resource action separator
|
||||
def self.resource_action_separator
|
||||
@resource_action_separator ||= "/"
|
||||
end
|
||||
|
||||
def self.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 self.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 self.use_accept_header=(val)
|
||||
use_accept_header
|
||||
end
|
||||
|
||||
self.page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
|
||||
|
||||
# Prepends all the URL-generating helpers from AssetHelper. This makes it possible to easily move javascripts, stylesheets,
|
||||
# and images to a dedicated asset server away from the main web server. Example:
|
||||
# ActionController::Base.asset_host = "http://assets.example.com"
|
||||
cattr_accessor :asset_host
|
||||
end
|
||||
|
||||
def self.deprecated_config_accessor(option, message = nil)
|
||||
deprecated_config_reader(option, message)
|
||||
deprecated_config_writer(option, message)
|
||||
end
|
||||
|
||||
def self.deprecated_config_reader(option, message = nil)
|
||||
message ||= "Reading #{option} directly from ActionController::Base is deprecated. " \
|
||||
"Please read it from config.#{option}"
|
||||
|
||||
ClassMethods.class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
||||
def #{option}
|
||||
ActiveSupport::Deprecation.warn #{message.inspect}, caller
|
||||
config.#{option}
|
||||
end
|
||||
RUBY
|
||||
end
|
||||
|
||||
def self.deprecated_config_writer(option, message = nil)
|
||||
message ||= "Setting #{option} directly on ActionController::Base is deprecated. " \
|
||||
"Please set it on config.action_controller.#{option}"
|
||||
|
||||
ClassMethods.class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
||||
def #{option}=(val)
|
||||
ActiveSupport::Deprecation.warn #{message.inspect}, caller
|
||||
config.#{option} = val
|
||||
end
|
||||
RUBY
|
||||
end
|
||||
|
||||
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
|
||||
|
||||
# For old tests
|
||||
def initialize_template_class(*) end
|
||||
def assign_shortcuts(*) end
|
||||
|
||||
# TODO: Remove this after we flip
|
||||
def template
|
||||
@template ||= view_context
|
||||
end
|
||||
|
||||
def process_action(*)
|
||||
template
|
||||
super
|
||||
end
|
||||
|
||||
module ClassMethods
|
||||
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
|
||||
Rails.application.config.action_disaptch.ip_spoofing_check = value
|
||||
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
|
||||
Rails.application.config.action_disaptch.ip_spoofing_check
|
||||
end
|
||||
|
||||
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
|
||||
|
||||
def session=(value)
|
||||
ActiveSupport::Deprecation.warn "ActionController::Base.session= is deprecated. " <<
|
||||
"Please configure it on your application with config.action_dispatch.session=", caller
|
||||
Rails.application.config.action_dispatch.session = value.delete(:disabled) ? nil : value
|
||||
end
|
||||
|
||||
def rescue_action(env)
|
||||
raise env["action_dispatch.rescue.exception"]
|
||||
end
|
||||
|
|
@ -172,10 +39,22 @@ module ActionController
|
|||
def cache_store=(store_option)
|
||||
@@cache_store = ActiveSupport::Cache.lookup_store(store_option)
|
||||
end
|
||||
|
||||
self.page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
|
||||
end
|
||||
|
||||
delegate :consider_all_requests_local, :consider_all_requests_local=,
|
||||
:allow_concurrency, :allow_concurrency=, :to => :"self.class"
|
||||
# For old tests
|
||||
def initialize_template_class(*) end
|
||||
def assign_shortcuts(*) end
|
||||
|
||||
def template
|
||||
@template ||= view_context
|
||||
end
|
||||
|
||||
def process_action(*)
|
||||
template
|
||||
super
|
||||
end
|
||||
|
||||
def render_to_body(options)
|
||||
if options.is_a?(Hash) && options.key?(:template)
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ class AssetTagHelperTest < ActionView::TestCase
|
|||
|
||||
def teardown
|
||||
ActionController::Base.perform_caching = false
|
||||
ActionController::Base.asset_host = nil
|
||||
ENV.delete('RAILS_ASSET_ID')
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue