Permalink
Browse files

Rename /base to /metal and make base.rb and metal.rb top-level to ref…

…lect their module locations
  • Loading branch information...
1 parent 52798fd commit bd6b61be88dfe6eb1ff1dcc5c17542d804a842c7 @wycats wycats committed Aug 6, 2009
Showing with 36 additions and 36 deletions.
  1. +36 −36 actionpack/lib/action_controller.rb
  2. 0 actionpack/lib/action_controller/{base → }/base.rb
  3. 0 actionpack/lib/action_controller/{base → }/metal.rb
  4. 0 actionpack/lib/action_controller/{base → metal}/compatibility.rb
  5. 0 actionpack/lib/action_controller/{base → metal}/conditional_get.rb
  6. 0 actionpack/lib/action_controller/{base → metal}/cookies.rb
  7. 0 actionpack/lib/action_controller/{base → metal}/exceptions.rb
  8. 0 actionpack/lib/action_controller/{base → metal}/filter_parameter_logging.rb
  9. 0 actionpack/lib/action_controller/{base → metal}/flash.rb
  10. 0 actionpack/lib/action_controller/{base → metal}/helpers.rb
  11. 0 actionpack/lib/action_controller/{base → metal}/hide_actions.rb
  12. 0 actionpack/lib/action_controller/{base → metal}/http_authentication.rb
  13. 0 actionpack/lib/action_controller/{base → metal}/layouts.rb
  14. 0 actionpack/lib/action_controller/{base → metal}/mime_responds.rb
  15. 0 actionpack/lib/action_controller/{base → metal}/rack_convenience.rb
  16. 0 actionpack/lib/action_controller/{base → metal}/redirector.rb
  17. 0 actionpack/lib/action_controller/{base → metal}/render_options.rb
  18. 0 actionpack/lib/action_controller/{base → metal}/renderer.rb
  19. 0 actionpack/lib/action_controller/{base → metal}/request_forgery_protection.rb
  20. 0 actionpack/lib/action_controller/{base → metal}/rescuable.rb
  21. 0 actionpack/lib/action_controller/{base → metal}/session.rb
  22. 0 actionpack/lib/action_controller/{base → metal}/session_management.rb
  23. 0 actionpack/lib/action_controller/{base → metal}/streaming.rb
  24. 0 actionpack/lib/action_controller/{base → metal}/testing.rb
  25. 0 actionpack/lib/action_controller/{base → metal}/url_for.rb
  26. 0 actionpack/lib/action_controller/{base → metal}/verification.rb
