Permalink
Browse files

Mime types are separated by a comma, not semicolon, in the Accept hea…

…der. 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
  • Loading branch information...
1 parent 3a90c31 commit de37f7df4f6bfe369598b2f92b07ce9c2c212e76 @dhh dhh committed Mar 12, 2006
@@ -271,7 +271,7 @@ class Base
#
# Example of doing your own parser for a custom content type:
#
- # ActionController::Base.param_parsers['application/atom+xml'] = Proc.new do |data|
+ # ActionController::Base.param_parsers[Mime::Type.lookup('application/atom+xml')] = Proc.new do |data|
# node = REXML::Document.new(post)
# { node.root.name => node.root }
# end
@@ -281,10 +281,10 @@ class Base
# in params[:r][:name] for "David" instead of params[:name]. To get the old behavior, you can
# re-register XmlSimple as application/xml handler and enable application/x-yaml like this:
#
- # ActionController::Base.param_parsers['application/xml'] =
+ # ActionController::Base.param_parsers[Mime::XML] =
# Proc.new { |data| XmlSimple.xml_in(data, 'ForceArray' => false) }
- # ActionController::Base.param_parsers['application/x-yaml'] = :yaml
- @@param_parsers = { 'application/xml' => :xml_simple }
+ # ActionController::Base.param_parsers[Mime::YAML] = :yaml
+ @@param_parsers = { Mime::XML => :xml_simple }
cattr_accessor :param_parsers
# Template root determines the base from which template references will be made. So a call to render("test/template")
@@ -58,8 +58,8 @@ def CGIMethods.parse_request_parameters(params)
parsed_params
end
- def self.parse_formatted_request_parameters(format, raw_post_data)
- params = case strategy = ActionController::Base.param_parsers[format]
+ def self.parse_formatted_request_parameters(mime_type, raw_post_data)
+ params = case strategy = ActionController::Base.param_parsers[mime_type]
when Proc
strategy.call(raw_post_data)
when :xml_simple
@@ -6,7 +6,7 @@ class AbstractRequest
# For backward compatibility, the post format is extracted from the
# X-Post-Data-Format HTTP header if present.
def post_format
- case content_type
+ case content_type.to_s
when 'application/xml'
:xml
when 'application/x-yaml'
@@ -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 @@ def ===(list)
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
@@ -70,8 +70,8 @@ def accepts
@accepts = if @env['HTTP_ACCEPT'].to_s.strip.blank?
[ content_type, Mime::ALL ]
else
- @env['HTTP_ACCEPT'].split(";").collect! do |mime_type|
- Mime::Type.lookup(mime_type.strip)
+ @env['HTTP_ACCEPT'].split(",").collect! do |mime_type|
+ Mime::Type.lookup(mime_type.split(";").first.strip)
end
end
end
@@ -704,7 +704,7 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
var requestHeaders =
['X-Requested-With', 'XMLHttpRequest',
'X-Prototype-Version', Prototype.Version,
- 'Accept', 'text/javascript; text/html; text/xml; */*' ];
+ 'Accept', 'text/javascript, text/xml, text/html, */*' ];
if (this.options.method == 'post') {
requestHeaders.push('Content-type',
@@ -111,7 +111,7 @@ def test_xml
end
def test_js_or_html
- @request.env["HTTP_ACCEPT"] = "text/javascript; text/html"
+ @request.env["HTTP_ACCEPT"] = "text/javascript, text/html"
get :js_or_html
assert_equal 'JS', @response.body
@@ -123,7 +123,7 @@ def test_js_or_html
end
def test_js_or_anything
- @request.env["HTTP_ACCEPT"] = "text/javascript; */*"
+ @request.env["HTTP_ACCEPT"] = "text/javascript, */*"
get :js_or_html
assert_equal 'JS', @response.body
@@ -28,7 +28,7 @@ def rescue_action(e) raise end
def setup
@controller = TestController.new
ActionController::Base.param_parsers.clear
- ActionController::Base.param_parsers['application/xml'] = :xml_node
+ ActionController::Base.param_parsers[Mime::XML] = :xml_node
end
def test_check_parameters
@@ -55,23 +55,23 @@ def test_put_xml
end
def test_register_and_use_yaml
- ActionController::Base.param_parsers['application/x-yaml'] = Proc.new { |d| YAML.load(d) }
+ ActionController::Base.param_parsers[Mime::YAML] = Proc.new { |d| YAML.load(d) }
process('POST', 'application/x-yaml', {"entry" => "loaded from yaml"}.to_yaml)
assert_equal 'entry', @controller.response.body
assert @controller.params.has_key?(:entry)
assert_equal 'loaded from yaml', @controller.params["entry"]
end
def test_register_and_use_yaml_as_symbol
- ActionController::Base.param_parsers['application/x-yaml'] = :yaml
+ ActionController::Base.param_parsers[Mime::YAML] = :yaml
process('POST', 'application/x-yaml', {"entry" => "loaded from yaml"}.to_yaml)
assert_equal 'entry', @controller.response.body
assert @controller.params.has_key?(:entry)
assert_equal 'loaded from yaml', @controller.params["entry"]
end
def test_register_and_use_xml_simple
- ActionController::Base.param_parsers['application/xml'] = Proc.new { |data| XmlSimple.xml_in(data, 'ForceArray' => false) }
+ ActionController::Base.param_parsers[Mime::XML] = Proc.new { |data| XmlSimple.xml_in(data, 'ForceArray' => false) }
process('POST', 'application/xml', '<request><summary>content...</summary><title>SimpleXml</title></request>' )
assert_equal 'summary, title', @controller.response.body
assert @controller.params.has_key?(:summary)
@@ -82,7 +82,7 @@ def test_register_and_use_xml_simple
def test_deprecated_request_methods
process('POST', 'application/x-yaml')
- assert_equal 'application/x-yaml', @controller.request.content_type
+ assert_equal Mime::YAML, @controller.request.content_type
assert_equal true, @controller.request.post?
assert_equal :yaml, @controller.request.post_format
assert_equal true, @controller.request.yaml_post?
@@ -704,7 +704,7 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
var requestHeaders =
['X-Requested-With', 'XMLHttpRequest',
'X-Prototype-Version', Prototype.Version,
- 'Accept', 'text/javascript; text/html; text/xml; */*' ];
+ 'Accept', 'text/javascript, text/xml, text/html, */*' ];
if (this.options.method == 'post') {
requestHeaders.push('Content-type',

0 comments on commit de37f7d

Please sign in to comment.