move db to civitas root

Author: timothypratley

clay.edn

@@ -1,12 +1,13 @@
-{:base-target-path "temp"
- :base-source-path "src"
- :subdirs-to-sync  ["src"]
- :keep-sync-root   false
- :flatten-targets  false
- :remote-repo      {:git-url "https://github.com/ClojureCivitas/clojurecivitas.github.io"
-                    :branch  "main"}
- :hide-info-line   true
- :hide-ui-header   true
+{:base-target-path    "temp"
+ :base-source-path    "src"
+ :subdirs-to-sync     ["src"]
+ :keep-sync-root      false
+ :flatten-targets     false
+ :remote-repo         {:git-url "https://github.com/ClojureCivitas/clojurecivitas.github.io"
+                       :branch  "main"}
+ :hide-info-line      true
+ :hide-ui-header      true
+ :config/transform civitas.db/expand-authors
 
  ;; aliases
  :markdown
@@ -15,10 +16,4 @@
   :format           [:quarto :html]
   :run-quarto       false
   :hide-info-line   false
-  :quarto           ^:replace {}
-  :quarto/expand    (-> (slurp "site/db.edn")
-                      (clojure.edn/read-string)
-                      (mapcat [:author :affiliation])
-                      (->> (group-by :id))
-                      (update-vals first)
-                      (update-vals (fn [x] (dissoc x :id))))}}
+  :quarto           ^:replace {}}}

deps.edn

@@ -12,13 +12,12 @@
   clj-fuzzy/clj-fuzzy                         {:mvn/version "0.4.1"}
   clj-thamil/clj-thamil                       {:mvn/version "0.2.0"}
   org.scicloj/clay                            {:git/url "https://github.com/scicloj/clay"
-                                               :git/sha "38f98c645072503a4d0099552aee0f55d48e06ef"}
+                                               :git/sha "ab441fe6b82826e55bf277338f5676eb7b785bcc"}
   org.eclipse.elk/org.eclipse.elk.core        {:mvn/version "0.10.0"}
   org.eclipse.elk/org.eclipse.elk.graph       {:mvn/version "0.10.0"}
   org.eclipse.elk/org.eclipse.elk.graph.json  {:mvn/version "0.10.0"}
   org.eclipse.elk/org.eclipse.elk.alg.common  {:mvn/version "0.10.0"}
-  org.eclipse.elk/org.eclipse.elk.alg.layered {:mvn/version "0.10.0"}
-  org.slf4j/slf4j-simple                      {:mvn/version "2.0.17"}}
+  org.eclipse.elk/org.eclipse.elk.alg.layered {:mvn/version "0.10.0"}}
 
  :aliases
  {;; Build the site with `clojure -M:clay -a [:markdown]`

site/.gitignore

@@ -0,0 +1 @@
+/.quarto/

src/civitas/authors.clj

@@ -2,7 +2,7 @@
 ^{:clay {:title "Authors"
          :quarto {:type :page}}}
 (ns civitas.authors
-  (:require [civitas.explorer.db :as db]
+  (:require [civitas.db :as db]
             [scicloj.kindly.v4.kind :as kind]))
 
 ;; You belong here!

src/civitas/explorer/db.clj src/civitas/db.cljsrc/civitas/explorer/db.clj renamed to src/civitas/db.clj

@@ -1,22 +1,18 @@
 ^{:clay {:quarto {:draft true}}}
-(ns civitas.explorer.db
+(ns civitas.db
   (:require [clojure.edn :as edn]
             [clojure.pprint :as pprint]
             [clojure.walk :as walk]
             [tablecloth.api :as tc]
             [clj-yaml.core :as yaml]))
 
-(walk/postwalk
-  (fn [x]
-    (cond (map? x) (into {} x)
-          (seq? x) (into [] x)
-          :else x))
-  (yaml/parse-string (slurp "site/_quarto.yml")))
-
-;; TODO: it might be more convenient to use Quarto to gather the metadata
-;; ```
-;; quarto list --to json
-;; ```
+(defn quarto []
+  (walk/postwalk
+    (fn [x]
+      (cond (map? x) (into {} x)
+            (seq? x) (into [] x)
+            :else x))
+    (yaml/parse-string (slurp "site/_quarto.yml"))))
 
 (def db-file "site/db.edn")
 
@@ -28,13 +24,6 @@
 
 (def db (atom (slurp-edn db-file)))
 
-;; TODO: what if the front matter doesn't match existing?
-
-(defn set-notebooks [notebooks]
-  (->> {:notebook notebooks}
-       (reset! db)
-       (spit-edn db-file)))
-
 (defn index-by
   "Return a map where a key is (f item) and a value is item."
   [f coll]
@@ -44,18 +33,31 @@
         (assoc! ret (f x) x))
       (transient {}) coll)))
 
+(defn author-replacements
+  "Creates a map of author and affiliation keys to their full definition"
+  []
+  (-> (mapcat @db [:author :affiliation])
+      (->> (index-by :id))
+      (update-vals #(dissoc % :id))))
+
+(defn expand-authors
+  "Hook for Clay to update ns metadata configuration"
+  [config]
+  (update config :quarto #(walk/prewalk-replace (author-replacements) %)))
+
+;; TODO: what if the front matter doesn't match existing?
+
+(defn set-notebooks [notebooks]
+  (->> {:notebook notebooks}
+       (reset! db)
+       (spit-edn db-file)))
+
 (defn notebooks-ds []
   (tc/dataset (:notebook @db)))
 
 (defn notebooks []
   (:notebook @db))
 
-(defn authors []
-  (tc/dataset (:author @db)))
-
-(defn topic-ds []
-  (tc/dataset (:topic @db)))
-
 (defn topics []
   (:topic @db))
 

src/civitas/explorer.clj

@@ -4,7 +4,7 @@
                   :format {:html {:page-layout :full}}}}}
 (ns civitas.explorer
   (:require [scicloj.kindly.v4.kind :as kind]
-            [civitas.explorer.db :as db]
+            [civitas.db :as db]
             [civitas.explorer.geometry :as geom]
             [civitas.explorer.svg :as svg]))
 

src/civitas/explorer/layout.clj

@@ -2,7 +2,7 @@
 (ns civitas.explorer.layout
   (:require [hiccup.core :as hiccup]
             [scicloj.kindly.v4.kind :as kind]
-            [civitas.explorer.db :as db]
+            [civitas.db :as db]
             [civitas.explorer.geometry :as geom]
             [civitas.explorer.svg :as svg]))
 

src/civitas/explorer/metadata.clj

@@ -87,6 +87,11 @@
     (println "Front-matter warning:" md-file)
     (run! println ws)))
 
+;; TODO: it might be more convenient to use Quarto to gather the metadata
+;; ```
+;; quarto list --to json
+;; ```
+
 (defn find-mds [site-dir]
   (map str (fs/glob site-dir "**.qmd")))