luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2026-02-13 14:55:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Polish code

Browse source
This commit is contained in:
Tommi Reiman 2018-10-30 19:51:19 +02:00
parent 763440e41f
commit 2a08ba2c98
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/reitit-ring/src/reitit/ring.cljc
View file

@ -122,19 +122,18 @@
" "
([] (redirect-trailing-slash-handler {:method :both})) ([] (redirect-trailing-slash-handler {:method :both}))
([{:keys [method]}] ([{:keys [method]}]
(let [redirect-handler (fn redirect-handler [request] (letfn [(maybe-redirect [request path]
(let [uri (:uri request)
status (if (= (:request-method request) :get) 301 308)
maybe-redirect (fn maybe-redirect [path]
(if (r/match-by-path (::r/router request) path) (if (r/match-by-path (::r/router request) path)
{:status status {:status (if (= (:request-method request) :get) 301 308)
:headers {"Location" path} :headers {"Location" path}
:body ""}))] :body ""}))
(redirect-handler [request]
(let [uri (:uri request)]
(if (str/ends-with? uri "/") (if (str/ends-with? uri "/")
(if (not= method :add) (if (not= method :add)
(maybe-redirect (subs uri 0 (-> uri count dec)))) (maybe-redirect request (subs uri 0 (-> uri count dec))))
(if (not= method :strip) (if (not= method :strip)
(maybe-redirect (str uri "/"))))))] (maybe-redirect request (str uri "/"))))))]
(fn (fn
([request] ([request]
(redirect-handler request)) (redirect-handler request))