remove all traces of lamina

ciste · Feb 7, 2015 · a214647 · a214647
1 parent 362205c
commit a214647
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/project.clj b/project.clj
@@ -11,9 +11,6 @@
                  [compojure "1.3.1"]
                  [enlive "1.1.5"]
                  [inflections "0.9.13" :exclusions [commons-codec]]
-                 [io.aleph/dirigiste "0.1.0-alpha6"]
-                 [lamina "0.5.6"]
-                 [manifold "0.1.0-beta9"]
                  [org.clojure/clojure "1.6.0"]
                  [org.clojure/core.incubator "0.1.3"]
                  [org.clojure/data.json "0.2.5"]

diff --git a/src/ciste/core.clj b/src/ciste/core.clj
@@ -11,8 +11,8 @@ Actions are simply functions. An Action can take any number of
 parameters and should return any logically true value if the action
 succeeded."
   (:require [ciste.config :refer [config describe-config]]
-            [clojure.tools.logging :as log]
-            [lamina.core :as l]))
+            [ciste.event :refer [notify]]
+            [clojure.tools.logging :as log]))
 
 (describe-config [:print :actions]
   :boolean
@@ -29,12 +29,6 @@ Rebind this var to set the format for the current request."}
   *format* nil)
 (defonce ^:dynamic *serialization* nil)
 
-(defonce ^:dynamic *actions*
-  (l/channel*
-   :description "All invoked actions"
-   :permanent? true
-   :grounded? true))
-
 (defmacro with-serialization
   "Set the bindings for the serialization."
   [serialization & body]
@@ -54,8 +48,6 @@ Rebind this var to set the format for the current request."}
     (with-format ~format
       ~@body)))
 
-(defrecord ActionEvent [action args records])
-
 (defmacro defaction
   "Define an Action.
 
@@ -73,8 +65,10 @@ the action channel, it logs it's execution."
          (let [~args params#
                action# (var ~name)
                records# (do ~@forms)]
-           (l/enqueue *actions*
-                      (ActionEvent. action# params# records#))
+           (notify ::action-run
+                   {:action action#
+                    :args params#
+                    :records records#})
            records#))
        (alter-meta! (var ~name) assoc :arglists '(~args))
        (var ~name))))