Rename return_with as halt for clear intention

This commit is contained in:
sdogruyol 2016-11-01 11:46:13 +03:00
parent cc78f4e02e
commit d676b559d2
3 changed files with 9 additions and 7 deletions

View file

@ -10,6 +10,8 @@ Which is illustrated as,
Request -> Middleware -> Filter -> Route
```
- Rename `return_with` as `halt`.
# 0.16.1 (12-10-2016)
- Improved Multipart support with more info on parsed files. `parse_multipart(env)` now yields

View file

@ -35,8 +35,8 @@ describe "Macros" do
end
end
describe "#return_with" do
it "can break block with return_with macro" do
describe "#halt" do
it "can break block with halt macro" do
get "/non-breaking" do |env|
"hello"
"world"
@ -47,7 +47,7 @@ describe "Macros" do
client_response.body.should eq("world")
get "/breaking" do |env|
return_with env, 404, "hello"
halt env, 404, "hello"
"world"
end
request = HTTP::Request.new("GET", "/breaking")
@ -56,9 +56,9 @@ describe "Macros" do
client_response.body.should eq("hello")
end
it "can break block with return_with macro using default values" do
it "can break block with halt macro using default values" do
get "/" do |env|
return_with env
halt env
"world"
end
request = HTTP::Request.new("GET", "/")

View file

@ -69,8 +69,8 @@ end
# Halt execution with the current context.
# Returns 200 and an empty response by default.
#
# return_with env, status_code: 403, response: "Forbidden"
macro return_with(env, status_code = 200, response = "")
# halt env, status_code: 403, response: "Forbidden"
macro halt(env, status_code = 200, response = "")
{{env}}.response.status_code = {{status_code}}
{{env}}.response.print {{response}}
next