Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Luna 2020-05-19 16:16:23 -03:00
commit 3c2dcc73e5
4 changed files with 18 additions and 1 deletions

View file

@ -118,6 +118,18 @@ describe "Kemal::RouteHandler" do
request = HTTP::Request.new("GET", "/")
client_response = call_request_on_app(request)
client_response.status_code.should eq(302)
client_response.body.should eq("")
client_response.headers.has_key?("Location").should eq(true)
end
it "redirects with body" do
get "/" do |env|
env.redirect "/login", body: "Redirecting to /login"
end
request = HTTP::Request.new("GET", "/")
client_response = call_request_on_app(request)
client_response.status_code.should eq(302)
client_response.body.should eq("Redirecting to /login")
client_response.headers.has_key?("Location").should eq(true)
end
end

View file

@ -17,9 +17,10 @@ class HTTP::Server
@params ||= Kemal::ParamParser.new(@request, route_lookup.params)
end
def redirect(url : String, status_code : Int32 = 302)
def redirect(url : String, status_code : Int32 = 302, *, body : String? = nil)
@response.headers.add "Location", url
@response.status_code = status_code
@response.print(body) if body
end
def route

View file

@ -1,3 +1,5 @@
require "flate"
require "gzip"
require "mime"
# Adds given `Kemal::Handler` to handlers chain.

View file

@ -97,6 +97,8 @@ module Kemal
end
when Array
@json["_json"] = json
else
# Ignore non Array or Hash json values
end
end