1 files changed, 22 insertions, 21 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index e95e84aeb5..c3e42ac0d5 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -21,38 +21,39 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require File.join(File.dirname(__FILE__), "action_pack")
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+require 'active_support'
+require 'active_support/core_ext/class/attribute_accessors'
+
+require 'action_pack'
 
 module ActionView
-  def self.load_all!
-    [Context, Base, InlineTemplate, TemplateError]
+  extend ActiveSupport::Autoload
+
+  autoload :Base
+  autoload :Context
+  autoload :Template
+  autoload :Helpers
+  autoload :SafeBuffer
+
+
+  autoload_under "render" do
+    autoload :Partials
+    autoload :Rendering
   end
 
-  autoload :Base,              'action_view/base'
-  autoload :Context,           'action_view/context'
-  autoload :Helpers,           'action_view/helpers'
   autoload :MissingTemplate,   'action_view/base'
-  autoload :Partials,          'action_view/render/partials'
   autoload :Resolver,          'action_view/template/resolver'
   autoload :PathResolver,      'action_view/template/resolver'
   autoload :PathSet,           'action_view/paths'
-  autoload :Rendering,         'action_view/render/rendering'
-  autoload :Template,          'action_view/template/template'
-  autoload :TemplateError,     'action_view/template/error'
-  autoload :TemplateHandler,   'action_view/template/handler'
-  autoload :TemplateHandlers,  'action_view/template/handlers'
-  autoload :TextTemplate,      'action_view/template/text'
-  autoload :Helpers,           'action_view/helpers'
   autoload :FileSystemResolverWithFallback, 'action_view/template/resolver'
-  autoload :SafeBuffer,        'action_view/safe_buffer'
+
+  autoload :TemplateError,     'action_view/template/error'
+  autoload :TemplateHandler,   'action_view/template'
+  autoload :TemplateHandlers,  'action_view/template'
 end
 
 require 'action_view/erb/util'
 
-
 I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
-
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift activesupport_path if File.directory?(activesupport_path)
-require 'active_support'
-require 'active_support/core_ext/class/attribute_accessors'