Adds JSON test to Woo framework (#4251)

* Adds JSON to Woo framework

* Adds JSON handler; converts comments to function docstrings

* Abstracts boilerplate code into files to import

* Removes unnecessary Dockerfile lines

frameworks/Lisp/woo/benchmark_config.json

@@ -4,6 +4,7 @@
         {
             "default": {
                 "plaintext_url": "/plaintext",
+                "json_url": "/json",
                 "port": 8080,
                 "approach": "Realistic",
                 "classification": "Micro",

frameworks/Lisp/woo/helpers/parse-argv.lisp

@@ -0,0 +1,18 @@
+(defun parse-argv (args)
+  (flet ((parse-int-value (option value)
+           (handler-case (parse-integer value)
+             (error (e)
+               (error "Invalid value for ~S: ~S~%  ~A" option value e)))))
+    (loop for option = (pop args)
+          for value = (pop args)
+          while option
+          if (not (starts-with option "--"))
+            do (error "Invalid option: ~S" option)
+          else
+            if (equal option "--worker")
+              append (list :worker-num (parse-int-value option value))
+          else
+            if (equal option "--port")
+              append (list :port (parse-int-value option value))
+          else
+            do (error "Unknown option: ~S" option))))

frameworks/Lisp/woo/helpers/starts-with.lisp

@@ -0,0 +1,3 @@
+(defun starts-with (x starts)
+  (and (<= (length starts) (length x))
+       (string= x starts :end1 (length starts))))

frameworks/Lisp/woo/woo.dockerfile

@@ -1,10 +1,11 @@
 FROM fukamachi/roswell
 
+RUN apt update -y
+RUN apt install -y libev-dev
+
 WORKDIR /woo
 ADD  . .
 
-RUN apt install -y libev-dev
-
 RUN ["chmod", "+x", "./woo.ros"]
 
 CMD ./woo.ros --worker $(nproc) --port 8080

frameworks/Lisp/woo/woo.ros

@@ -24,52 +24,40 @@ exec ros -Q -- $0 "$@"
 (ql:quickload '(:uiop :woo :alexandria :optima :jonathan) :silent t)
 (use-package :optima)
 
-;; This is just boilerplate
-(defun starts-with (x starts)
-  (and (<= (length starts) (length x))
-       (string= x starts :end1 (length starts))))
+(load "./helpers/starts-with.lisp")
+(load "./helpers/parse-argv.lisp")
 
-(defun parse-argv (args)
-  (flet ((parse-int-value (option value)
-           (handler-case (parse-integer value)
-             (error (e)
-               (error "Invalid value for ~S: ~S~%  ~A" option value e)))))
-    (loop for option = (pop args)
-          for value = (pop args)
-          while option
-          if (not (starts-with option "--"))
-            do (error "Invalid option: ~S" option)
-          else
-            if (equal option "--worker")
-              append (list :worker-num (parse-int-value option value))
-          else
-            if (equal option "--port")
-              append (list :port (parse-int-value option value))
-          else
-            do (error "Unknown option: ~S" option))))
-;; END BOILERPLATE
 
-
-;; Plaintext handler
 (defun plaintext (env)
+  "Plaintext handler."
   (declare (ignore env))
   '(200 (:content-type "text/plain" :server "Woo") ("Hello, World!"))
 )
 
+(defun json (env)
+  "JSON handler using Jonathan to encode JSON"
+  (declare (ignore env))
+  `(200 (:content-type "application/json" :server "Woo") (,(jonathan:to-json '(:message "Hello, World!"))))
+)
+
 
-;; Route handler
 (defun handler (env)
+  "Woo router using Alexandria and Optima pattern matching."
   (optima:match env
     (
       (guard (property :path-info path) (alexandria:starts-with-subseq "/plaintext" path))
       (funcall 'plaintext env)
     )
+    (
+      (guard (property :path-info path) (alexandria:starts-with-subseq "/json" path))
+      (funcall 'json env)
+    )
   )
 )
 
 
-;; Create and start the server
 (defun main (&rest argv)
+  "Create and start the server, applying argv to the env"
   (let ((args (parse-argv argv)))
     (apply #'woo:run
       (lambda (env)