Upgrade ParamParser to make it more convinient.

It now decouples `env.params` to `env.params.query`, `env.params.body`,
`env.params.json` and `env.params.url` and you still can access merged
values using `env.params.all`
This commit is contained in:
Fatih Kadir Akın 2016-03-06 13:22:24 +02:00
parent c7d2b33bb3
commit 8267ffe2c5
6 changed files with 96 additions and 45 deletions

View file

@ -2,9 +2,10 @@
# information such as params, content_type e.g
class HTTP::Server
class Context
def params
@request.url_params = route_lookup.params
@params ||= Kemal::ParamParser.new(@request).parse
@params ||= Kemal::ParamParser.new(@request).params
end
def redirect(url, status_code = 302)

View file

@ -5,16 +5,34 @@ require "json"
# context.
alias AllParamTypes = Nil | String | Int64 | Float64 | Bool | Hash(String, JSON::Type) | Array(JSON::Type)
class Kemal::ParamContainer
getter url
getter query
getter body
getter json
def initialize(@url, @query, @body, @json)
end
def all
@url.merge(@query).merge(@body).merge(@json)
end
end
class Kemal::ParamParser
URL_ENCODED_FORM = "application/x-www-form-urlencoded"
APPLICATION_JSON = "application/json"
def initialize(@request)
@params = {} of String => AllParamTypes
@url = {} of String => String
@query = {} of String => String
@body = {} of String => String
@json = {} of String => AllParamTypes
end
def parse
def params
parse_request
Kemal::ParamContainer.new(@url, @query, @body, @json)
end
def parse_request
@ -22,22 +40,21 @@ class Kemal::ParamParser
parse_body
parse_json
parse_url_params
@params
end
def parse_body
return if (@request.headers["Content-Type"]? =~ /#{URL_ENCODED_FORM}/).nil?
parse_part(@request.body)
@body = parse_part(@request.body)
end
def parse_query
parse_part(@request.query)
@query = parse_part(@request.query)
end
def parse_url_params
if params = @request.url_params
params.each do |key, value|
@params[key] = value
@url[key as String] = value as String
end
end
end
@ -52,18 +69,21 @@ class Kemal::ParamParser
body = @request.body as String
case json = JSON.parse(body).raw
when Hash
json.each do |k, v|
@params[k as String] = v as AllParamTypes
json.each do |key, value|
@json[key as String] = value as AllParamTypes
end
when Array
@params["_json"] = json
@json["_json"] = json
end
end
def parse_part(part)
return unless part
HTTP::Params.parse(part) do |key, value|
@params[key] ||= value
part_params = {} of String => String
if part
HTTP::Params.parse(part) do |key, value|
part_params[key as String] ||= value as String
end
end
part_params
end
end

View file

@ -11,7 +11,7 @@ class HTTP::Request
private def check_for_method_override!
@override_method = @method
if @method == "POST"
params = Kemal::ParamParser.new(self).parse_request
params = Kemal::ParamParser.new(self).params.all
if params.has_key?("_method") && HTTP::Request.override_method_valid?(params["_method"])
@override_method = params["_method"]
end