From baf24e7cfde9c5b4a124b54d680e1378c8e94b89 Mon Sep 17 00:00:00 2001
From: paku <paku@skyizwhite.dev>
Date: Mon, 22 Apr 2024 16:07:20 +0900
Subject: [PATCH] Rename middlewares
---
src/app.lisp | 14 ++++++--------
...nsupported-browser.lisp => access-blocker.lisp} | 8 ++++----
.../{accesslog.lisp => access-logger.lisp} | 8 ++++----
.../{serve-assets.lisp => assets-server.lisp} | 8 ++++----
.../{normalize-path.lisp => path-normalizer.lisp} | 8 ++++----
src/middlewares/{recovery.lisp => recoverer.lisp} | 8 ++++----
6 files changed, 26 insertions(+), 28 deletions(-)
rename src/middlewares/{block-unsupported-browser.lisp => access-blocker.lisp} (69%)
rename src/middlewares/{accesslog.lisp => access-logger.lisp} (66%)
rename src/middlewares/{serve-assets.lisp => assets-server.lisp} (76%)
rename src/middlewares/{normalize-path.lisp => path-normalizer.lisp} (73%)
rename src/middlewares/{recovery.lisp => recoverer.lisp} (79%)
diff --git a/src/app.lisp b/src/app.lisp
index af18ab7..dcd5a4e 100644
--- a/src/app.lisp
+++ b/src/app.lisp
@@ -23,14 +23,12 @@
(defun setup ()
(jg:clear-middlewares *app*)
(jg:clear-routing-rules *app*)
- (fbr:assign-routes *app*
- :system "hp"
- :directory "src/routes")
- (jg:install-middleware *app* mw:*recovery*)
- (jg:install-middleware *app* mw:*serve-assets*)
- (jg:install-middleware *app* mw:*normalize-path*)
- (jg:install-middleware *app* mw:*accesslog*)
- (jg:install-middleware *app* mw:*block-unsupported-browser*))
+ (fbr:assign-routes *app* :system "hp" :directory "src/routes")
+ (jg:install-middleware *app* mw:*path-normalizer*)
+ (jg:install-middleware *app* mw:*assets-server*)
+ (jg:install-middleware *app* mw:*access-logger*)
+ (jg:install-middleware *app* mw:*access-blocker*)
+ (jg:install-middleware *app* mw:*recoverer*))
(defun update ()
(stop)
diff --git a/src/middlewares/block-unsupported-browser.lisp b/src/middlewares/access-blocker.lisp
similarity index 69%
rename from src/middlewares/block-unsupported-browser.lisp
rename to src/middlewares/access-blocker.lisp
index 9f2ad54..6a20d72 100644
--- a/src/middlewares/block-unsupported-browser.lisp
+++ b/src/middlewares/access-blocker.lisp
@@ -1,10 +1,10 @@
-(defpackage #:hp/middlewares/block-unsupported-browser
+(defpackage #:hp/middlewares/access-blocker
(:use #:cl)
(:local-nicknames (#:re #:cl-ppcre))
- (:export #:*block-unsupported-browser*))
-(in-package #:hp/middlewares/block-unsupported-browser)
+ (:export #:*access-blocker*))
+(in-package #:hp/middlewares/access-blocker)
-(defparameter *block-unsupported-browser*
+(defparameter *access-blocker*
(lambda (app)
(lambda (env)
(let ((user-agent (gethash "user-agent" (getf env :headers))))
diff --git a/src/middlewares/accesslog.lisp b/src/middlewares/access-logger.lisp
similarity index 66%
rename from src/middlewares/accesslog.lisp
rename to src/middlewares/access-logger.lisp
index 0ec8ac2..035b559 100644
--- a/src/middlewares/accesslog.lisp
+++ b/src/middlewares/access-logger.lisp
@@ -1,12 +1,12 @@
-(defpackage #:hp/middlewares/accesslog
+(defpackage #:hp/middlewares/access-logger
(:use #:cl)
(:import-from #:lack.middleware.accesslog
#:*lack-middleware-accesslog*)
(:import-from #:log4cl)
- (:export *accesslog*))
-(in-package #:hp/middlewares/accesslog)
+ (:export *access-logger*))
+(in-package #:hp/middlewares/access-logger)
-(defparameter *accesslog*
+(defparameter *access-logger*
(lambda (app)
(funcall *lack-middleware-accesslog*
app
diff --git a/src/middlewares/serve-assets.lisp b/src/middlewares/assets-server.lisp
similarity index 76%
rename from src/middlewares/serve-assets.lisp
rename to src/middlewares/assets-server.lisp
index 83be20c..16ee893 100644
--- a/src/middlewares/serve-assets.lisp
+++ b/src/middlewares/assets-server.lisp
@@ -1,15 +1,15 @@
-(defpackage #:hp/middlewares/serve-assets
+(defpackage #:hp/middlewares/assets-server
(:use #:cl)
(:import-from #:lack.middleware.static
#:*lack-middleware-static*)
- (:export #:*serve-assets*))
-(in-package #:hp/middlewares/serve-assets)
+ (:export #:*assets-server*))
+(in-package #:hp/middlewares/assets-server)
(defun exist-public-file-p (path)
(let ((pathname (probe-file (concatenate 'string "assets" path))))
(and pathname (pathname-name pathname))))
-(defparameter *serve-assets*
+(defparameter *assets-server*
(lambda (app)
(funcall *lack-middleware-static*
app
diff --git a/src/middlewares/normalize-path.lisp b/src/middlewares/path-normalizer.lisp
similarity index 73%
rename from src/middlewares/normalize-path.lisp
rename to src/middlewares/path-normalizer.lisp
index fa46502..679dd8f 100644
--- a/src/middlewares/normalize-path.lisp
+++ b/src/middlewares/path-normalizer.lisp
@@ -1,8 +1,8 @@
-(defpackage #:hp/middlewares/normalize-path
+(defpackage #:hp/middlewares/path-normalizer
(:use #:cl)
(:local-nicknames (#:re #:cl-ppcre))
- (:export #:*normalize-path*))
-(in-package #:hp/middlewares/normalize-path)
+ (:export #:*path-normalizer*))
+(in-package #:hp/middlewares/path-normalizer)
(defun has-trailing-slash-p (path)
(and (not (string= path "/")) (re:scan "\/$" path)))
@@ -10,7 +10,7 @@
(defun remove-trailing-slash (path)
(re:regex-replace "\/$" path ""))
-(defparameter *normalize-path*
+(defparameter *path-normalizer*
(lambda (app)
(lambda (env)
(let ((path (getf env :request-uri)))
diff --git a/src/middlewares/recovery.lisp b/src/middlewares/recoverer.lisp
similarity index 79%
rename from src/middlewares/recovery.lisp
rename to src/middlewares/recoverer.lisp
index a1dab6f..d400189 100644
--- a/src/middlewares/recovery.lisp
+++ b/src/middlewares/recoverer.lisp
@@ -1,17 +1,17 @@
-(defpackage #:hp/middlewares/recovery
+(defpackage #:hp/middlewares/recoverer
(:use #:cl)
(:import-from #:log4cl)
(:local-nicknames (#:tb #:trivial-backtrace))
(:local-nicknames (#:cfg #:hp/config/env))
- (:export #:*recovery*))
-(in-package #:hp/middlewares/recovery)
+ (:export #:*recoverer*))
+(in-package #:hp/middlewares/recoverer)
(defun message (condition)
(if (cfg:dev-mode-p)
(tb:print-backtrace condition :output nil)
"Internal Server Error"))
-(defparameter *recovery*
+(defparameter *recoverer*
(lambda (app)
(lambda (env)
(handler-case