diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-12 16:03:44 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-12 16:03:44 +0000 |
commit | de37f7df4f6bfe369598b2f92b07ce9c2c212e76 (patch) | |
tree | c1a4b5833b843580eb87db1221befba0e6ee8e24 /actionpack/lib/action_controller/mime_type.rb | |
parent | 3a90c31a566ec3a818e5cc8f0c2dca58ad305c27 (diff) | |
download | rails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.tar.gz rails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.tar.bz2 rails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.zip |
Mime types are separated by a comma, not semicolon, in the Accept header. Also switch all internal configuration of mime types away from strings and over to Mime::Type [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3847 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/mime_type.rb')
-rw-r--r-- | actionpack/lib/action_controller/mime_type.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/mime_type.rb b/actionpack/lib/action_controller/mime_type.rb index ad2f5aaac5..6a33fdc19a 100644 --- a/actionpack/lib/action_controller/mime_type.rb +++ b/actionpack/lib/action_controller/mime_type.rb @@ -1,12 +1,16 @@ module Mime - class Type < String + class Type def self.lookup(string) LOOKUP[string] end def initialize(string, symbol = nil, synonyms = []) @symbol, @synonyms = symbol, synonyms - super(string) + @string = string + end + + def to_s + @string end def to_sym @@ -20,6 +24,10 @@ module Mime super end end + + def ==(mime_type) + (@synonyms + [ self ]).any? { |synonym| synonym.to_s == mime_type.to_s } if mime_type + end end ALL = Type.new "*/*", :all |