Removed lagacy TemplateHandler#render API. Left in a legacy TemplateHandler and Compilable stub so plugins will not have to change anything.

7 files changed, 20 insertions, 76 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index a6872b1a47..ae6b284854 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -379,8 +379,8 @@ module ActionView #:nodoc:
         @assigns.each { |key, value| instance_variable_set("@#{key}", value) }
       end
 
-      def execute(template, local_assigns = {})
-        send(template.method(local_assigns), local_assigns) do |*names|
+      def execute(method, local_assigns = {})
+        send(method, local_assigns) do |*names|
           instance_variable_get "@content_for_#{names.first || 'layout'}"
         end
       end
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb
index 5090d0160a..4f865cbced 100644
--- a/actionpack/lib/action_view/renderable.rb
+++ b/actionpack/lib/action_view/renderable.rb
@@ -19,7 +19,7 @@ module ActionView
     memoize :handler
 
     def compiled_source
-      handler.new(nil).compile(self) if handler.compilable?
+      handler.call(self)
     end
     memoize :compiled_source
 
@@ -27,8 +27,8 @@ module ActionView
       view._first_render ||= self
       view._last_render = self
       view.send(:evaluate_assigns)
-      compile(local_assigns) if handler.compilable?
-      handler.new(view).render(self, local_assigns)
+      compile(local_assigns)
+      view.send(:execute, method(local_assigns), local_assigns)
     end
 
     def method(local_assigns)
diff --git a/actionpack/lib/action_view/template_handler.rb b/actionpack/lib/action_view/template_handler.rb
index e2dd305f93..d7e7c9b199 100644
--- a/actionpack/lib/action_view/template_handler.rb
+++ b/actionpack/lib/action_view/template_handler.rb
@@ -1,21 +1,14 @@
-module ActionView
-  class TemplateHandler
-    def self.compilable?
-      false
-    end
-
-    def initialize(view)
-      @view = view
-    end
+# Legacy TemplateHandler stub
 
-    def render(template, local_assigns = {})
-    end
-
-    def compile(template)
+module ActionView
+  module TemplateHandlers
+    module Compilable
     end
+  end
 
-    def compilable?
-      self.class.compilable?
+  class TemplateHandler
+    def self.call(template)
+      new.compile(template)
     end
   end
 end
diff --git a/actionpack/lib/action_view/template_handlers.rb b/actionpack/lib/action_view/template_handlers.rb
index 1471e99e01..6c8aa4c2a7 100644
--- a/actionpack/lib/action_view/template_handlers.rb
+++ b/actionpack/lib/action_view/template_handlers.rb
@@ -1,5 +1,4 @@
 require 'action_view/template_handler'
-require 'action_view/template_handlers/compilable'
 require 'action_view/template_handlers/builder'
 require 'action_view/template_handlers/erb'
 require 'action_view/template_handlers/rjs'
diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb
deleted file mode 100644
index a0ebaefeef..0000000000
--- a/actionpack/lib/action_view/template_handlers/compilable.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module ActionView
-  module TemplateHandlers
-    module Compilable
-      def self.included(base)
-        base.extend ClassMethod
-      end
-
-      module ClassMethod
-        # If a handler is mixin this module, set compilable to true
-        def compilable?
-          true
-        end
-      end
-
-      def render(template, local_assigns = {})
-        @view.send(:execute, template, local_assigns)
-      end
-    end
-  end
-end
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 92b6aa4f2f..72c01a9102 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -31,16 +31,8 @@ end
 class MultipleExtensions < LayoutTest
 end
 
-class MabView < ActionView::TemplateHandler
-  def initialize(view)
-  end
-
-  def render(template, local_assigns)
-    template.source
-  end
-end
-
-ActionView::Template::register_template_handler :mab, MabView
+ActionView::Template::register_template_handler :mab,
+  lambda { |template| template.source.inspect }
 
 class LayoutAutoDiscoveryTest < Test::Unit::TestCase
   def setup
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index cc5b4900dc..b1af043099 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -94,38 +94,18 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal "Hello, World!", @view.render(:inline => "Hello, World!", :type => :foo)
   end
 
-  class CustomHandler < ActionView::TemplateHandler
-    def render(template, local_assigns)
-      [template.source, local_assigns].inspect
-    end
-  end
-
-  def test_render_inline_with_custom_type
-    ActionView::Template.register_template_handler :foo, CustomHandler
-    assert_equal '["Hello, World!", {}]', @view.render(:inline => "Hello, World!", :type => :foo)
-  end
-
-  def test_render_inline_with_locals_and_custom_type
-    ActionView::Template.register_template_handler :foo, CustomHandler
-    assert_equal '["Hello, <%= name %>!", {:name=>"Josh"}]', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
-  end
-
-  class CompilableCustomHandler < ActionView::TemplateHandler
-    include ActionView::TemplateHandlers::Compilable
-
-    def compile(template)
-      "@output_buffer = ''\n" +
-        "@output_buffer << 'source: #{template.source.inspect}'\n"
-    end
+  CustomHandler = lambda do |template|
+    "@output_buffer = ''\n" +
+      "@output_buffer << 'source: #{template.source.inspect}'\n"
   end
 
   def test_render_inline_with_compilable_custom_type
-    ActionView::Template.register_template_handler :foo, CompilableCustomHandler
+    ActionView::Template.register_template_handler :foo, CustomHandler
     assert_equal 'source: "Hello, World!"', @view.render(:inline => "Hello, World!", :type => :foo)
   end
 
   def test_render_inline_with_locals_and_compilable_custom_type
-    ActionView::Template.register_template_handler :foo, CompilableCustomHandler
+    ActionView::Template.register_template_handler :foo, CustomHandler
     assert_equal 'source: "Hello, <%= name %>!"', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
   end
 end