From e22a3d893ef8441fb52320315c5e348c6c208b69 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
Date: Sat, 23 May 2009 00:39:32 -0700
Subject: Slightly modify things to get content type matching working without
 breaking other code

---
 actionpack/lib/action_controller/abstract/base.rb    |  6 +++---
 actionpack/lib/action_controller/abstract/layouts.rb | 16 ++++++++--------
 actionpack/lib/action_dispatch/http/request.rb       | 10 ++++++++--
 3 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 1f2f096dae..0e4803388a 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -68,11 +68,11 @@ module AbstractController
       self.response_obj = {}
     end
     
-    def process(action_name)
-      @_action_name = action_name = action_name.to_s
+    def process(action)
+      @_action_name = action_name = action.to_s
 
       unless action_name = method_for_action(action_name)
-        raise ActionNotFound, "The action '#{action_name}' could not be found"
+        raise ActionNotFound, "The action '#{action}' could not be found"
       end
 
       process_action(action_name)
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 8721e5f4dc..3d6810bda9 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -39,15 +39,15 @@ module AbstractController
       def _write_layout_method
         case @_layout
         when String
-          self.class_eval %{def _layout() #{@_layout.inspect} end}
+          self.class_eval %{def _layout(details) #{@_layout.inspect} end}
         when Symbol
-          self.class_eval %{def _layout() #{@_layout} end}
+          self.class_eval %{def _layout(details) #{@_layout} end}
         when false
-          self.class_eval %{def _layout() end}
+          self.class_eval %{def _layout(details) end}
         else
           self.class_eval %{
-            def _layout
-              if view_paths.find_by_parts?("#{_implied_layout_name}", {:formats => formats}, "layouts")
+            def _layout(details)
+              if view_paths.find_by_parts?("#{_implied_layout_name}", details, "layouts")
                 "#{_implied_layout_name}"
               else
                 super
@@ -60,7 +60,7 @@ module AbstractController
         
   private
   
-    def _layout() end # This will be overwritten
+    def _layout(details) end # This will be overwritten
     
     # :api: plugin
     # ====
@@ -79,13 +79,13 @@ module AbstractController
     end
     
     def _default_layout(require_layout = false, details = {:formats => formats})
-      if require_layout && _action_has_layout? && !_layout
+      if require_layout && _action_has_layout? && !_layout(details)
         raise ArgumentError,
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
 
       begin
-        _layout_for_name(_layout, details) if _action_has_layout?
+        _layout_for_name(_layout(details), details) if _action_has_layout?
       rescue NameError => e
         raise NoMethodError, 
           "You specified #{@_layout.inspect} as the layout, but no such method was found"
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 4831b89bde..259164d118 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -173,9 +173,15 @@ module ActionDispatch
 
     def formats
       if ActionController::Base.use_accept_header
-        Array(Mime[parameters[:format]] || accepts)
+        ret = Array(Mime[parameters[:format]] || accepts)
+        if defined?(ActionController::Http)
+          if all = ret.index(Mime::ALL)
+            ret.delete(Mime::ALL) && ret.insert(all, *Mime::SET)
+          end
+        end
+        ret
       else
-        [format, Mime[:all]]
+        [format]  + Mime::SET
       end
     end
 
-- 
cgit v1.2.3