Dont keep nothing as a lookup [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4399 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_controller/mime_type.rb

@@ -34,11 +34,11 @@ def lookup(string)
       def parse(accept_header)
         # keep track of creation order to keep the subsequent sort stable
         index = 0
-        list = accept_header.split(/,/).
-          map! { |i| AcceptItem.new(index += 1, *i.split(/;\s*q=/)) }.sort!
+        list = accept_header.split(/,/).map! do |i| 
+          AcceptItem.new(index += 1, *i.split(/;\s*q=/))
+        end.sort!
 
         # Take care of the broken text/xml entry by renaming or deleting it
-  
         text_xml = list.index("text/xml")
         app_xml = list.index("application/xml")
 
@@ -120,7 +120,7 @@ def ==(mime_type)
   YAML  = Type.new "application/x-yaml", :yaml, %w( text/yaml )
 
 
-  LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) }
+  LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k == "" }
 
   LOOKUP["*/*"]                      = ALL
 
@@ -142,7 +142,7 @@ def ==(mime_type)
   LOOKUP["application/atom+xml"]     = ATOM
 
   
-  EXTENSION_LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) }
+  EXTENSION_LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k == "" }
 
   EXTENSION_LOOKUP["html"]  = HTML
   EXTENSION_LOOKUP["xhtml"] = HTML

actionpack/test/controller/mime_type_test.rb

@@ -5,7 +5,6 @@ class MimeTypeTest < Test::Unit::TestCase
   Mime::PLAIN = Mime::Type.new("text/plain")
 
   def test_parse_single
-p Mime::LOOKUP.keys.sort
     Mime::LOOKUP.keys.each do |mime_type|
       assert_equal [Mime::Type.lookup(mime_type)], Mime::Type.parse(mime_type)
     end