SReorganize autoloads slightly and move two files to lib/action_view root.

5 files changed, 8 insertions, 11 deletions

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index d7292e8324..dada64a86f 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -30,13 +30,15 @@ module ActionView
   extend ActiveSupport::Autoload
 
   eager_autoload do
+    autoload :Base
     autoload :Context
-    autoload :Template
     autoload :Helpers
-    autoload :Base
     autoload :LookupContext
-    autoload :PathSet,        "action_view/paths"
-    autoload :TestCase,       "action_view/test_case"
+    autoload :Partials
+    autoload :PathSet
+    autoload :Rendering
+    autoload :Template
+    autoload :TestCase
 
     autoload_under "renderer" do
       autoload :AbstractRenderer
@@ -44,11 +46,6 @@ module ActionView
       autoload :TemplateRenderer
     end
 
-    autoload_under "render" do
-      autoload :Partials
-      autoload :Rendering
-    end
-
     autoload_at "action_view/template/resolver" do
       autoload :Resolver
       autoload :PathResolver
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/partials.rb
index 844c3e9572..844c3e9572 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/partials.rb
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/path_set.rb
index dc26d75ff3..dc26d75ff3 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/path_set.rb
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/rendering.rb
index baa5d2c3fd..baa5d2c3fd 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/rendering.rb
diff --git a/actionpack/lib/action_view/template/handler.rb b/actionpack/lib/action_view/template/handler.rb
index 0a9d299807..636f3ebbad 100644
--- a/actionpack/lib/action_view/template/handler.rb
+++ b/actionpack/lib/action_view/template/handler.rb
@@ -8,7 +8,7 @@ module ActionView
       module Compilable
         def self.included(base)
           ActiveSupport::Deprecation.warn "Including Compilable in your template handler is deprecated. " <<
-            "All the API your template handler needs to implement is to respond to #call."
+            "Since Rails 3, all the API your template handler needs to implement is to respond to #call."
           base.extend(ClassMethods)
         end
 
@@ -30,7 +30,7 @@ module ActionView
 
       def self.inherited(base)
         ActiveSupport::Deprecation.warn "Inheriting from ActionView::Template::Handler is deprecated. " <<
-          "All the API your template handler needs to implement is to respond to #call."
+          "Since Rails 3, all the API your template handler needs to implement is to respond to #call."
         super
       end