Permalink
Browse files

Pass the view object as parameter to the handler. Useful if you need …

…to access the lookup context or other information when compiling the template.
  • Loading branch information...
1 parent 7b2f2c8 commit f14c2bf58204f488cbe589e077a124865ea595f5 @josevalim josevalim committed Nov 17, 2010
Showing with 11 additions and 1 deletion.
  1. +2 −1 actionpack/lib/action_view/template.rb
  2. +9 −0 actionpack/test/template/render_test.rb
@@ -269,7 +269,8 @@ def compile(view, mod) #:nodoc:
end
end
- code = @handler.call(self)
+ arity = @handler.respond_to?(:arity) ? @handler.arity : @handler.method(:call).arity
+ code = arity == 1 ? @handler.call(self) : @handler.call(self, view)
# Make sure that the resulting String to be evalled is in the
# encoding of the code
@@ -221,6 +221,15 @@ def test_render_fallbacks_to_erb_for_unknown_types
"@output_buffer << 'source: #{template.source.inspect}'\n"
end
+ WithViewHandler = lambda do |template, view|
+ %'"#{template.class} #{view.class}"'
+ end
+
+ def test_render_inline_with_template_handler_with_view
+ ActionView::Template.register_template_handler :with_view, WithViewHandler
+ assert_equal 'ActionView::Template ActionView::Base', @view.render(:inline => "Hello, World!", :type => :with_view)
+ end
+
def test_render_inline_with_compilable_custom_type
ActionView::Template.register_template_handler :foo, CustomHandler
assert_equal 'source: "Hello, World!"', @view.render(:inline => "Hello, World!", :type => :foo)

0 comments on commit f14c2bf

Please sign in to comment.