Skip to content

Commit 99c2321

Browse files
etpinardetpinard
committed
lint modified files for 1.2.0
- replace tabs with spaces - cut white spaces at EOL - add newline at EOF
1 parent 5b4ff82 commit 99c2321

File tree

5 files changed

+76
-76
lines changed

5 files changed

+76
-76
lines changed

‎src/HttpHelpers/HttpHelpers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ import HTTP, CodecZlib
66
include("handlers.jl")
77
include("router.jl")
88

9-
end
9+
end

‎src/HttpHelpers/handlers.jl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
struct RequestHandlerFunction <: HTTP.Handler
2-
func::Function # func(req)
2+
func::Function # func(req)
33
end
44
(x::RequestHandlerFunction)(args...) = x.func(args...)
55

66
function handle(h::RequestHandlerFunction, request::HTTP.Request, args...)
7-
h(request, args...)
7+
h(request, args...)
88
end
99

1010
function handle(handler::Function, request::HTTP.Request, args...)
11-
handler(request, args)
11+
handler(request, args)
1212
end
1313

1414
function handle(h::RequestHandlerFunction, request::HTTP.Request, state, args...)
15-
h(request, state, args...)
15+
h(request, state, args...)
1616
end
1717

1818
function handle(handler::Function, request::HTTP.Request, state, args...)
19-
handler(request, state, args)
19+
handler(request, state, args)
2020
end
2121

2222
function state_handler(base_handler, state)
23-
return RequestHandlerFunction(
24-
function(request::HTTP.Request, args...)
25-
response = handle(base_handler, request, state, args...)
26-
if response.status == 200
27-
HTTP.defaultheader!(response, "Content-Type" => HTTP.sniff(response.body))
28-
HTTP.defaultheader!(response, "Content-Length" => string(sizeof(response.body)))
29-
end
30-
return response
31-
end
32-
)
23+
return RequestHandlerFunction(
24+
function(request::HTTP.Request, args...)
25+
response = handle(base_handler, request, state, args...)
26+
if response.status == 200
27+
HTTP.defaultheader!(response, "Content-Type" => HTTP.sniff(response.body))
28+
HTTP.defaultheader!(response, "Content-Length" => string(sizeof(response.body)))
29+
end
30+
return response
31+
end
32+
)
3333
end
3434

3535
state_handler(base_handler::Function, state) = state_handler(RequestHandlerFunction(base_handler), state)

‎test/env.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ end
5252
@test dash_env("host") == "localhost"
5353
@test isnothing(dash_env("host", prefix = ""))
5454

55-
delete!(ENV, "PORT")
55+
delete!(ENV, "PORT")
5656
@test dash_env(Int64, "port", 8050, prefix = "") == 8050
5757
ENV["PORT"] = "2001"
5858
@test isnothing(dash_env(Int64, "port"))
5959
@test dash_env(Int64, "port", prefix = "") == 2001
60-
end
60+
end

‎test/handlers.jl

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Test
22
using HTTP
33
using Dash
4-
using Dash: make_handler, compress_handler, process_resource, state_handler, HandlerState,
4+
using Dash: make_handler, compress_handler, process_resource, state_handler, HandlerState,
55
process_resource, Route, Router, add_route!, make_handler
66
using Dash.HttpHelpers: StaticRoute, DynamicRoute, try_handle, RouteHandler, _make_route
77
using CodecZlib
@@ -22,17 +22,17 @@ end
2222

2323
route = DynamicRoute("/ddd/<var1>/fff/<var2>")
2424
@test route.static_segments == ((1,"ddd"), (3, "fff"))
25-
route.variables.var1 == 2
25+
route.variables.var1 == 2
2626
route.variables.var2 == 4
27-
28-
route = _make_route("/fff/sss/ggg/vvvv")
27+
28+
route = _make_route("/fff/sss/ggg/vvvv")
2929
@test route isa StaticRoute
3030
@test route.url == "/fff/sss/ggg/vvvv"
3131

32-
route = _make_route("/fff/sss/<var1>/vvvv")
32+
route = _make_route("/fff/sss/<var1>/vvvv")
3333
@test route isa DynamicRoute
3434

35-
route = _make_route("/test_req/test1")
35+
route = _make_route("/test_req/test1")
3636
handler = (req) -> HTTP.Response(200)
3737
route_handler = RouteHandler(route, handler)
3838
res = try_handle(route_handler, path_request("/test_req/test2")...)
@@ -43,7 +43,7 @@ end
4343
@test res.status == 200
4444

4545

46-
route = _make_route("/test_req/<var1>/test1")
46+
route = _make_route("/test_req/<var1>/test1")
4747
handler = (req;kwargs...) ->
4848
begin
4949
tmp = String[]
@@ -63,23 +63,23 @@ end
6363
@test res.status == 200
6464
@test String(res.body) == "var1->asdasd"
6565

