diff options
author | José Valim <jose.valim@gmail.com> | 2010-10-14 09:32:53 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-10-14 09:32:53 +0200 |
commit | aa508c9baf031d0bb28e6e8f061d731cdd77ecbd (patch) | |
tree | 0bdbaa10f2a756bbe3778c6460bbabc60aae65d5 /actionpack/lib | |
parent | 37d78028b235f04b2d3ca5cd88b7e1e0ad218684 (diff) | |
download | rails-aa508c9baf031d0bb28e6e8f061d731cdd77ecbd.tar.gz rails-aa508c9baf031d0bb28e6e8f061d731cdd77ecbd.tar.bz2 rails-aa508c9baf031d0bb28e6e8f061d731cdd77ecbd.zip |
SReorganize autoloads slightly and move two files to lib/action_view root.
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_view.rb | 15 | ||||
-rw-r--r-- | actionpack/lib/action_view/partials.rb (renamed from actionpack/lib/action_view/render/partials.rb) | 0 | ||||
-rw-r--r-- | actionpack/lib/action_view/path_set.rb (renamed from actionpack/lib/action_view/paths.rb) | 0 | ||||
-rw-r--r-- | actionpack/lib/action_view/rendering.rb (renamed from actionpack/lib/action_view/render/rendering.rb) | 0 | ||||
-rw-r--r-- | actionpack/lib/action_view/template/handler.rb | 4 |
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 |