mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Just a little tidying
This commit is contained in:
parent
91ce8d8b7f
commit
eeda059818
1 changed files with 22 additions and 24 deletions
|
@ -31,41 +31,39 @@ module ActionDispatch
|
||||||
return false unless strategy
|
return false unless strategy
|
||||||
|
|
||||||
case strategy
|
case strategy
|
||||||
when Proc
|
when Proc
|
||||||
strategy.call(request.raw_post)
|
strategy.call(request.raw_post)
|
||||||
when :xml_simple, :xml_node
|
when :xml_simple, :xml_node
|
||||||
request.body.size == 0 ? {} : Hash.from_xml(request.body).with_indifferent_access
|
request.body.size == 0 ? {} : Hash.from_xml(request.body).with_indifferent_access
|
||||||
when :yaml
|
when :yaml
|
||||||
YAML.load(request.body)
|
YAML.load(request.body)
|
||||||
when :json
|
when :json
|
||||||
if request.body.size == 0
|
if request.body.size == 0
|
||||||
{}
|
{}
|
||||||
else
|
|
||||||
data = ActiveSupport::JSON.decode(request.body)
|
|
||||||
data = {:_json => data} unless data.is_a?(Hash)
|
|
||||||
data.with_indifferent_access
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
false
|
data = ActiveSupport::JSON.decode(request.body)
|
||||||
|
data = {:_json => data} unless data.is_a?(Hash)
|
||||||
|
data.with_indifferent_access
|
||||||
|
end
|
||||||
|
else
|
||||||
|
false
|
||||||
end
|
end
|
||||||
rescue Exception => e # YAML, XML or Ruby code block errors
|
rescue Exception => e # YAML, XML or Ruby code block errors
|
||||||
logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
|
logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
|
||||||
|
|
||||||
raise
|
raise
|
||||||
{ "body" => request.raw_post,
|
{ "body" => request.raw_post,
|
||||||
"content_type" => request.content_type,
|
"content_type" => request.content_type,
|
||||||
"content_length" => request.content_length,
|
"content_length" => request.content_length,
|
||||||
"exception" => "#{e.message} (#{e.class})",
|
"exception" => "#{e.message} (#{e.class})",
|
||||||
"backtrace" => e.backtrace }
|
"backtrace" => e.backtrace }
|
||||||
end
|
end
|
||||||
|
|
||||||
def content_type_from_legacy_post_data_format_header(env)
|
def content_type_from_legacy_post_data_format_header(env)
|
||||||
if x_post_format = env['HTTP_X_POST_DATA_FORMAT']
|
if x_post_format = env['HTTP_X_POST_DATA_FORMAT']
|
||||||
case x_post_format.to_s.downcase
|
case x_post_format.to_s.downcase
|
||||||
when 'yaml'
|
when 'yaml' then return Mime::YAML
|
||||||
return Mime::YAML
|
when 'xml' then return Mime::XML
|
||||||
when 'xml'
|
|
||||||
return Mime::XML
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -76,4 +74,4 @@ module ActionDispatch
|
||||||
defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
|
defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
Loading…
Reference in a new issue