Merge branch 'master' of git@github.com:rails/rails

1 files changed, 8 insertions, 19 deletions

diff --git a/actionpack/lib/action_view/template_handler.rb b/actionpack/lib/action_view/template_handler.rb
index 1afea21f67..d7e7c9b199 100644
--- a/actionpack/lib/action_view/template_handler.rb
+++ b/actionpack/lib/action_view/template_handler.rb
@@ -1,25 +1,14 @@
-module ActionView
-  class TemplateHandler
-    def self.compilable?
-      false
-    end
-
-    def initialize(view)
-      @view = view
-    end
-
-    def render(template, local_assigns = {})
-    end
-
-    def compile(template)
-    end
+# Legacy TemplateHandler stub
 
-    def compilable?
-      self.class.compilable?
+module ActionView
+  module TemplateHandlers
+    module Compilable
     end
+  end
 
-    # Called by CacheHelper#cache
-    def cache_fragment(block, name = {}, options = nil)
+  class TemplateHandler
+    def self.call(template)
+      new.compile(template)
     end
   end
 end