Fix Dockerfile

src/app.lisp

@@ -1,8 +1,11 @@
 (defpackage #:hp/app
   (:use #:cl)
-  (:local-nicknames (#:jg #:jingle))
-  (:local-nicknames (#:fbr #:ningle-fbr))
-  (:local-nicknames (#:env #:hp/env))
+  (:import-from #:jingle
+                #:make-app
+                #:install-middleware
+                #:configure)
+  (:import-from #:ningle-fbr
+                #:set-routes)
   (:import-from #:hp/middlewares/recoverer
                 #:*recoverer*)
   (:import-from #:hp/middlewares/trailing-slash
@@ -13,12 +16,12 @@
   (:export #:*app*))
 (in-package #:hp/app)
 
-(defparameter *app* (jg:make-app :address env:*address*
-                                 :port env:*port*))
+(defparameter *app*
+  (let ((app (make-app)))
+    (set-routes app :system :hp :target-dir-path "routes")
+    (install-middleware app *recoverer*)
+    (install-middleware app *trim-trailing-slash*)
+    (install-middleware app *public-server*)
+    (configure app)))
 
-(fbr:set-routes *app* :system :hp :target-dir-path "routes")
-(jg:install-middleware *app* *recoverer*)
-(jg:install-middleware *app* *trim-trailing-slash*)
-(jg:install-middleware *app* *public-server*)
-
-(jg:configure *app*)
+*app*

src/env.lisp

@@ -1,25 +0,0 @@
-(defpackage #:hp/env
-  (:use #:cl)
-  (:export #:dev-mode-p
-           #:prod-mode-p
-           #:*port*
-           #:*address*))
-(in-package #:hp/env)
-
-(defmacro defenv (name env &key default parser)
-  (let ((env-val (gensym "env-val")))
-    `(defparameter ,name
-       (let ((,env-val (uiop:getenv ,env)))
-         (if ,env-val
-             (funcall ,(or parser '#'identity) ,env-val)
-             ,default)))))
-
-(defenv *env* "HP_ENV" :default "dev")
-(defenv *address* "HP_ADDRESS" :default "localhost")
-(defenv *port* "HP_PORT" :default 3000 :parser #'parse-integer)
-
-(defun dev-mode-p ()
-  (string= *env* "dev"))
-
-(defun prod-mode-p ()
-  (string= *env* "prod"))

src/main.lisp

@@ -1,8 +1,7 @@
 (defpackage #:hp
   (:nicknames #:hp/main)
   (:use #:cl)
-  (:local-nicknames (#:jg #:jingle))
-  (:local-nicknames (#:env #:hp/env))
+  (:import-from #:clack)
   (:import-from #:hp/app
                 #:*app*)
   (:export #:start
@@ -10,11 +9,22 @@
            #:reload))
 (in-package #:hp)
 
+(defparameter *handler* nil)
+
 (defun start ()
-  (jg:start *app*))
+  (if *handler*
+      (format t "The server is already running.~%")
+      (setf *handler* (clack:clackup *app*
+                                     :server :hunchentoot
+                                     :address "localhost"
+                                     :port 3000))))
 
 (defun stop ()
-  (jg:stop *app*))
+  (if *handler*
+      (progn
+        (clack:stop *handler*)
+        (setf *handler* nil))
+      (format t "The server is not running.~%")))
 
 (defun reload ()
   (stop)

src/middlewares/recoverer.lisp

@@ -1,8 +1,8 @@
 (defpackage #:hp/middlewares/recoverer
   (:use #:cl
         #:hsx)
-  (:local-nicknames (#:tb #:trivial-backtrace))
-  (:local-nicknames (#:env #:hp/env))
+  (:import-from #:trivial-backtrace
+                #:print-backtrace)
   (:export #:*recoverer*))
 (in-package #:hp/middlewares/recoverer)
 
@@ -14,10 +14,10 @@
      (body
        (main
          (h1 "500 Internal Server Error")
-         (when (env:dev-mode-p)
+         (when (string= (uiop:getenv "HP_ENV") "dev")
            (hsx
             (pre
-              (code (tb:print-backtrace condition :output nil))))))))))
+              (code (print-backtrace condition :output nil))))))))))
 
 (defparameter *recoverer*
   (lambda (app)

src/middlewares/trailing-slash.lisp

@@ -1,6 +1,6 @@
 (defpackage #:hp/middlewares/trailing-slash
   (:use #:cl)
-  (:local-nicknames (#:qu #:quri))
+  (:import-from :quri)
   (:export #:*trim-trailing-slash*))
 (in-package #:hp/middlewares/trailing-slash)
 
@@ -10,8 +10,8 @@
 (defparameter *trim-trailing-slash*
   (lambda (app)
     (lambda (env)
-      (let* ((req-uri (qu:uri (getf env :request-uri)))
-             (req-path (qu:uri-path req-uri))
+      (let* ((req-uri (quri:uri (getf env :request-uri)))
+             (req-path (quri:uri-path req-uri))
              (req-method (getf env :request-method))
              (response (funcall app env))
              (res-status (first response)))
@@ -19,7 +19,7 @@
                  (eq req-method :get)
                  (not (string= req-path "/"))
                  (string= (last-string req-path) "/"))
-            (let ((red-uri (qu:copy-uri req-uri
+            (let ((red-uri (quri:copy-uri req-uri
                                         :path (string-right-trim "/" req-path))))
-              `(301 (:location ,(qu:render-uri red-uri))))
+              `(301 (:location ,(quri:render-uri red-uri))))
             response)))))

src/renderer.lisp

@@ -2,10 +2,9 @@
   (:use #:cl
         #:hsx
         #:trivia)
-  (:local-nicknames (#:jg #:jingle))
+  (:import-from :jingle)
   (:import-from #:hsx/element
-                #:element)
-  (:local-nicknames (#:env #:hp/env)))
+                #:element))
 (in-package #:hp/renderer)
 
 (defun bust-cache (url)
@@ -70,12 +69,12 @@
        (main :class "flex-1 h-full"
          children)))))
 
-(defmethod jg:process-response ((app jg:app) result)
-  (jg:set-response-header :content-type "text/html; charset=utf-8")
-  (when (env:dev-mode-p)
-    (jg:set-response-header :cache-control "no-store, no-cache, must-revalidate")
-    (jg:set-response-header :pragma "no-cache")
-    (jg:set-response-header :expires "0"))
+(defmethod jingle:process-response ((app jingle:app) result)
+  (jingle:set-response-header :content-type "text/html; charset=utf-8")
+  (when (string= (uiop:getenv "HP_ENV") "dev")
+    (jingle:set-response-header :cache-control "no-store, no-cache, must-revalidate")
+    (jingle:set-response-header :pragma "no-cache")
+    (jingle:set-response-header :expires "0"))
   (call-next-method app
                     (hsx:render-to-string
                      (match result

src/routes/not-found.lisp

@@ -1,7 +1,7 @@
 (defpackage #:hp/routes/not-found
   (:use #:cl
         #:hsx)
-  (:local-nicknames (#:jg #:jingle))
+  (:import-from :jingle)
   (:export #:handle-not-found))
 (in-package #:hp/routes/not-found)
 
@@ -15,5 +15,5 @@
      (h1 "404 Not Found"))))
 
 (defun handle-not-found ()
-  (jg:set-response-status :not-found)
+  (jingle:set-response-status :not-found)
   (list (~page) *metadata*))