Merge pull request #66 from 40ants/fix-js-default-action-format

Fix js default action format
40ants · Sep 14, 2024 · 5a5e47c · 5a5e47c
2 parents 37e26bf + 745439a
commit 5a5e47c
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 88 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,6 +22,12 @@
             "ubuntu-latest",
             "windows-latest"
           ],
+          "exclude": [
+            {
+              "os": "windows-latest",
+              "lisp": "ccl-bin"
+            }
+          ],
           "lisp": [
             "sbcl-bin",
             "ccl-bin"
@@ -37,13 +43,14 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v3"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v3",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
-            "asdf-system": "reblocks"
+            "asdf-system": "reblocks",
+            "cache": "true"
           }
         },
         {

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -19,41 +19,15 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v3"
-        },
-        {
-          "name": "Grant All Perms to Make Cache Restoring Possible",
-          "run": "sudo mkdir -p /usr/local/etc/roswell\n                 sudo chown \"${USER}\" /usr/local/etc/roswell\n                 # Here the ros binary will be restored:\n                 sudo chown \"${USER}\" /usr/local/bin",
-          "shell": "bash"
-        },
-        {
-          "name": "Get Current Month",
-          "id": "current-month",
-          "run": "echo \"value=$(date -u \"+%Y-%m\")\" >> $GITHUB_OUTPUT",
-          "shell": "bash"
-        },
-        {
-          "name": "Cache Roswell Setup",
-          "id": "cache",
-          "uses": "actions/cache@v3",
-          "with": {
-            "path": "qlfile\nqlfile.lock\n~/.cache/common-lisp/\n~/.roswell\n/usr/local/etc/roswell\n/usr/local/bin/ros\n/usr/local/Cellar/roswell\n.qlot",
-            "key": "a-${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-ubuntu-latest-quicklisp-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}"
-          }
-        },
-        {
-          "name": "Restore Path To Cached Files",
-          "run": "echo $HOME/.roswell/bin >> $GITHUB_PATH\n                 echo .qlot/bin >> $GITHUB_PATH",
-          "shell": "bash",
-          "if": "steps.cache.outputs.cache-hit == 'true'"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v3",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
-            "asdf-system": "reblocks-docs"
-          },
-          "if": "steps.cache.outputs.cache-hit != 'true'"
+            "asdf-system": "reblocks-docs",
+            "cache": "true"
+          }
         },
         {
           "name": "Build Docs",

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -14,41 +14,15 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v3"
-        },
-        {
-          "name": "Grant All Perms to Make Cache Restoring Possible",
-          "run": "sudo mkdir -p /usr/local/etc/roswell\n                 sudo chown \"${USER}\" /usr/local/etc/roswell\n                 # Here the ros binary will be restored:\n                 sudo chown \"${USER}\" /usr/local/bin",
-          "shell": "bash"
-        },
-        {
-          "name": "Get Current Month",
-          "id": "current-month",
-          "run": "echo \"value=$(date -u \"+%Y-%m\")\" >> $GITHUB_OUTPUT",
-          "shell": "bash"
-        },
-        {
-          "name": "Cache Roswell Setup",
-          "id": "cache",
-          "uses": "actions/cache@v3",
-          "with": {
-            "path": "qlfile\nqlfile.lock\n~/.cache/common-lisp/\n~/.roswell\n/usr/local/etc/roswell\n/usr/local/bin/ros\n/usr/local/Cellar/roswell\n.qlot",
-            "key": "a-${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-ubuntu-latest-quicklisp-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}"
-          }
-        },
-        {
-          "name": "Restore Path To Cached Files",
-          "run": "echo $HOME/.roswell/bin >> $GITHUB_PATH\n                 echo .qlot/bin >> $GITHUB_PATH",
-          "shell": "bash",
-          "if": "steps.cache.outputs.cache-hit == 'true'"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v3",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
-            "asdf-system": "reblocks"
-          },
-          "if": "steps.cache.outputs.cache-hit != 'true'"
+            "asdf-system": "reblocks",
+            "cache": "true"
+          }
         },
         {
           "name": "Change dist to Ultralisp if qlfile does not exist",

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v3"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Create release tag",

diff --git a/src/actions.lisp b/src/actions.lisp
@@ -226,16 +226,14 @@ situation (e.g. redirect, signal an error, etc.)."))
    It accepts any function as input and produces a string with JavaScript code."
   (check-type args (or null hash-table))
 
-  (let* ((action-code (make-action action)))
-    (cond
-      (args
-       (let ((options (dict "args" args)))
-         (format nil *js-default-action*
-                 action-code
-                 (yason:with-output-to-string* ()
-                   (yason:encode options)))))
-      (t
-       (format nil *js-default-action* action-code)))))
+  (let* ((action-code (make-action action))
+         (serialized-args
+           (when args
+             (yason:with-output-to-string* ()
+               (yason:encode (dict "args" args))))))
+    (format nil *js-default-action*
+            action-code
+            serialized-args)))
 
 
 (defun make-js-form-action (action)

diff --git a/src/ci.lisp b/src/ci.lisp
@@ -25,12 +25,16 @@
   :on-push-to "master"
   :by-cron "0 10 * * 1"
   :on-pull-request t
-  ;; :cache t
+  :cache t
   :jobs ((40ants-ci/jobs/run-tests:run-tests
           :os ("ubuntu-latest"
                "windows-latest")
           :lisp ("sbcl-bin"
                  "ccl-bin")
+          :exclude ((:os "windows-latest"
+                         ;; CCL-BIN 1.13 has issues on Windows
+                         ;; https://github.com/40ants/reblocks/actions/runs/10862718561/job/30146062047?pr=66
+                     :lisp "ccl-bin"))
           :coverage t)))
 
 (defworkflow docs

diff --git a/src/doc/changelog.lisp b/src/doc/changelog.lisp
@@ -13,6 +13,7 @@
                                                    "URL"
                                                    "URI"
                                                    "API"
+                                                   "PR"
                                                    "DOM"
                                                    "AJAX"
                                                    "JSON"
@@ -35,6 +36,14 @@
                                                    "REBLOCKS/SESSION:INIT")
                                     :external-links (("Ultralisp" . "https://ultralisp.org"))
                                     :external-docs ("https://40ants.com/log4cl-extras/"))
