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

Add app reference to the handlers which are bound to the app

Browse source
This commit is contained in:
Johannes Müller 2017-10-18 19:48:01 +02:00 • committed by sdogruyol
parent dc93bb2235
commit 72bcac6dd5
12 changed files with 58 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spec/context_spec.cr
View file

@ -64,7 +64,6 @@ describe "Context" do
io = IO::Memory.new
response = HTTP::Server::Response.new(io)
context = HTTP::Server::Context.new(request, response)
context.app = app
app.filter_handler.call(context)
app.route_handler.call(context)
context.store["key"].should eq "value"

4
spec/dsl_helper.cr
View file

@ -12,11 +12,11 @@ class CustomLogHandler < Kemal::BaseLogHandler
end
end
def create_request_and_return_io(handler, request)
def create_request_and_return_io(handler, request, app = Kemal.application)
io = IO::Memory.new
response = HTTP::Server::Response.new(io)
context = HTTP::Server::Context.new(request, response)
context.app = Kemal.application
context.app = app
handler.call(context)
response.close
io.rewind

14
spec/exception_handler_spec.cr
View file

@ -26,9 +26,8 @@ describe "Kemal::ExceptionHandler" do
app.get "/" do |env|
env.response.status_code = 403
end
context.app = app
subject = Kemal::ExceptionHandler.new(app)
subject.next = Kemal::RouteHandler.new
subject.next = app.route_handler
subject.call(context)
response.close
io.rewind
@ -50,9 +49,8 @@ describe "Kemal::ExceptionHandler" do
app.get "/" do |env|
env.response.status_code = 500
end
context.app = app
subject = Kemal::ExceptionHandler.new(app)
subject.next = Kemal::RouteHandler.new
subject.next = app.route_handler
subject.call(context)
response.close
io.rewind
@ -75,9 +73,8 @@ describe "Kemal::ExceptionHandler" do
env.response.content_type = "application/json"
env.response.status_code = 500
end
context.app = app
subject = Kemal::ExceptionHandler.new(app)
subject.next = Kemal::RouteHandler.new
subject.next = app.route_handler
subject.call(context)
response.close
io.rewind
@ -100,9 +97,8 @@ describe "Kemal::ExceptionHandler" do
env.response.content_type = "application/json"
env.response.status_code = 500
end
context.app = app
subject = Kemal::ExceptionHandler.new(Kemal::Base.new)
subject.next = Kemal::RouteHandler.new
subject = Kemal::ExceptionHandler.new(app)
subject.next = app.route_handler
subject.call(context)
response.close
io.rewind

5
spec/handler_spec.cr
View file

@ -69,8 +69,8 @@ end
describe "Handler" do
it "adds custom handler before before_*" do
filter_middleware = Kemal::FilterHandler.new
Kemal.application.add_filter_handler filter_middleware
app = Kemal::Base.new
filter_middleware = Kemal::FilterHandler.new(app)
filter_middleware._add_route_filter("GET", "/", :before) do |env|
env.response << " is"
end
@ -78,7 +78,6 @@ describe "Handler" do
filter_middleware._add_route_filter("GET", "/", :before) do |env|
env.response << " so"
end
app = Kemal::Base.new
app.add_filter_handler filter_middleware
app.add_handler CustomTestHandler.new

14
spec/middleware/filters_spec.cr
View file

