Revert "Change middleware definitions from parameters to functions"

This reverts commit 56ef2a853d.
This commit is contained in:
Akira Tempaku 2025-03-02 22:20:06 +09:00
parent 6da7e96b29
commit 77a0f43663
Signed by: paku
GPG key ID: 5B4E8402BCC50607
3 changed files with 13 additions and 13 deletions

View file

@ -2,7 +2,7 @@
This middleware handles Trailing Slash in the URL on a GET request.
`append-trailing-slash` redirects the URL to which it added the Trailing Slash if the content was not found. Also, `trim-trailing-slash` will remove the Trailing Slash.
`*append-trailing-slash*` redirects the URL to which it added the Trailing Slash if the content was not found. Also, `*trim-trailing-slash*` will remove the Trailing Slash.
## Usage
@ -14,7 +14,7 @@ Example of redirecting a GET request of `/about/me` to `/about/me/`.
(:import-from #:ningle)
(:import-from #:lack)
(:import-from #:lack-mw
#:append-trailing-slash))
#:*append-trailing-slash*))
(in-package #:app/main)
(defparameter *raw-app* (make-instance 'ningle:app))
@ -23,7 +23,7 @@ Example of redirecting a GET request of `/about/me` to `/about/me/`.
(defparameter *app*
(lack:builder
(append-trailing-slash)
*append-trailing-slash*
*raw-app*))
```
@ -35,7 +35,7 @@ Example of redirecting a GET request of `/about/me/` to `/about/me`.
(:import-from #:ningle)
(:import-from #:lack)
(:import-from #:lack-mw
#:trim-trailing-slash))
#:*trim-trailing-slash*))
(in-package #:app/main)
(defparameter *raw-app* (make-instance 'ningle:app))
@ -44,7 +44,7 @@ Example of redirecting a GET request of `/about/me/` to `/about/me`.
(defparameter *app*
(lack:builder
(trim-trailing-slash)
*trim-trailing-slash*
*raw-app*))
```

View file

@ -1,14 +1,14 @@
(defpackage #:lack-mw/trailing-slash
(:use #:cl)
(:import-from #:quri)
(:export #:trim-trailing-slash
#:append-trailing-slash))
(:export #:*trim-trailing-slash*
#:*append-trailing-slash*))
(in-package #:lack-mw/trailing-slash)
(defun last-string (str)
(subseq str (- (length str) 1)))
(defun trim-trailing-slash ()
(defparameter *trim-trailing-slash*
(lambda (app)
(lambda (env)
(let* ((req-uri (quri:uri (getf env :request-uri)))
@ -25,7 +25,7 @@
`(301 (:location ,(quri:render-uri red-uri)) ()))
response)))))
(defun append-trailing-slash ()
(defparameter *append-trailing-slash*
(lambda (app)
(lambda (env)
(let* ((req-uri (quri:uri (getf env :request-uri)))

View file

@ -7,13 +7,13 @@
#:request)
(:import-from #:ningle)
(:import-from #:lack-mw/trailing-slash
#:trim-trailing-slash
#:append-trailing-slash))
#:*trim-trailing-slash*
#:*append-trailing-slash*))
(in-package #:lack-mw-test/trailing-slash)
(defparameter *app-without-trailing-slash*
(lack:builder
(trim-trailing-slash)
*trim-trailing-slash*
(let ((raw-app (make-instance 'ningle:app)))
(setf (ningle:route raw-app "/") "ok")
(setf (ningle:route raw-app "/without/trailing/slash") "ok")
@ -21,7 +21,7 @@
(defparameter *app-with-trailing-slash*
(lack:builder
(append-trailing-slash)
*append-trailing-slash*
(let ((raw-app (make-instance 'ningle:app)))
(setf (ningle:route raw-app "/") "ok")
(setf (ningle:route raw-app "/something.file") "ok")