iv-org-mirror/shard-kemal
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/shard-kemal.git synced 2024-08-15 00:53:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade ParamParser to make it more convinient.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

72
spec/param_parser_spec.cr
View file

@ -3,19 +3,31 @@ require "./spec_helper"
describe "ParamParser" do
it "parses query params" do
route = Route.new "POST", "/" do |env|
hasan = env.params["hasan"]
hasan = env.params.query["hasan"]
"Hello #{hasan}"
end
request = HTTP::Request.new("POST", "/?hasan=cemal")
params = Kemal::ParamParser.new(request).parse
params["hasan"].should eq "cemal"
query_params = Kemal::ParamParser.new(request).params.query
query_params["hasan"].should eq "cemal"
end
it "parses url params" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "POST", "/hello/:hasan" do |env|
"hello #{env.params.url["hasan"]}"
end
request = HTTP::Request.new("POST", "/hello/cemal")
# Radix tree MUST be run to parse url params.
io_with_context = create_request_and_return_io(kemal, request)
url_params = Kemal::ParamParser.new(request).params.url
url_params["hasan"].should eq "cemal"
end
it "parses request body" do
route = Route.new "POST", "/" do |env|
name = env.params["name"]
age = env.params["age"]
hasan = env.params["hasan"]
name = env.params.query["name"]
age = env.params.query["age"]
hasan = env.params.body["hasan"]
"Hello #{name} #{hasan} #{age}"
end
@ -26,8 +38,11 @@ describe "ParamParser" do
headers: HTTP::Headers{"Content-Type": "application/x-www-form-urlencoded"},
)
params = Kemal::ParamParser.new(request).parse
params.should eq({"hasan" => "cemal", "name" => "serdar", "age" => "99"})
query_params = Kemal::ParamParser.new(request).params.query
query_params.should eq({"hasan" => "cemal"})
body_params = Kemal::ParamParser.new(request).params.body
body_params.should eq({"name" => "serdar", "age" => "99"})
end
context "when content type is application/json" do
@ -41,8 +56,8 @@ describe "ParamParser" do
headers: HTTP::Headers{"Content-Type": "application/json"},
)
params = Kemal::ParamParser.new(request).parse
params.should eq({"name": "Serdar"})
json_params = Kemal::ParamParser.new(request).params.json
json_params.should eq({"name": "Serdar"})
end
it "parses request body for array" do
@ -55,8 +70,8 @@ describe "ParamParser" do
headers: HTTP::Headers{"Content-Type": "application/json"},
)
params = Kemal::ParamParser.new(request).parse
params.should eq({"_json": [1]})
json_params = Kemal::ParamParser.new(request).params.json
json_params.should eq({"_json": [1]})
end
it "parses request body and query params" do
@ -69,8 +84,11 @@ describe "ParamParser" do
headers: HTTP::Headers{"Content-Type": "application/json"},
)
params = Kemal::ParamParser.new(request).parse
params.should eq({"foo": "bar", "_json": [1]})
query_params = Kemal::ParamParser.new(request).params.query
query_params.should eq({"foo": "bar"})
json_params = Kemal::ParamParser.new(request).params.json
json_params.should eq({"_json": [1]})
end
it "handles no request body" do
@ -82,17 +100,26 @@ describe "ParamParser" do
headers: HTTP::Headers{"Content-Type": "application/json"},
)
params = Kemal::ParamParser.new(request).parse
params.should eq({} of String => AllParamTypes)
url_params = Kemal::ParamParser.new(request).params.url
url_params.should eq({} of String => String)
query_params = Kemal::ParamParser.new(request).params.query
query_params.should eq({} of String => String)
body_params = Kemal::ParamParser.new(request).params.body
body_params.should eq({} of String => String)
json_params = Kemal::ParamParser.new(request).params.json
json_params.should eq({} of String => AllParamTypes)
end
end
context "when content type is incorrect" do
it "does not parse request body" do
route = Route.new "POST", "/" do |env|
name = env.params["name"]
age = env.params["age"]
hasan = env.params["hasan"]
name = env.params.body["name"]
age = env.params.body["age"]
hasan = env.params.query["hasan"]
"Hello #{name} #{hasan} #{age}"
end
@ -103,8 +130,11 @@ describe "ParamParser" do
headers: HTTP::Headers{"Content-Type": "text/plain"},
)
params = Kemal::ParamParser.new(request).parse
params.should eq({"hasan" => "cemal"})
query_params = Kemal::ParamParser.new(request).params.query
query_params.should eq({"hasan" => "cemal"})
body_params = Kemal::ParamParser.new(request).params.body
body_params.should eq({} of String => String)
end
end
end

14
spec/route_handler_spec.cr
View file

@ -15,7 +15,7 @@ describe "Kemal::RouteHandler" do
it "routes request with query string" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "GET", "/" do |env|
"hello #{env.params["message"]}"
"hello #{env.params.query["message"]}"
end
request = HTTP::Request.new("GET", "/?message=world")
io_with_context = create_request_and_return_io(kemal, request)
@ -26,7 +26,7 @@ describe "Kemal::RouteHandler" do
it "routes request with multiple query strings" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "GET", "/" do |env|
"hello #{env.params["message"]} time #{env.params["time"]}"
"hello #{env.params.query["message"]} time #{env.params.query["time"]}"
end
request = HTTP::Request.new("GET", "/?message=world&time=now")
io_with_context = create_request_and_return_io(kemal, request)
@ -37,7 +37,7 @@ describe "Kemal::RouteHandler" do
it "route parameter has more precedence than query string arguments" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "GET", "/:message" do |env|
"hello #{env.params["message"]}"
"hello #{env.params.url["message"]}"
end
request = HTTP::Request.new("GET", "/world?message=coco")
io_with_context = create_request_and_return_io(kemal, request)
@ -48,8 +48,8 @@ describe "Kemal::RouteHandler" do
it "parses simple JSON body" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "POST", "/" do |env|
name = env.params["name"]
age = env.params["age"]
name = env.params.json["name"]
age = env.params.json["age"]
"Hello #{name} Age #{age}"
end
@ -68,7 +68,7 @@ describe "Kemal::RouteHandler" do
it "parses JSON with string array" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "POST", "/" do |env|
skills = env.params["skills"] as Array
skills = env.params.json["skills"] as Array
"Skills #{skills.each.join(',')}"
end
@ -87,7 +87,7 @@ describe "Kemal::RouteHandler" do
it "parses JSON with json object array" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "POST", "/" do |env|
skills = env.params["skills"] as Array
skills = env.params.json["skills"] as Array
skills_from_languages = skills.map do |skill|
skill = skill as Hash
skill["language"]

6
spec/view_spec.cr
View file

@ -8,7 +8,7 @@ describe "Views" do
it "renders file" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "GET", "/view/:name" do |env|
name = env.params["name"]
name = env.params.url["name"]
render "spec/asset/hello.ecr"
end
request = HTTP::Request.new("GET", "/view/world")
@ -20,7 +20,7 @@ describe "Views" do
it "renders file with dynamic variables" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "GET", "/view/:name" do |env|
name = env.params["name"]
name = env.params.url["name"]
render_with_base_and_layout "hello.ecr"
end
request = HTTP::Request.new("GET", "/view/world")
@ -32,7 +32,7 @@ describe "Views" do
it "renders layout" do
kemal = Kemal::RouteHandler::INSTANCE
kemal.add_route "GET", "/view/:name" do |env|
name = env.params["name"]
name = env.params.url["name"]
render "spec/asset/hello.ecr", "spec/asset/layout.ecr"
end
request = HTTP::Request.new("GET", "/view/world")