Cleanup deprecation warnings in Action Controller

Signed-off-by: José Valim <jose.valim@gmail.com>

4 files changed, 1 insertions, 64 deletions

diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 7a9c91f563..006b9fd456 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -5,19 +5,6 @@ module ActionController
     class ::ActionController::ActionControllerError < StandardError #:nodoc:
     end
 
-    module ClassMethods
-      # TODO Remove this after the old router map is removed.
-      def resource_action_separator
-        @resource_action_separator ||= "/"
-      end
-
-      # TODO Remove this after the old router map is removed.     
-      def resource_action_separator=(val)
-        ActiveSupport::Deprecation.warn "ActionController::Base.resource_action_separator is deprecated"
-        @resource_action_separator = val
-      end
-    end
-
     # Temporary hax
     included do
       ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index c5d7842db3..4d5d534c75 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -58,16 +58,6 @@ module ActionController
     end
 
     module ClassMethods
-      def helpers_dir
-        ActiveSupport::Deprecation.warn "helpers_dir is deprecated, use helpers_path instead", caller
-        self.helpers_path
-      end
-
-      def helpers_dir=(value)
-        ActiveSupport::Deprecation.warn "helpers_dir= is deprecated, use helpers_path= instead", caller
-        self.helpers_path = Array.wrap(value)
-      end
-
       # Declares helper accessors for controller attributes. For example, the
       # following adds new +name+ and <tt>name=</tt> instance methods to a
       # controller and makes them available to the view:
@@ -87,7 +77,7 @@ module ActionController
 
       private
         # Overwrite modules_for_helpers to accept :all as argument, which loads
-        # all helpers in helpers_dir.
+        # all helpers in helpers_path.
         #
         # ==== Parameters
         # * <tt>args</tt> - A list of helpers
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index d75b46dace..2013da3adb 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -69,10 +69,6 @@ module ActionController #:nodoc:
         options[:filename] ||= File.basename(path) unless options[:url_based_filename]
         send_file_headers! options
 
-        if options[:x_sendfile]
-          ActiveSupport::Deprecation.warn(":x_sendfile is no longer needed in send_file", caller)
-        end
-
         self.status = options[:status] || 200
         self.content_type = options[:content_type] if options.key?(:content_type)
         self.response_body = File.open(path, "rb")
@@ -121,10 +117,6 @@ module ActionController #:nodoc:
           raise ArgumentError, ":#{arg} option required" if options[arg].nil?
         end
 
-        if options.key?(:length)
-          ActiveSupport::Deprecation.warn("You do not need to provide the file's length", caller)
-        end
-
         disposition = options[:disposition]
         disposition += %(; filename="#{options[:filename]}") if options[:filename]
 
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 0cb4041855..d26b7e2486 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -2,8 +2,6 @@ require "rails"
 require "action_controller"
 require "action_dispatch/railtie"
 require "action_view/railtie"
-require "active_support/deprecation/proxy_wrappers"
-require "active_support/deprecation"
 require "abstract_controller/railties/routes_helpers"
 require "action_controller/railties/paths"
 
@@ -11,28 +9,6 @@ module ActionController
   class Railtie < Rails::Railtie
     config.action_controller = ActiveSupport::OrderedOptions.new
 
-    config.action_controller.singleton_class.tap do |d|
-      d.send(:define_method, :session) do
-        ActiveSupport::Deprecation.warn "config.action_controller.session has been deprecated. " <<
-          "Please use Rails.application.config.session_store instead.", caller
-      end
-
-      d.send(:define_method, :session=) do |val|
-        ActiveSupport::Deprecation.warn "config.action_controller.session= has been deprecated. " <<
-          "Please use config.session_store(name, options) instead.", caller
-      end
-
-      d.send(:define_method, :session_store) do
-        ActiveSupport::Deprecation.warn "config.action_controller.session_store has been deprecated. " <<
-          "Please use Rails.application.config.session_store instead.", caller
-      end
-
-      d.send(:define_method, :session_store=) do |val|
-        ActiveSupport::Deprecation.warn "config.action_controller.session_store= has been deprecated. " <<
-          "Please use config.session_store(name, options) instead.", caller
-      end
-    end
-
     initializer "action_controller.logger" do
       ActiveSupport.on_load(:action_controller) { self.logger ||= Rails.logger }
     end
@@ -57,13 +33,5 @@ module ActionController
         options.each { |k,v| send("#{k}=", v) }
       end
     end
-
-    initializer "action_controller.deprecated_routes" do |app|
-      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