Setup explicit requires for files with exceptions. Removed them from autoloading.

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

27 files changed, 32 insertions, 16 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index e02578eafd..34fae1d893 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -43,21 +43,6 @@ module ActionController
 
   eager_autoload do
     autoload :RecordIdentifier
-
-    # TODO: Don't autoload exceptions, setup explicit
-    # requires for files that need them
-    autoload_at "action_controller/metal/exceptions" do
-      autoload :ActionControllerError
-      autoload :RenderError
-      autoload :RoutingError
-      autoload :MethodNotAllowed
-      autoload :NotImplemented
-      autoload :UnknownController
-      autoload :MissingFile
-      autoload :RenderError
-      autoload :SessionOverflowError
-      autoload :UnknownHttpMethod
-    end
   end
 end
 
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 7a9c91f563..dc711e31a9 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -1,3 +1,5 @@
+require 'action_controller/metal/exceptions'
+
 module ActionController
   module Compatibility
     extend ActiveSupport::Concern
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index b5f1d23ef0..ab5238bea4 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -1,3 +1,5 @@
+require 'action_controller/metal/exceptions'
+
 module ActionController
   class RedirectBackError < AbstractController::Error #:nodoc:
     DEFAULT_MESSAGE = 'No HTTP_REFERER was set in the request to this action, so redirect_to :back could not be called successfully. If this is a test, make sure to specify request.env["HTTP_REFERER"].'
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index fc3118671f..04d53e2ba1 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/class/attribute'
+require 'action_controller/metal/exceptions'
 
 module ActionController #:nodoc:
   class InvalidAuthenticityToken < ActionControllerError #:nodoc:
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index d75b46dace..debb2e1c35 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/file/path'
+require 'action_controller/metal/exceptions'
 
 module ActionController #:nodoc:
   # Methods for sending arbitrary data and for streaming files to the browser,
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 5606d6abfe..7eccd23dab 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -5,6 +5,7 @@ require 'strscan'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string/access'
 require 'action_dispatch/http/headers'
+require 'action_controller/metal/exceptions'
 
 module ActionDispatch
   class Request < Rack::Request
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index ef0c9c51f5..9355b9c657 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/exception'
 require 'active_support/notifications'
 require 'action_dispatch/http/request'
+require 'action_controller/metal/exceptions'
 
 module ActionDispatch
   # This middleware rescues any exception returned by the application and renders
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
index e04062ce8b..c97cbfe1f1 100644
--- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/with_options'
 require 'active_support/core_ext/object/try'
+require 'action_controller/metal/exceptions'
 
 module ActionDispatch
   module Routing
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index b531cc1a8e..e6803b2722 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -2,6 +2,7 @@ require 'rack/mount'
 require 'forwardable'
 require 'active_support/core_ext/object/to_query'
 require 'action_dispatch/routing/deprecated_mapper'
+require 'action_controller/metal/exceptions'
 
 module ActionDispatch
   module Routing
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index c9e20ca14e..38765dd8ef 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -1,6 +1,7 @@
 require "pathname"
 require "active_support/core_ext/class"
 require "action_view/template"
+require 'action_controller/metal/exceptions'
 
 module ActionView
   # = Action View Resolver
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 441bc47908..7315c4eed1 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'action_controller/metal/exceptions'
 
 class WorkshopsController < ActionController::Base
 end
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index f476db3792..f8c2bc9505 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'action_controller/metal/exceptions'
 
 module ActionDispatch
   class ShowExceptions
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 4505cdabae..a7c02f4253 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/try'
+require 'action_controller/metal/exceptions'
 
 class ResourcesController < ActionController::Base
   def index() render :nothing => true end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index a8c74a6064..2bb278d09c 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -2,6 +2,7 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'active_support/dependencies'
+require 'action_controller/metal/exceptions'
 
 class MilestonesController < ActionController::Base
   def index() head :ok end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 546c4cb253..1f434c487a 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'action_controller/metal/exceptions'
 
 class RequestTest < ActiveSupport::TestCase
   test "remote ip" do
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index c90c1041ed..c48b1b0eb1 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1,6 +1,7 @@
 require 'erb'
 require 'abstract_unit'
 require 'controller/fake_controllers'
+require 'action_controller/metal/exceptions'
 
 class TestRoutingMapper < ActionDispatch::IntegrationTest
   SprocketsApp = lambda { |env|
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 4966527f4d..123e1b187e 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'action_controller/metal/exceptions'
 
 module ActionDispatch
   class ShowExceptions
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index 1262d305d1..d424c7ba1d 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/array/wrap'
 require "active_support/core_ext/module/anonymous"
 require 'active_support/core_ext/object/blank'
+require 'action_controller/metal/exceptions'
 
 module ActiveModel #:nodoc:
 
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index c3a34ae104..723466886e 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -22,6 +22,7 @@ require 'active_support/core_ext/object/blank'
 require 'arel'
 require 'active_record/errors'
 require 'active_record/log_subscriber'
+require 'action_controller/metal/exceptions'
 
 module ActiveRecord #:nodoc:
   # = Active Record
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 0245e63294..949f432f32 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/array/wrap'
+require 'action_controller/metal/exceptions'
 
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 198f0a18cb..9dca4a69be 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/module/aliasing'
+require 'action_controller/metal/exceptions'
 
 module ActiveRecord
   # Exception that can be raised to stop migrations from going backwards.
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 01cc14b8d6..137d60b350 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -1,3 +1,5 @@
+require 'action_controller/metal/exceptions'
+
 module ActiveRecord
   # = Active Record Session Store
   #
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index b7befe110d..dd0be4775d 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -1,8 +1,9 @@
-require 'active_support/core_ext/benchmark'
 require 'net/https'
 require 'date'
 require 'time'
 require 'uri'
+require 'active_support/core_ext/benchmark'
+require 'action_controller/metal/exceptions'
 
 module ActiveResource
   # Class to handle connections to remote web services.
diff --git a/activeresource/lib/active_resource/exceptions.rb b/activeresource/lib/active_resource/exceptions.rb
index 0f4549fd73..56f8a71702 100644
--- a/activeresource/lib/active_resource/exceptions.rb
+++ b/activeresource/lib/active_resource/exceptions.rb
@@ -1,3 +1,5 @@
+require 'action_controller/metal/exceptions'
+
 module ActiveResource
   class ConnectionError < StandardError # :nodoc:
     attr_reader :response
diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb
index 1b4b61899d..33fd626d1d 100644
--- a/activeresource/test/connection_test.rb
+++ b/activeresource/test/connection_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'action_controller/metal/exceptions'
 
 class ConnectionTest < Test::Unit::TestCase
   ResponseCodeStub = Struct.new(:code)
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index df35540b55..6fade577c4 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -9,6 +9,7 @@ require 'active_support/core_ext/numeric/bytes'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/object/to_param'
 require 'active_support/core_ext/string/inflections'
+require 'action_controller/metal/exceptions'
 
 module ActiveSupport
   # See ActiveSupport::Cache::Store for documentation.
diff --git a/activesupport/lib/active_support/secure_random.rb b/activesupport/lib/active_support/secure_random.rb
index 488a7e14a7..e2fbd0fd81 100644
--- a/activesupport/lib/active_support/secure_random.rb
+++ b/activesupport/lib/active_support/secure_random.rb
@@ -1,3 +1,5 @@
+require 'action_controller/metal/exceptions'
+
 begin
   require 'securerandom'
 rescue LoadError