From 1310231c15742bf7d99e2f143d88b383c32782d3 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Fri, 14 Aug 2009 22:32:40 -0700
Subject: Got tests to pass with some more changes.

  * request.formats is much simpler now
    * For XHRs or Accept headers with a single item, we use the Accept header
    * For other requests, we use params[:format] or fallback to HTML
    * This is primarily to work around the fact that browsers provide completely
      broken Accept headers, so we have to whitelist the few cases we can
      specifically isolate and treat other requests as coming from the browser
    * For APIs, we can support single-item Accept headers, which disambiguates
      from the browsers
  * Requests to an action that only has an XML template from the browser will
    no longer find the template. This worked previously because most browsers
    provide a catch-all */*, but this was mostly accidental behavior. If you
    want to serve XML, either use the :xml format in links, or explicitly
    specify the XML template: render "template.xml".
---
 actionpack/test/lib/fixture_template.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'actionpack/test/lib')

diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb
index ee526b5de5..8da92180d1 100644
--- a/actionpack/test/lib/fixture_template.rb
+++ b/actionpack/test/lib/fixture_template.rb
@@ -4,7 +4,7 @@ module ActionView #:nodoc:
       super(options)
       @hash = hash
     end
-    
+
     def find_templates(name, details, prefix, partial)
       if regexp = details_to_regexp(name, details, prefix, partial)
         cached(regexp) do
@@ -16,26 +16,26 @@ module ActionView #:nodoc:
         end
       end
     end
-    
+
   private
-  
+
     def formats_regexp
       @formats_regexp ||= begin
         formats = Mime::SET.symbols
         '(?:' + formats.map { |l| "\\.#{Regexp.escape(l.to_s)}" }.join('|') + ')?'
       end
     end
-    
+
     def handler_regexp
       e = TemplateHandlers.extensions.map{|h| "\\.#{Regexp.escape(h.to_s)}"}.join("|")
-      "(?:#{e})?"
+      "(?:#{e})"
     end
-  
+
     def details_to_regexp(name, details, prefix, partial)
       path = ""
       path << "#{prefix}/" unless prefix.empty?
       path << (partial ? "_#{name}" : name)
-    
+
       extensions = ""
       [:locales, :formats].each do |k|
         extensions << if exts = details[k]
@@ -47,7 +47,7 @@ module ActionView #:nodoc:
 
       %r'^#{Regexp.escape(path)}#{extensions}#{handler_regexp}$'
     end
-    
+
     # TODO: fix me
     # :api: plugin
     def path_to_details(path)
@@ -56,10 +56,10 @@ module ActionView #:nodoc:
         partial = m[1] == '_'
         details = (m[2]||"").split('.').reject { |e| e.empty? }
         handler = Template.handler_class_for_extension(m[3])
-    
+
         format  = Mime[details.last] && details.pop.to_sym
         locale  = details.last && details.pop.to_sym
-        
+
         return handler, :format => format, :locale => locale, :partial => partial
       end
     end
-- 
cgit v1.2.3