Working on being able to render :text with layouts

3 files changed, 17 insertions, 1 deletions

diff --git a/actionpack/lib/action_view/template/renderable.rb b/actionpack/lib/action_view/template/renderable.rb
index 35c832aaba..fde37544f3 100644
--- a/actionpack/lib/action_view/template/renderable.rb
+++ b/actionpack/lib/action_view/template/renderable.rb
@@ -4,6 +4,13 @@ module ActionView
   module Renderable #:nodoc:
     extend ActiveSupport::Memoizable
 
+    def render(view, locals)
+      compile(locals)
+      view.send(method_name(locals), locals) {|*args| yield(*args) }
+    end
+    
+  private
+  
     def filename
       'compiled-template'
     end
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb
index 1ee073c3e9..73e319b489 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template/template.rb
@@ -206,7 +206,7 @@ module ActionView #:nodoc:
 
     def load!
       @cached = true
-      freeze
+      # freeze
     end
 
     private
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
new file mode 100644
index 0000000000..f81174d707
--- /dev/null
+++ b/actionpack/lib/action_view/template/text.rb
@@ -0,0 +1,9 @@
+module ActionView #:nodoc:
+  class TextTemplate < String #:nodoc:
+    
+    def render(*) self end
+    
+    def exempt_from_layout?() false end
+    
+  end
+end