From 01f032f256f96f65e154061b582fbb4b32e4a692 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 20 May 2009 15:33:08 -0700
Subject: Added responds_to to new base.

---
 actionpack/lib/action_controller/new_base/base.rb          |  1 +
 actionpack/lib/action_controller/new_base/compatibility.rb | 11 +++++++----
 actionpack/lib/action_controller/new_base/renderer.rb      |  2 +-
 actionpack/lib/action_controller/new_base/testing.rb       |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib/action_controller/new_base')

diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 7f830307b6..3d8d46c9c2 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -18,6 +18,7 @@ module ActionController
     include SessionManagement
     include ActionDispatch::StatusCodes
     include ActionController::Caching
+    include ActionController::MimeResponds
 
     # Rails 2.x compatibility
     include ActionController::Rails2Compatibility
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index 0098c0747e..c861af2fa2 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -59,6 +59,11 @@ module ActionController
     def initialize_template_class(*) end
     def assign_shortcuts(*) end
 
+    # TODO: Remove this after we flip
+    def template
+      _action_view
+    end
+
     module ClassMethods
       def protect_from_forgery() end
       def consider_all_requests_local() end
@@ -95,10 +100,8 @@ module ActionController
       super || (respond_to?(:method_missing) && "_handle_method_missing")
     end    
       
-    def _layout_for_name(name)
-      name &&= name.sub(%r{^/?layouts/}, '')
-      super
+    def _layout_prefix(name)
+      super unless name =~ /\blayouts/
     end
-   
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index 9253df53a1..276816a6f5 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -18,7 +18,7 @@ module ActionController
       _process_options(options)
       
       if options.key?(:text)
-        options[:_template] = ActionView::TextTemplate.new(_text(options))
+        options[:_template] = ActionView::TextTemplate.new(_text(options), formats.first)
         template = nil
       elsif options.key?(:inline)
         handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
diff --git a/actionpack/lib/action_controller/new_base/testing.rb b/actionpack/lib/action_controller/new_base/testing.rb
index b39d8d539d..0659d81710 100644
--- a/actionpack/lib/action_controller/new_base/testing.rb
+++ b/actionpack/lib/action_controller/new_base/testing.rb
@@ -7,7 +7,7 @@ module ActionController
       @_response = response
       @_response.request = request
       ret = process(request.parameters[:action])
-      @_response.body = self.response_body || " "
+      @_response.body ||= self.response_body || " "
       @_response.prepare!
       set_test_assigns
       ret
-- 
cgit v1.2.3