Added with-system macro

markbastian · Apr 29, 2020 · 8dc1593 · 8dc1593
1 parent c808ca9
commit 8dc1593
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/partsbin/datahike/api/core.clj b/src/partsbin/datahike/api/core.clj
@@ -7,7 +7,7 @@
 (derive ::connection ::datahike/connection)
 
 (comment
-  (require '[partsbin.system :refer [create-system]])
+  (require '[partsbin.system :refer [with-system]])
 
   (def schema
     [{:db/ident       :name
@@ -19,20 +19,14 @@
                              :initial-tx      schema}
                ::connection {:db-config (ig/ref ::database)}})
 
-  (create-system config)
-
-  (start)
-
-  (let [{conn ::connection} (system)]
+  (with-system
+    [{conn ::connection} config]
     (d/transact conn [{:name "Mark"}
-                      {:name "Becky"}]))
-
-  (let [{conn ::connection} (system)]
+                      {:name "Becky"}])
     (d/q
       '[:find [?n ...]
         :in $
         :where
         [_ :name ?n]]
       @conn))
-
-  (stop))
+  )
diff --git a/src/partsbin/system.clj b/src/partsbin/system.clj
@@ -21,3 +21,10 @@
        (alter-var-root ~'#'*system* (fn [~'s] (when ~'s (do (ig/halt! ~'s) nil)))))
 
      (defn ~'restart [] (do (~'stop) (~'start)))))
+
+(defmacro with-system [[bindings config] & body]
+  `(let [system# (ig/init ~config)
+         ~bindings system#]
+     (try
+       ~@body
+       (finally (ig/halt! system#)))))