From eb9af20b7cc0e374277cf330bdd404f9daab28ec Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Thu, 22 Jan 2009 16:18:10 -0600 Subject: Begin unifying the interface between ActionController and ActionView --- actionpack/lib/action_controller.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'actionpack/lib/action_controller.rb') diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 3e77970367..6000ee15c6 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -35,6 +35,8 @@ 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. -- cgit v1.2.3 From a0f2b1d95d3785de92ae271fd7ea23e91c0cadc6 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 27 Jan 2009 18:17:39 -0600 Subject: Reorganize ActionController folder structure --- actionpack/lib/action_controller.rb | 94 ++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'actionpack/lib/action_controller.rb') diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 6000ee15c6..d973cbb382 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -44,57 +44,61 @@ module ActionController [Base, CGIHandler, CgiRequest, Request, Response, Http::Headers, UrlRewriter, UrlWriter] end - autoload :AbstractRequest, 'action_controller/request' - autoload :Base, 'action_controller/base' - autoload :Benchmarking, 'action_controller/benchmarking' + autoload :Base, 'action_controller/base/base' + autoload :Benchmarking, 'action_controller/base/chained/benchmarking' autoload :Caching, 'action_controller/caching' - autoload :Cookies, 'action_controller/cookies' - autoload :Dispatcher, 'action_controller/dispatcher' - autoload :Failsafe, 'action_controller/failsafe' - autoload :Filters, 'action_controller/filters' - autoload :Flash, 'action_controller/flash' - autoload :Helpers, 'action_controller/helpers' - autoload :HttpAuthentication, 'action_controller/http_authentication' - autoload :Integration, 'action_controller/integration' - autoload :IntegrationTest, 'action_controller/integration' - autoload :Layout, 'action_controller/layout' - autoload :MiddlewareStack, 'action_controller/middleware_stack' - autoload :MimeResponds, 'action_controller/mime_responds' - autoload :ParamsParser, 'action_controller/params_parser' - autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes' + 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' + autoload :HttpAuthentication, 'action_controller/base/http_authentication' + 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 :Request, 'action_controller/request' - autoload :RequestForgeryProtection, 'action_controller/request_forgery_protection' - autoload :Rescue, 'action_controller/rescue' - autoload :Resources, 'action_controller/resources' - autoload :Response, 'action_controller/response' - autoload :RewindableInput, 'action_controller/rewindable_input' + 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/status_codes' - autoload :Streaming, 'action_controller/streaming' - autoload :TestCase, 'action_controller/test_case' - autoload :TestProcess, 'action_controller/test_process' + 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/uploaded_file' - autoload :UploadedStringIO, 'action_controller/uploaded_file' - autoload :UploadedTempfile, 'action_controller/uploaded_file' - autoload :UrlEncodedPairParser, 'action_controller/url_encoded_pair_parser' - autoload :UrlRewriter, 'action_controller/url_rewriter' - autoload :UrlWriter, 'action_controller/url_rewriter' - autoload :Verification, 'action_controller/verification' + 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' + autoload :Verification, 'action_controller/base/verification' module Assertions - autoload :DomAssertions, 'action_controller/assertions/dom_assertions' - autoload :ModelAssertions, 'action_controller/assertions/model_assertions' - autoload :ResponseAssertions, 'action_controller/assertions/response_assertions' - autoload :RoutingAssertions, 'action_controller/assertions/routing_assertions' - autoload :SelectorAssertions, 'action_controller/assertions/selector_assertions' - autoload :TagAssertions, 'action_controller/assertions/tag_assertions' + autoload :DomAssertions, 'action_controller/testing/assertions/dom' + autoload :ModelAssertions, 'action_controller/testing/assertions/model' + autoload :ResponseAssertions, 'action_controller/testing/assertions/response' + autoload :RoutingAssertions, 'action_controller/testing/assertions/routing' + autoload :SelectorAssertions, 'action_controller/testing/assertions/selector' + autoload :TagAssertions, 'action_controller/testing/assertions/tag' end module Http - autoload :Headers, 'action_controller/headers' + autoload :Headers, 'action_controller/base/headers' end module Session @@ -102,13 +106,9 @@ module ActionController autoload :CookieStore, 'action_controller/session/cookie_store' autoload :MemCacheStore, 'action_controller/session/mem_cache_store' end - - # DEPRECATE: Remove CGI support - autoload :CgiRequest, 'action_controller/cgi_process' - autoload :CGIHandler, 'action_controller/cgi_process' end -autoload :Mime, 'action_controller/mime_type' +autoload :Mime, 'action_controller/mime/type' autoload :HTML, 'action_controller/vendor/html-scanner' -- cgit v1.2.3 From 319ae4628f4e0058de3e40e4ca7791b17e45e70c Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 27 Jan 2009 18:54:01 -0600 Subject: Move HTTP libs and middleware into ActionDispatch component --- actionpack/lib/action_controller.rb | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) (limited to 'actionpack/lib/action_controller.rb') 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' -- cgit v1.2.3