Fix ->nav-path for notebooks served over http

Author: mk

CHANGELOG.md

@@ -8,6 +8,8 @@ Changes can be:
 
 ## Unreleased
 
+* 🐞 Fix navigation path and reload when serving notebook over http
+
 * 🌟 Add compatibility with Babashka
 
   Requires Babashka 1.12.204 or newer.

src/nextjournal/clerk/webserver.clj

@@ -242,13 +242,11 @@
         (or (symbol? file-or-ns) (instance? clojure.lang.Namespace file-or-ns))
         (str "'" file-or-ns)
 
-        (string? file-or-ns)
-        (paths/drop-extension (or (paths/path-in-cwd file-or-ns) file-or-ns))))
+        (re-matches #"^http?s://.*" file-or-ns)
+        (str "/" file-or-ns)
 
-#_(->nav-path (str (fs/file (fs/cwd) "notebooks/rule_30.clj")))
-#_(->nav-path 'nextjournal.clerk.index)
-#_(->nav-path "notebooks/rule_30.clj")
-#_(->nav-path 'nextjournal.clerk.home)
+        (and (string? file-or-ns))
+        (paths/drop-extension (or (paths/path-in-cwd file-or-ns) file-or-ns))))
 
 (defn find-first-existing-file [files]
   (first (filter fs/exists? files)))
@@ -323,10 +321,10 @@
                       file-or-ns)
                (catch ^:sci/error Exception e
                  (u/if-bb
-                  (binding [*out* *err*]
-                    (println
-                     (str/join "\n" (sci.core/format-stacktrace (sci.core/stacktrace e)))))
-                  nil)))
+                   (binding [*out* *err*]
+                     (println
+                      (str/join "\n" (sci.core/format-stacktrace (sci.core/stacktrace e)))))
+                   nil)))
           {:status 200
            :headers {"Content-Type" "text/html" "Cache-Control" "no-store"}
            :body (view/->html {:doc (view/doc->viewer @!doc)

test/nextjournal/clerk/webserver_test.clj

@@ -1,5 +1,6 @@
 (ns nextjournal.clerk.webserver-test
-  (:require [clojure.java.io :as io]
+  (:require [babashka.fs :as fs]
+            [clojure.java.io :as io]
             [clojure.test :refer [deftest is testing]]
             [nextjournal.clerk.eval :as eval]
             [nextjournal.clerk.test-utils]
@@ -12,6 +13,15 @@
   (is (= 'nextjournal.clerk.tap (webserver/->file-or-ns "'nextjournal.clerk.tap")))
   (is (= "notebooks/rule_30.clj" (webserver/->file-or-ns "notebooks/rule_30.clj"))))
 
+(deftest ->nav-path-test
+  (is (= "notebooks/rule_30"
+         (webserver/->nav-path (str (fs/file (fs/cwd) "notebooks/rule_30.clj")))
+         (webserver/->nav-path "notebooks/rule_30.clj")))
+  (is (= "'nextjournal.clerk.home"
+         (webserver/->nav-path 'nextjournal.clerk.home)))
+  (is (= "/https://github.com/raw/nextjournal/clerk-demo/main/notebooks/rule_30.clj"
+         (webserver/->nav-path "https://github.com/raw/nextjournal/clerk-demo/main/notebooks/rule_30.clj"))))
+
 (deftest serve-blob
   (utils/when-not-bb
    (testing "lazy loading of simple range"