@ -5,7 +5,7 @@ describe "Kemal::FilterHandler" do
test_filter = FilterTest.new
test_filter.modified = "false"
filter_middleware = Kemal::FilterHandler.new
filter_middleware = Kemal::FilterHandler.new(Kemal.application)
filter_middleware._add_route_filter("GET", "/greetings", :before) { test_filter.modified = "true" }
kemal = Kemal.application.route_handler
@ -23,7 +23,7 @@ describe "Kemal::FilterHandler" do
test_filter = FilterTest.new
test_filter.modified = "false"
filter_middleware = Kemal::FilterHandler.new
filter_middleware = Kemal::FilterHandler.new(Kemal.application)
filter_middleware._add_route_filter("GET", "/greetings", :before) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
kemal = Kemal.application.route_handler
@ -49,7 +49,7 @@ describe "Kemal::FilterHandler" do
test_filter = FilterTest.new
test_filter.modified = "false"
filter_middleware = Kemal::FilterHandler.new
filter_middleware = Kemal::FilterHandler.new(Kemal.application)
filter_middleware._add_route_filter("ALL", "/greetings", :before) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
filter_middleware._add_route_filter("GET", "/greetings", :before) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
filter_middleware._add_route_filter("POST", "/greetings", :before) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
@ -77,7 +77,7 @@ describe "Kemal::FilterHandler" do
test_filter = FilterTest.new
test_filter.modified = "false"
filter_middleware = Kemal::FilterHandler.new
filter_middleware = Kemal::FilterHandler.new(Kemal.application)
filter_middleware._add_route_filter("GET", "/greetings", :after) { test_filter.modified = "true" }
kemal = Kemal.application.route_handler
@ -95,7 +95,7 @@ describe "Kemal::FilterHandler" do
test_filter = FilterTest.new
test_filter.modified = "false"
filter_middleware = Kemal::FilterHandler.new
filter_middleware = Kemal::FilterHandler.new(Kemal.application)
filter_middleware._add_route_filter("GET", "/greetings", :after) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
kemal = Kemal.application.route_handler
@ -121,7 +121,7 @@ describe "Kemal::FilterHandler" do
test_filter = FilterTest.new
test_filter.modified = "false"
filter_middleware = Kemal::FilterHandler.new
filter_middleware = Kemal::FilterHandler.new(Kemal.application)
filter_middleware._add_route_filter("ALL", "/greetings", :after) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
filter_middleware._add_route_filter("GET", "/greetings", :after) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
filter_middleware._add_route_filter("POST", "/greetings", :after) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
@ -152,7 +152,7 @@ describe "Kemal::FilterHandler" do
test_filter_third = FilterTest.new
test_filter_third.modified = "false"
filter_middleware = Kemal::FilterHandler.new
filter_middleware = Kemal::FilterHandler.new(Kemal.application)
filter_middleware._add_route_filter("ALL", "/greetings", :before) { test_filter.modified = test_filter.modified == "true" ? "false" : "true" }
filter_middleware._add_route_filter("ALL", "/greetings", :before) { test_filter_second.modified = test_filter_second.modified == "true" ? "false" : "true" }
filter_middleware._add_route_filter("ALL", "/greetings", :before) { test_filter_third.modified = test_filter_third.modified == "true" ? "false" : "true" }

16
spec/websocket_handler_spec.cr
View file

@ -1,6 +1,6 @@
require "./spec_helper"
private def create_ws_request_and_return_io(handler, request, app)
private def create_ws_request_and_return_io(handler, request, app = Kemal.application)
io = IO::Memory.new
response = HTTP::Server::Response.new(io)
context = HTTP::Server::Context.new(request, response)
@ -16,8 +16,8 @@ end
describe "Kemal::WebSocketHandler" do
it "doesn't match on wrong route" do
app = Kemal::Base.new
handler = Kemal::WebSocketHandler.new
handler.next = Kemal::RouteHandler.new
handler = app.websocket_handler
handler.next = app.route_handler
app.ws "/" { }
headers = HTTP::Headers{
"Upgrade" => "websocket",
@ -28,7 +28,6 @@ describe "Kemal::WebSocketHandler" do
io = IO::Memory.new
response = HTTP::Server::Response.new(io)
context = HTTP::Server::Context.new(request, response)
context.app = app
expect_raises(Kemal::Exceptions::RouteNotFound) do
handler.call context
@ -37,7 +36,7 @@ describe "Kemal::WebSocketHandler" do
it "matches on given route" do
app = Kemal::Base.new
handler = Kemal::WebSocketHandler.new
handler = app.websocket_handler
app.ws "/" { |socket, context| socket.send("Match") }
app.ws "/no_match" { |socket, context| socket.send "No Match" }
headers = HTTP::Headers{
@ -54,7 +53,7 @@ describe "Kemal::WebSocketHandler" do
it "fetches named url parameters" do
app = Kemal::Base.new
handler = Kemal::WebSocketHandler.new
handler = app.websocket_handler
app.ws "/:id" { |s, c| c.params.url["id"] }
headers = HTTP::Headers{
"Upgrade" => "websocket",
@ -69,15 +68,14 @@ describe "Kemal::WebSocketHandler" do
it "matches correct verb" do
app = Kemal::Base.new
handler = Kemal::WebSocketHandler.new
handler.next = Kemal::RouteHandler.new
handler = app.websocket_handler
handler.next = app.route_handler
app.ws "/" { }
app.get "/" { "get" }
request = HTTP::Request.new("GET", "/")
io = IO::Memory.new
response = HTTP::Server::Response.new(io)
context = HTTP::Server::Context.new(request, response)
context.app = app
handler.call(context)
response.close
io.rewind