Changeset 4405

Timestamp:

06/02/06 04:11:56 (2 years ago)

Author:

david

Message:

Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/mime_type.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/mime_type_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [DHH]. Example: Mime::Type.register("image/gif", :gif)
-
-* Added support for Mime objects in render :content_type option [DHH]. Example: render :text => some_atom, :content_type => Mime::ATOM

trunk/actionpack/lib/action_controller/mime_type.rb

@@ -30 +30 @@
-      def lookup(string)
-        LOOKUP[string]
+      end
+
+      def register(string, symbol, synonyms = [])
+        Mime.send :const_set, symbol.to_s.upcase, Type.new(string, symbol, synonyms)
+        LOOKUP[string] = Mime.send :const_get, symbol.to_s.upcase
-      end
-
@@ -115 +120 @@
-  HTML  = Type.new "text/html", :html, %w( application/xhtml+xml )
-  JS    = Type.new "text/javascript", :js, %w( application/javascript application/x-javascript )
+  ICS   = Type.new "text/calendar", :ics
-  XML   = Type.new "application/xml", :xml, %w( text/xml application/x-xml )
-  RSS   = Type.new "application/rss+xml", :rss
@@ -128 +134 @@
-  LOOKUP["application/xhtml+xml"]    = HTML
-
+  LOOKUP["text/javascript"]          = JS
+  LOOKUP["application/javascript"]   = JS
+  LOOKUP["application/x-javascript"] = JS
+
+  LOOKUP["text/calendar"]            = ICS
+
-  LOOKUP["application/xml"]          = XML
-  LOOKUP["text/xml"]                 = XML
-  LOOKUP["application/x-xml"]        = XML
-
-  LOOKUP["text/javascript"]          = JS
-  LOOKUP["application/javascript"]   = JS
-  LOOKUP["application/x-javascript"] = JS
-
-  LOOKUP["text/yaml"]                = YAML

trunk/actionpack/test/controller/mime_type_test.rb

@@ -22 +22 @@
-    assert_equal expect, Mime::Type.parse(accept)
-  end
+  
+  def test_custom_type
+    Mime::Type.register("image/gif", :gif)
+    assert_nothing_raised { Mime::GIF }
+    Mime.send :remove_const, :GIF
+  end
-end