Changeset 3850

Timestamp:

03/12/06 19:01:09 (3 years ago)

Author:

david

Message:

Prepare for mime type reordering depending on the branch [DHH]

Files:

• trunk/actionpack/lib/action_controller/mime_type.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/request.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/mime_type.rb

@@ -3 +3 @@
-    def self.lookup(string)
-      LOOKUP[string]
+    end
+
+    def self.parse(accept_header)
+      accept_header.split(",").collect! do |mime_type|
+        Mime::Type.lookup(mime_type.split(";").first.strip)
+      end
-    end
-    
@@ -34 +40 @@
-  HTML  = Type.new "text/html", :html, %w( application/xhtml+xml )
-  JS    = Type.new "text/javascript", :js, %w( application/javascript application/x-javascript )
-text/xml 
+
-  RSS   = Type.new "application/rss+xml", :rss
-  ATOM  = Type.new "application/atom+xml", :atom

trunk/actionpack/lib/action_controller/request.rb

@@ -71 +71 @@
-        [ content_type, Mime::ALL ]
-      else
-
-
-
+
-      end
-    end