+  (0.61.0 2024-09-14
+          """
+Fixes
+=====
+
+* Fixed an error inside REBLOCKS/ACTIONS:MAKE-JS-ACTION function when called without :ARGS. (Thanks to olivercsr@github for the PR)
+
+""")
   (0.60.0 2024-07-28
           """
 Incompatible Changed

diff --git a/t/actions.lisp b/t/actions.lisp
@@ -4,6 +4,8 @@
         #:hamcrest/rove
         #:reblocks-tests/utils)
   (:import-from #:reblocks/actions
+                #:generate-action-code
+                #:make-js-action
                 #:make-action
                 #:eval-action
                 #:on-missing-action
@@ -19,7 +21,11 @@
   (:import-from #:reblocks/variables
                 #:*current-app*)
   (:import-from #:serapeum
-                #:fmt))
+                #:dict
+                #:fmt)
+  (:import-from #:cl-mock
+                #:with-mocks
+                #:answer))
 (in-package #:reblocks-tests/actions)
 
 
@@ -123,18 +129,17 @@
 
 
 (deftest make-action-success
-  (reblocks/app:with-app (make-instance 'test-app)
-    (with-test-session ()
-      (with-test-request ("/")
-        (internal-make-action #'identity "abc123")
+  (with-test-session ()
+    (with-test-request ("/")
+      (internal-make-action #'identity "abc123")
 
-        (ok (equal (make-action "abc123")
-                   "abc123")
-            "When action is defined make-action should return it's name")
+      (ok (equal (make-action "abc123")
+                 "abc123")
+          "When action is defined make-action should return it's name")
 
-        (ok (equal (make-action #'identity)
-                   "abc123")
-            "This also should work if a function was given as an argument")))))
+      (ok (equal (make-action #'identity)
+                 "abc123")
+          "This also should work if a function was given as an argument"))))
 
 
 (defun test-action ()
@@ -149,3 +154,18 @@
 
           (ok (equal (make-action-url "test-action")
                      "/foo/bar?action=test-action"))))))
+
+
+(deftest make-js-action-test ()
+  (with-test-session ()
+    (with-test-request ("/")
+      (with-mocks ()
+        (answer generate-action-code "action:code")
+
+        (ok (equal (make-js-action 'identity)
+                   "return initiateAction(\"action:code\")"))
+
+        (ok (equal (make-js-action 'identity
+                                   :args (dict
+                                          "foo" 100500))
+                   "return initiateAction(\"action:code\", {\"args\":{\"foo\":100500}})"))))))