Permalink
Browse files

Made the post_format work with content-type

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1336 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 8cc64e7 commit 24b13acd428d50c077d913d6f308842377eddf62 @dhh dhh committed May 20, 2005
View
@@ -18,14 +18,14 @@
* Added accessors to logger, params, response, session, flash, and headers from the view, so you can write <% logger.info "stuff" %> instead of <% @logger.info "others" %> -- more consistent with the preferred way of accessing these attributes and collections from the controller
-* Added support for POST data in form of YAML or XML, which is controller through the X-POST_DATA_MARSHAL header. Example request:
+* Added support for POST data in form of YAML or XML, which is controller through the Content-Type header. Example request:
- X-POST_DATA_MARSHAL: xml
+ Content-Type: application/xml
<request><item><content>HelloWorld</content></item></request>
...is the same as:
- X-POST_DATA_MARSHAL: yaml
+ Content-Type: application/x-yaml
---
item:
content: HelloWorld
@@ -38,10 +38,10 @@
Example Curl call:
- curl -H 'X-POST_DATA_MARSHAL: xml' -d '<request><item><content>KillMeMore</content></item></request>' http://www.example.com/service
+ curl -H 'Content-Type: application/xml' -d '<request><item><content>KillMeMore</content></item></request>' http://www.example.com/service
You can query to find out whether a given request came through as one of these types with:
- - request.post_format? (:query_string, :xml or :yaml)
+ - request.post_format? (:url_encoded, :xml or :yaml)
- request.formatted_post? (for either xml or yaml)
- request.xml_post?
- request.yaml_post?
@@ -63,8 +63,8 @@ def query_parameters
end
def request_parameters
- if env['HTTP_X_POST_DATA_FORMAT']
- CGIMethods.parse_formatted_request_parameters(env['HTTP_X_POST_DATA_FORMAT'].downcase.intern, env['RAW_POST_DATA'])
+ if formatted_post?
+ CGIMethods.parse_formatted_request_parameters(post_format, env['RAW_POST_DATA'])
else
CGIMethods.parse_request_parameters(@cgi.params)
end
@@ -3,7 +3,6 @@ module ActionController
class AbstractRequest
# Returns both GET and POST parameters in a single hash.
def parameters
- # puts "#{request_parameters.inspect} | #{query_parameters.inspect} | #{path_parameters.inspect}"
@parameters ||= request_parameters.merge(query_parameters).merge(path_parameters).with_indifferent_access
end
@@ -36,7 +35,14 @@ def post_format
if env['HTTP_X_POST_DATA_FORMAT']
env['HTTP_X_POST_DATA_FORMAT'].downcase.intern
else
- :query_string
+ case env['HTTP_CONTENT_TYPE']
+ when 'application/xml', 'text/xml'
+ :xml
+ when 'application/x-yaml', 'text/x-yaml'
+ :yaml
+ else
+ :url_encoded
+ end
end
end

0 comments on commit 24b13ac

Please sign in to comment.