66-
route = _make_route("/test_req/*/test1")
66+
route = _make_route("/test_req/*/test1")
6767
route_handler = RouteHandler(route, handler)
6868
res = try_handle(route_handler, path_request("/test_req/asdasd/test2")...)
6969
@test isnothing(res)
7070
res = try_handle(route_handler, path_request("/test_req/asdasd/test1")...)
7171
@test res.status == 200
7272
@test String(res.body) == ""
7373

74-
route = _make_route("/test_req/*/test1/<var1>")
74+
route = _make_route("/test_req/*/test1/<var1>")
7575
route_handler = RouteHandler(route, handler)
7676
res = try_handle(route_handler, path_request("/test_req/asdasd/test1")...)
7777
@test isnothing(res)
7878
res = try_handle(route_handler, path_request("/test_req/asdasd/test1/ddd")...)
7979
@test res.status == 200
8080
@test String(res.body) == "var1->ddd"
81-
82-
route = _make_route("/test_req/<var2>/test1/<var1>")
81+
82+
route = _make_route("/test_req/<var2>/test1/<var1>")
8383
route_handler = RouteHandler(route, handler)
8484
res = try_handle(route_handler, path_request("/test_req/asdasd/test1")...)
8585
@test isnothing(res)
@@ -109,73 +109,73 @@ end
109109

110110
handler1 = (req;var1) -> HTTP.Response(200, "var1=$var1")
111111
add_route!(handler1, router, "/var/<var1>/")
112-
113-
add_route!((req;var1, var2) -> HTTP.Response(200, "var1=$var1,var2=$var2"),
114-
router, "/var/<var1>/<var2>/")
115-
116-
res = Dash.HttpHelpers.handle(router, HTTP.Request("GET",""))
112+
113+
add_route!((req;var1, var2) -> HTTP.Response(200, "var1=$var1,var2=$var2"),
114+
router, "/var/<var1>/<var2>/")
115+
116+
res = Dash.HttpHelpers.handle(router, HTTP.Request("GET",""))
117117
@test res.status == 200
118118
@test String(res.body) == "index"
119119

120-
res = Dash.HttpHelpers.handle(router, HTTP.Request("GET","/"))
120+
res = Dash.HttpHelpers.handle(router, HTTP.Request("GET","/"))
121121
@test res.status == 200
122122
@test String(res.body) == "index"
123123

124-
res = Dash.HttpHelpers.handle(router, HTTP.Request("GET","/test_post"))
124+
res = Dash.HttpHelpers.handle(router, HTTP.Request("GET","/test_post"))
125125
@test res.status == 404
126-
127-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/test_post"))
126+
127+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/test_post"))
128128
@test res.status == 200
129129
@test String(res.body) == "test_post"
130130

131-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/"))
131+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/"))
132132
@test res.status == 404
133133

134-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass"))
134+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass"))
135135
@test res.status == 200
136136
@test String(res.body) == "var1=ass"
137-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass/"))
137+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass/"))
138138
@test res.status == 200
139139
@test String(res.body) == "var1=ass"
140140

141-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass/fff"))
141+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass/fff"))
142142
@test res.status == 200
143143
@test String(res.body) == "var1=ass,var2=fff"
144-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass/fff/"))
144+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass/fff/"))
145145
@test res.status == 200
146146
@test String(res.body) == "var1=ass,var2=fff"
147-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass/fff/dd"))
147+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/var/ass/fff/dd"))
148148
@test res.status == 404
149149

150-
add_route!((req, param;var1) -> HTTP.Response(200, "$param, var1=$var1"),
151-
router, "POST", "/<var1>")
152-
153-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/test_post"))
150+
add_route!((req, param;var1) -> HTTP.Response(200, "$param, var1=$var1"),
151+
router, "POST", "/<var1>")
152+
153+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/test_post"))
154154
@test res.status == 200
155155
@test String(res.body) == "test_post"
156156

157-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/test"), "aaa")
157+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/test"), "aaa")
158158
@test res.status == 200
159159
@test String(res.body) == "aaa, var1=test"
160160

161-
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/test/renderer/r.js"), "aaa")
161+
res = Dash.HttpHelpers.handle(router, HTTP.Request("POST","/test/renderer/r.js"), "aaa")
162162
@test res.status == 200
163163
@test String(res.body) == "aaa, var1=test/renderer/r.js"
164-
165-
end
164+
165+
end
166166

167167
@testset "base_handler" begin
168-
function structsequal(a::T, b::T)::Bool where T
169-
for name in propertynames(a)
170-
if getfield(a, name) != getfield(b, name)
171-
return false
172-
end
173-
end
174-
return true
175-
end
168+
function structsequal(a::T, b::T)::Bool where T
169+
for name in propertynames(a)
170+
if getfield(a, name) != getfield(b, name)
171+
return false
172+
end
173+
end
174+
return true
175+
end
176176

