Skip to content
This repository
Browse code

Move AbstractController to a top-level component

  • Loading branch information...
commit 71638e6760bed0445e5fefc185924b07076fef47 1 parent 16c0122
Yehuda Katz authored August 06, 2009
16  actionpack/lib/abstract_controller.rb
... ...
@@ -0,0 +1,16 @@
  1
+require "active_support/core_ext/module/attr_internal"
  2
+require "active_support/core_ext/module/delegation"
  3
+
  4
+module AbstractController
  5
+  autoload :Base,               "abstract_controller/base"
  6
+  autoload :Benchmarker,        "abstract_controller/benchmarker"
  7
+  autoload :Callbacks,          "abstract_controller/callbacks"
  8
+  autoload :Helpers,            "abstract_controller/helpers"
  9
+  autoload :Layouts,            "abstract_controller/layouts"
  10
+  autoload :Logger,             "abstract_controller/logger"
  11
+  autoload :Renderer,           "abstract_controller/renderer"
  12
+  # === Exceptions
  13
+  autoload :ActionNotFound,     "abstract_controller/exceptions"
  14
+  autoload :DoubleRenderError,  "abstract_controller/exceptions"
  15
+  autoload :Error,              "abstract_controller/exceptions"
  16
+end
0  actionpack/lib/action_controller/abstract/base.rb → actionpack/lib/abstract_controller/base.rb
File renamed without changes
0  ...ack/lib/action_controller/abstract/benchmarker.rb → actionpack/lib/abstract_controller/benchmarker.rb
File renamed without changes
0  ...npack/lib/action_controller/abstract/callbacks.rb → actionpack/lib/abstract_controller/callbacks.rb
File renamed without changes
0  ...pack/lib/action_controller/abstract/exceptions.rb → actionpack/lib/abstract_controller/exceptions.rb
File renamed without changes
0  actionpack/lib/action_controller/abstract/helpers.rb → actionpack/lib/abstract_controller/helpers.rb
File renamed without changes
0  actionpack/lib/action_controller/abstract/layouts.rb → actionpack/lib/abstract_controller/layouts.rb
File renamed without changes
0  actionpack/lib/action_controller/abstract/logger.rb → actionpack/lib/abstract_controller/logger.rb
File renamed without changes
2  ...onpack/lib/action_controller/abstract/renderer.rb → actionpack/lib/abstract_controller/renderer.rb
... ...
@@ -1,4 +1,4 @@
1  
-require "action_controller/abstract/logger"
  1
+require "abstract_controller/logger"
2 2
 
3 3
 module AbstractController
4 4
   module Renderer
2  actionpack/lib/action_controller.rb
@@ -56,7 +56,7 @@ module ActionController
56 56
 end
57 57
 
58 58
 autoload :HTML, 'action_controller/vendor/html-scanner'
59  
-autoload :AbstractController, 'action_controller/abstract'
  59
+autoload :AbstractController, 'abstract_controller'
60 60
 
61 61
 autoload :Rack,                       'action_dispatch'
62 62
 autoload :ActionDispatch,             'action_dispatch'
16  actionpack/lib/action_controller/abstract.rb
... ...
@@ -1,16 +0,0 @@
1  
-require "active_support/core_ext/module/attr_internal"
2  
-require "active_support/core_ext/module/delegation"
3  
-
4  
-module AbstractController
5  
-  autoload :Base,               "action_controller/abstract/base"
6  
-  autoload :Benchmarker,        "action_controller/abstract/benchmarker"
7  
-  autoload :Callbacks,          "action_controller/abstract/callbacks"
8  
-  autoload :Helpers,            "action_controller/abstract/helpers"
9  
-  autoload :Layouts,            "action_controller/abstract/layouts"
10  
-  autoload :Logger,             "action_controller/abstract/logger"
11  
-  autoload :Renderer,           "action_controller/abstract/renderer"
12  
-  # === Exceptions
13  
-  autoload :ActionNotFound,     "action_controller/abstract/exceptions"
14  
-  autoload :DoubleRenderError,  "action_controller/abstract/exceptions"
15  
-  autoload :Error,              "action_controller/abstract/exceptions"
16  
-end
2  actionpack/lib/action_controller/metal.rb
... ...
@@ -1,5 +1,3 @@
1  
-require 'action_controller/abstract'
2  
-
3 1
 module ActionController
4 2
   # ActionController::Metal provides a way to get a valid Rack application from a controller.
5 3
   #
2  actionpack/test/abstract_controller/test_helper.rb
@@ -6,7 +6,7 @@
6 6
 require 'test/unit'
7 7
 require 'active_support'
8 8
 require 'active_support/test_case'
9  
-require 'action_controller/abstract'
  9
+require 'abstract_controller'
10 10
 require 'action_view'
11 11
 require 'action_view/base'
12 12
 require 'action_dispatch'
1  actionpack/test/abstract_unit.rb
@@ -13,7 +13,6 @@
13 13
 require 'active_support'
14 14
 
15 15
 require 'active_support/test_case'
16  
-require 'action_controller/abstract'
17 16
 require 'action_controller'
18 17
 require 'fixture_template'
19 18
 require 'action_controller/testing/process'

0 notes on commit 71638e6

Please sign in to comment.
Something went wrong with that request. Please try again.