diff options
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r-- | actionpack/lib/action_controller.rb | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index d973cbb382..eb596ba40e 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -31,17 +31,14 @@ rescue LoadError end end -gem 'rack', '>= 0.9.0' -require 'rack' -require 'action_controller/rack_ext' - require File.join(File.dirname(__FILE__), "action_pack") module ActionController # TODO: Review explicit to see if they will automatically be handled by # the initilizer if they are really needed. def self.load_all! - [Base, CGIHandler, CgiRequest, Request, Response, Http::Headers, UrlRewriter, UrlWriter] + [Base, Request, Response, UrlRewriter, UrlWriter] + [ActionDispatch::Http::Headers] end autoload :Base, 'action_controller/base/base' @@ -49,7 +46,6 @@ module ActionController autoload :Caching, 'action_controller/caching' autoload :Cookies, 'action_controller/base/cookies' autoload :Dispatcher, 'action_controller/dispatch/dispatcher' - autoload :Failsafe, 'action_controller/dispatch/rack/failsafe' autoload :Filters, 'action_controller/base/chained/filters' autoload :Flash, 'action_controller/base/chained/flash' autoload :Helpers, 'action_controller/base/helpers' @@ -57,32 +53,21 @@ module ActionController autoload :Integration, 'action_controller/testing/integration' autoload :IntegrationTest, 'action_controller/testing/integration' autoload :Layout, 'action_controller/base/layout' - autoload :Lock, 'action_controller/dispatch/rack/lock' - autoload :MiddlewareStack, 'action_controller/dispatch/rack/middleware_stack' autoload :MimeResponds, 'action_controller/mime/responds' - autoload :ParamsParser, 'action_controller/dispatch/params_parser' autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes' autoload :RecordIdentifier, 'action_controller/record_identifier' autoload :Redirector, 'action_controller/base/redirect' autoload :Renderer, 'action_controller/base/render' - autoload :Request, 'action_controller/dispatch/request' autoload :RequestForgeryProtection, 'action_controller/base/request_forgery_protection' - autoload :RequestParser, 'action_controller/dispatch/request_parser' autoload :Rescue, 'action_controller/dispatch/rescue' autoload :Resources, 'action_controller/routing/resources' autoload :Responder, 'action_controller/base/responder' - autoload :Response, 'action_controller/dispatch/response' - autoload :RewindableInput, 'action_controller/dispatch/rewindable_input' autoload :Routing, 'action_controller/routing' autoload :SessionManagement, 'action_controller/session/management' - autoload :StatusCodes, 'action_controller/dispatch/status_codes' autoload :Streaming, 'action_controller/base/streaming' autoload :TestCase, 'action_controller/testing/test_case' autoload :TestProcess, 'action_controller/testing/process' autoload :Translation, 'action_controller/translation' - autoload :UploadedFile, 'action_controller/dispatch/uploaded_file' - autoload :UploadedStringIO, 'action_controller/dispatch/uploaded_file' - autoload :UploadedTempfile, 'action_controller/dispatch/uploaded_file' autoload :UrlEncodedPairParser, 'action_controller/dispatch/url_encoded_pair_parser' autoload :UrlRewriter, 'action_controller/routing/generation/url_rewriter' autoload :UrlWriter, 'action_controller/routing/generation/url_rewriter' @@ -96,20 +81,9 @@ module ActionController autoload :SelectorAssertions, 'action_controller/testing/assertions/selector' autoload :TagAssertions, 'action_controller/testing/assertions/tag' end - - module Http - autoload :Headers, 'action_controller/base/headers' - end - - module Session - autoload :AbstractStore, 'action_controller/session/abstract_store' - autoload :CookieStore, 'action_controller/session/cookie_store' - autoload :MemCacheStore, 'action_controller/session/mem_cache_store' - end end -autoload :Mime, 'action_controller/mime/type' - autoload :HTML, 'action_controller/vendor/html-scanner' +require 'action_dispatch' require 'action_view' |