refactor(web): replace weblocks with reblocks

weblocks was discontinued in favor of reblocks.
More details at https://40ants.com/reblocks/

Author: ryukinix

lisp-inference.asd

@@ -29,11 +29,12 @@
   :version "0.2.0"
   :serial t
   :depends-on (:lisp-inference
-               :weblocks
-               :weblocks-ui
+               :reblocks
+               :reblocks-ui
                :clack-handler-hunchentoot
                :find-port
-               :str)
+               :str
+               :40ants-routes)
   :pathname "web"
   :components ((:file "webapp")))
 

roswell/inference-server.ros

@@ -4,18 +4,20 @@
 exec ros -Q -- $0 "$@"
 |#
 
-#+quicklisp (defun ensure-dist-installed (dist nick)
-              (let ((d (ql-dist:find-dist nick)))
-                (when (not (and d (ql-dist:installedp d)))
-                 (ql-dist:install-dist dist
-                                       :prompt nil))))
+#+quicklisp
+(defun ensure-dist-installed-and-updated (dist nick)
+  (let ((d (ql-dist:find-dist nick)))
+    (if (not (and d (ql-dist:installedp d)))
+        (ql-dist:install-dist dist
+                              :prompt nil))
+    (ql:update-dist nick :prompt nil)))
 
 (progn ;;init forms
   (ros:ensure-asdf)
-  #+quicklisp (progn
-                (ensure-dist-installed "http://dist.ultralisp.org" "ultralisp")
-                (ql:quickload '(lisp-inference/web)))
-
+  #+quicklisp
+  (progn
+    (ensure-dist-installed-and-updated "http://dist.ultralisp.org" "ultralisp")
+    (ql:quickload '(lisp-inference/web)))
   )
 
 (defpackage :ros.script.lisp-inference/web

web/webapp.lisp

@@ -1,21 +1,26 @@
 (defpackage lisp-inference/web
   (:use #:cl
-        #:weblocks-ui/form
-        #:weblocks/html)
-  (:import-from #:weblocks/widget
+        #:reblocks-ui/form
+        #:reblocks/html)
+  (:import-from #:reblocks/widget
                 #:render
                 #:update
                 #:defwidget)
-  (:import-from #:weblocks/actions
+  (:import-from #:reblocks/actions
                 #:make-js-action)
-  (:import-from #:weblocks/app
+  (:import-from #:reblocks/app
                 #:defapp)
+  (:import-from #:reblocks-ui/core
+                #:ui-widget)
+  (:import-from #:reblocks/page
+                #:init-page)
   (:export #:start
            #:stop
            #:*notes*
            #:*proposition*
            #:*port*)
   (:nicknames #:webapp))
+;; reblocks docs: https://40ants.com/reblocks/
 
 (in-package lisp-inference/web)
 
@@ -30,7 +35,7 @@
   :prefix "/"
   :description "Lisp Inference Truth Table")
 
-(defwidget table ()
+(defwidget table (ui-widget)
   ((prop
     :initarg :prop
     :accessor prop)
@@ -57,10 +62,10 @@
   (update table))
 
 (defmethod render ((table table))
-  (with-html
+  (reblocks/html:with-html ()
     (:h1 :align "center" "Lisp Inference Truth Table System")
     (:div :align "center"
-          (with-html-form (:POST (lambda (&key prop &allow-other-keys)
+          (reblocks-ui/form:with-html-form (:POST (lambda (&key prop &allow-other-keys)
                                    (update-table table prop)))
             (:input :type "text"
                     :name "prop"
@@ -82,17 +87,17 @@
                "https://lerax.me/lisp-inference" "lerax.me/lisp-inference"))))
 
 (defun render-note (string)
-  (with-html
+  (reblocks/html:with-html ()
     (:pre string)))
 
-(defmethod weblocks/session:init ((app truth-table))
-  (declare (ignorable app))
+(defmethod reblocks/page:init-page ((app truth-table) (url-path string) expire-at)
+  (declare (ignorable app url-path expire-at))
   (create-table *proposition*))
 
 (defun start (&optional (port *port*))
-  (weblocks/debug:on)
-  (weblocks/server:stop)
-  (weblocks/server:start :port port))
+  (reblocks/debug:on)
+  (reblocks/server:stop)
+  (reblocks/server:start :port port))
 
 (defun stop ()
-  (weblocks/server:stop))
+  (reblocks/server:stop))