Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move AbstractController to a top-level component

  • Loading branch information...
commit 71638e6760bed0445e5fefc185924b07076fef47 1 parent 16c0122
@wycats wycats authored
View
16 actionpack/lib/abstract_controller.rb
@@ -0,0 +1,16 @@
+require "active_support/core_ext/module/attr_internal"
+require "active_support/core_ext/module/delegation"
+
+module AbstractController
+ autoload :Base, "abstract_controller/base"
+ autoload :Benchmarker, "abstract_controller/benchmarker"
+ autoload :Callbacks, "abstract_controller/callbacks"
+ autoload :Helpers, "abstract_controller/helpers"
+ autoload :Layouts, "abstract_controller/layouts"
+ autoload :Logger, "abstract_controller/logger"
+ autoload :Renderer, "abstract_controller/renderer"
+ # === Exceptions
+ autoload :ActionNotFound, "abstract_controller/exceptions"
+ autoload :DoubleRenderError, "abstract_controller/exceptions"
+ autoload :Error, "abstract_controller/exceptions"
+end
View
0  actionpack/lib/action_controller/abstract/base.rb → actionpack/lib/abstract_controller/base.rb
File renamed without changes
View
0  ...ack/lib/action_controller/abstract/benchmarker.rb → actionpack/lib/abstract_controller/benchmarker.rb
File renamed without changes
View
0  ...npack/lib/action_controller/abstract/callbacks.rb → actionpack/lib/abstract_controller/callbacks.rb
File renamed without changes
View
0  ...pack/lib/action_controller/abstract/exceptions.rb → actionpack/lib/abstract_controller/exceptions.rb
File renamed without changes
View
0  actionpack/lib/action_controller/abstract/helpers.rb → actionpack/lib/abstract_controller/helpers.rb
File renamed without changes
View
0  actionpack/lib/action_controller/abstract/layouts.rb → actionpack/lib/abstract_controller/layouts.rb
File renamed without changes
View
0  actionpack/lib/action_controller/abstract/logger.rb → actionpack/lib/abstract_controller/logger.rb
File renamed without changes
View
2  ...onpack/lib/action_controller/abstract/renderer.rb → actionpack/lib/abstract_controller/renderer.rb
@@ -1,4 +1,4 @@
-require "action_controller/abstract/logger"
+require "abstract_controller/logger"
module AbstractController
module Renderer
View
2  actionpack/lib/action_controller.rb
@@ -56,7 +56,7 @@ module ActionController
end
autoload :HTML, 'action_controller/vendor/html-scanner'
-autoload :AbstractController, 'action_controller/abstract'
+autoload :AbstractController, 'abstract_controller'
autoload :Rack, 'action_dispatch'
autoload :ActionDispatch, 'action_dispatch'
View
16 actionpack/lib/action_controller/abstract.rb
@@ -1,16 +0,0 @@
-require "active_support/core_ext/module/attr_internal"
-require "active_support/core_ext/module/delegation"
-
-module AbstractController
- autoload :Base, "action_controller/abstract/base"
- autoload :Benchmarker, "action_controller/abstract/benchmarker"
- autoload :Callbacks, "action_controller/abstract/callbacks"
- autoload :Helpers, "action_controller/abstract/helpers"
- autoload :Layouts, "action_controller/abstract/layouts"
- autoload :Logger, "action_controller/abstract/logger"
- autoload :Renderer, "action_controller/abstract/renderer"
- # === Exceptions
- autoload :ActionNotFound, "action_controller/abstract/exceptions"
- autoload :DoubleRenderError, "action_controller/abstract/exceptions"
- autoload :Error, "action_controller/abstract/exceptions"
-end
View
2  actionpack/lib/action_controller/metal.rb
@@ -1,5 +1,3 @@
-require 'action_controller/abstract'
-
module ActionController
# ActionController::Metal provides a way to get a valid Rack application from a controller.
#
View
2  actionpack/test/abstract_controller/test_helper.rb
@@ -6,7 +6,7 @@
require 'test/unit'
require 'active_support'
require 'active_support/test_case'
-require 'action_controller/abstract'
+require 'abstract_controller'
require 'action_view'
require 'action_view/base'
require 'action_dispatch'
View
1  actionpack/test/abstract_unit.rb
@@ -13,7 +13,6 @@
require 'active_support'
require 'active_support/test_case'
-require 'action_controller/abstract'
require 'action_controller'
require 'fixture_template'
require 'action_controller/testing/process'
Please sign in to comment.
Something went wrong with that request. Please try again.