diff options
author | Michael Koziarski <michael@koziarski.com> | 2008-01-11 04:45:06 +0000 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-01-11 04:45:06 +0000 |
commit | e6de95889dd361359bcd885c9f38087f14f57628 (patch) | |
tree | 6886ef6ae276e44d41df2e6b077f35ee3ae00a6f /actionpack/lib/action_view/template_handlers | |
parent | feea0f106ed705986f2efc1d244b03df9a45739b (diff) | |
download | rails-e6de95889dd361359bcd885c9f38087f14f57628.tar.gz rails-e6de95889dd361359bcd885c9f38087f14f57628.tar.bz2 rails-e6de95889dd361359bcd885c9f38087f14f57628.zip |
* Pass around handler instances, not their classes [Koz]
* Move compilation, rendering and 'compilable?' checks into the Handlers [Koz]
* Remove delegate_* methods as the handler is now an instance [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8624 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/template_handlers')
-rw-r--r-- | actionpack/lib/action_view/template_handlers/builder.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_view/template_handlers/erb.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_view/template_handlers/rjs.rb | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/template_handlers/builder.rb b/actionpack/lib/action_view/template_handlers/builder.rb index 88044917dd..098c90f5c7 100644 --- a/actionpack/lib/action_view/template_handlers/builder.rb +++ b/actionpack/lib/action_view/template_handlers/builder.rb @@ -7,6 +7,10 @@ module ActionView 2 end + def self.compilable? + true + end + def compile(template) content_type_handler = (@view.send!(:controller).respond_to?(:response) ? "controller.response" : "controller") "#{content_type_handler}.content_type ||= Mime::XML\n" + diff --git a/actionpack/lib/action_view/template_handlers/erb.rb b/actionpack/lib/action_view/template_handlers/erb.rb index 26cca586ba..ffc1ab0e97 100644 --- a/actionpack/lib/action_view/template_handlers/erb.rb +++ b/actionpack/lib/action_view/template_handlers/erb.rb @@ -26,6 +26,10 @@ module ActionView ::ERB.new(template, nil, @view.erb_trim_mode).src end + def self.compilable? + true + end + def cache_fragment(block, name = {}, options = nil) #:nodoc: @view.fragment_for(block, name, options) do eval(ActionView::Base.erb_variable, block.binding) diff --git a/actionpack/lib/action_view/template_handlers/rjs.rb b/actionpack/lib/action_view/template_handlers/rjs.rb index bd51cc4d39..e4b3d0c2a6 100644 --- a/actionpack/lib/action_view/template_handlers/rjs.rb +++ b/actionpack/lib/action_view/template_handlers/rjs.rb @@ -10,6 +10,10 @@ module ActionView "update_page do |page|\n#{template}\nend" end + def self.compilable? + true + end + def cache_fragment(block, name = {}, options = nil) #:nodoc: @view.fragment_for(block, name, options) do begin |