177177
base_handler = function(request, state)
178-
@test request.target == "/test_path"
178+
@test request.target == "/test_path"
179179
@test state isa TestState
180180
@test state.setting
181181
return HTTP.Response(200, "test1")
@@ -185,31 +185,31 @@ end
185185
test_handler = state_handler(base_handler, state)
186186
test_request = HTTP.Request("GET", "/test_path")
187187
res = Dash.HttpHelpers.handle(test_handler, test_request)
188-
@test structsequal(res, test_handler(test_request)) #RequestHandlerFunction must be directly callable since HTTP.jl will use it
188+
@test structsequal(res, test_handler(test_request)) #RequestHandlerFunction must be directly callable since HTTP.jl will use it
189189
@test res.status == 200
190190
@test String(res.body) == "test1"
191191
@test startswith(HTTP.header(res, "Content-Type", ""), "text/plain")
192192
@test parse(Int, HTTP.header(res, "Content-Length", "0")) == sizeof("test1")
193193

194194
base_handler_http = function(request, state)
195-
@test request.target == "/test_path2"
195+
@test request.target == "/test_path2"
196196
@test state isa TestState
197197
@test state.setting
198198
return HTTP.Response(200, "<html></html>")
199199
end
200-
200+
201201
state = TestState(true)
202202
test_handler = state_handler(base_handler_http, state)
203203
test_request = HTTP.Request("GET", "/test_path2")
204204
res = Dash.HttpHelpers.handle(test_handler, test_request)
205-
@test structsequal(res, test_handler(test_request))
206-
@test res.status == 200
205+
@test structsequal(res, test_handler(test_request))
206+
@test res.status == 200
207207
@test String(res.body) == "<html></html>"
208208
@test startswith(HTTP.header(res, "Content-Type", ""), "text/html")
209209
@test parse(Int, HTTP.header(res, "Content-Length", "0")) == sizeof("<html></html>")
210210

211211
base_handler_js = function(request, state)
212-
@test request.target == "/test_path3"
212+
@test request.target == "/test_path3"
213213
@test state isa TestState
214214
@test state.setting
215215
return HTTP.Response(200, ["Content-Type"=>"text/javascript"], body = "<html></html>")
@@ -218,21 +218,21 @@ end
218218
test_handler = state_handler(base_handler_js, state)
219219
test_request = HTTP.Request("GET", "/test_path3")
220220
res = Dash.HttpHelpers.handle(test_handler, test_request)
221-
@test structsequal(res, test_handler(test_request))
222-
@test res.status == 200
221+
@test structsequal(res, test_handler(test_request))
222+
@test res.status == 200
223223
@test String(res.body) == "<html></html>"
224224
@test startswith(HTTP.header(res, "Content-Type", ""), "text/javascript")
225225
@test parse(Int, HTTP.header(res, "Content-Length", "0")) == sizeof("<html></html>")
226226
end
227227
@testset "compression" begin
228228

229229
base_handler = function(request, state)
230-
@test request.target == "/test_path"
230+
@test request.target == "/test_path"
231231
@test state isa TestState
232232
@test state.setting
233233
return HTTP.Response(200, "test1")
234234
end
235-
235+
236236
state = TestState(true)
237237
handler = compress_handler(state_handler(base_handler, state))
238238
test_request = HTTP.Request("GET", "/test_path")
@@ -243,7 +243,7 @@ end
243243
@test !HTTP.hasheader(res, "Content-Encoding")
244244

245245
base_handler = function(request, state)
246-
@test request.target == "/test_big"
246+
@test request.target == "/test_big"
247247
@test state isa TestState
248248
@test state.setting
249249
return HTTP.Response(200, repeat("<html></html>", 500))
@@ -290,7 +290,7 @@ end
290290
dev_package_path = "dash-renderer/dash_renderer.js",
291291
)
292292
]
293-
)
293+
)
294294
)
295295

296296
test_app = dash()
@@ -319,14 +319,14 @@ end
319319
HTTP.setheader(request, "If-None-Match"=>etag)
320320
resp = Dash.HttpHelpers.handle(handler, request)
321321
@test resp.status == 304
322-
322+
323323

324324
request = HTTP.Request("GET", "/_dash-component-suites/dash_renderer/props.v1_2_3m2333123.min.js")
325325
resp = Dash.HttpHelpers.handle(handler, request)
326326
HTTP.setheader(request, "If-None-Match"=>bytes2hex(md5("var a = [1,2,3,4,5,6]")))
327327
@test resp.status == 200
328328
@test String(resp.body) == "var string = \"fffffff\""
329329
@test HTTP.hasheader(resp, "Cache-Control")
330-
330+
331331
end
332332

‎test/reload_hash.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ end
3636
@test data.files[1].url == "/assets/test2.css"
3737
@test data.files[1].is_css == true
3838
rm("assets/test2.css", force = true)
39-
end
39+
end

0 commit comments

Comments
 (0)