@@ -1,56 +1,56 @@
module ActionController
- autoload :Base, "action_controller/base/base"
- autoload :ConditionalGet, "action_controller/base/conditional_get"
- autoload :HideActions, "action_controller/base/hide_actions"
- autoload :Metal, "action_controller/base/metal"
- autoload :Layouts, "action_controller/base/layouts"
- autoload :RackConvenience, "action_controller/base/rack_convenience"
- autoload :Rails2Compatibility, "action_controller/base/compatibility"
- autoload :Redirector, "action_controller/base/redirector"
- autoload :Renderer, "action_controller/base/renderer"
- autoload :RenderOptions, "action_controller/base/render_options"
- autoload :Renderers, "action_controller/base/render_options"
- autoload :Rescue, "action_controller/base/rescuable"
- autoload :Testing, "action_controller/base/testing"
- autoload :UrlFor, "action_controller/base/url_for"
- autoload :Session, "action_controller/base/session"
- autoload :Helpers, "action_controller/base/helpers"
+ autoload :Base, "action_controller/base"
+ autoload :ConditionalGet, "action_controller/metal/conditional_get"
+ autoload :HideActions, "action_controller/metal/hide_actions"
+ autoload :Metal, "action_controller/metal"
+ autoload :Layouts, "action_controller/metal/layouts"
+ autoload :RackConvenience, "action_controller/metal/rack_convenience"
+ autoload :Rails2Compatibility, "action_controller/metal/compatibility"
+ autoload :Redirector, "action_controller/metal/redirector"
+ autoload :Renderer, "action_controller/metal/renderer"
+ autoload :RenderOptions, "action_controller/metal/render_options"
+ autoload :Renderers, "action_controller/metal/render_options"
+ autoload :Rescue, "action_controller/metal/rescuable"
+ autoload :Testing, "action_controller/metal/testing"
+ autoload :UrlFor, "action_controller/metal/url_for"
+ autoload :Session, "action_controller/metal/session"
+ autoload :Helpers, "action_controller/metal/helpers"
# Ported modules
# require 'action_controller/routing'
autoload :Caching, 'action_controller/caching'
autoload :Dispatcher, 'action_controller/dispatch/dispatcher'
autoload :Integration, 'action_controller/testing/integration'
- autoload :MimeResponds, 'action_controller/base/mime_responds'
+ autoload :MimeResponds, 'action_controller/metal/mime_responds'
autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
autoload :RecordIdentifier, 'action_controller/record_identifier'
autoload :Resources, 'action_controller/routing/resources'
- autoload :SessionManagement, 'action_controller/base/session_management'
+ autoload :SessionManagement, 'action_controller/metal/session_management'
autoload :TestCase, 'action_controller/testing/test_case'
autoload :TestProcess, 'action_controller/testing/process'
autoload :UrlRewriter, 'action_controller/routing/generation/url_rewriter'
autoload :UrlWriter, 'action_controller/routing/generation/url_rewriter'
- autoload :Verification, 'action_controller/base/verification'
- autoload :Flash, 'action_controller/base/flash'
- autoload :RequestForgeryProtection, 'action_controller/base/request_forgery_protection'
- autoload :Streaming, 'action_controller/base/streaming'
- autoload :HttpAuthentication, 'action_controller/base/http_authentication'
- autoload :FilterParameterLogging, 'action_controller/base/filter_parameter_logging'
+ autoload :Verification, 'action_controller/metal/verification'
+ autoload :Flash, 'action_controller/metal/flash'
+ autoload :RequestForgeryProtection, 'action_controller/metal/request_forgery_protection'
+ autoload :Streaming, 'action_controller/metal/streaming'
+ autoload :HttpAuthentication, 'action_controller/metal/http_authentication'
+ autoload :FilterParameterLogging, 'action_controller/metal/filter_parameter_logging'
autoload :Translation, 'action_controller/translation'
- autoload :Cookies, 'action_controller/base/cookies'
+ autoload :Cookies, 'action_controller/metal/cookies'
- autoload :ActionControllerError, 'action_controller/base/exceptions'
- autoload :SessionRestoreError, 'action_controller/base/exceptions'
- autoload :RenderError, 'action_controller/base/exceptions'
- autoload :RoutingError, 'action_controller/base/exceptions'
- autoload :MethodNotAllowed, 'action_controller/base/exceptions'
- autoload :NotImplemented, 'action_controller/base/exceptions'
- autoload :UnknownController, 'action_controller/base/exceptions'
- autoload :MissingFile, 'action_controller/base/exceptions'
- autoload :RenderError, 'action_controller/base/exceptions'
- autoload :SessionOverflowError, 'action_controller/base/exceptions'
- autoload :UnknownHttpMethod, 'action_controller/base/exceptions'
+ autoload :ActionControllerError, 'action_controller/metal/exceptions'
+ autoload :SessionRestoreError, 'action_controller/metal/exceptions'
+ autoload :RenderError, 'action_controller/metal/exceptions'
+ autoload :RoutingError, 'action_controller/metal/exceptions'
+ autoload :MethodNotAllowed, 'action_controller/metal/exceptions'
+ autoload :NotImplemented, 'action_controller/metal/exceptions'
+ autoload :UnknownController, 'action_controller/metal/exceptions'
+ autoload :MissingFile, 'action_controller/metal/exceptions'
+ autoload :RenderError, 'action_controller/metal/exceptions'
+ autoload :SessionOverflowError, 'action_controller/metal/exceptions'
+ autoload :UnknownHttpMethod, 'action_controller/metal/exceptions'
autoload :Routing, 'action_controller/routing'
end

0 comments on commit bd6b61b

Please sign in to comment.