From 707fb9f22de69d53900472b3e088fd108e8a614b Mon Sep 17 00:00:00 2001
From: Nicholas Kariniemi <nicholas.kariniemi@gmail.com>
Date: Sun, 18 Aug 2013 14:13:55 +0300
Subject: [PATCH] Minor database refactoring

---
 spec/clj/grub/db_spec.clj  | 11 ++++++++---
 src/clj/grub/core.clj      |  3 +--
 src/clj/grub/db.clj        |  4 +++-
 src/clj/grub/websocket.clj |  3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/spec/clj/grub/db_spec.clj b/spec/clj/grub/db_spec.clj
index 4fb6362..0545ddb 100644
--- a/spec/clj/grub/db_spec.clj
+++ b/spec/clj/grub/db_spec.clj
@@ -7,12 +7,17 @@
 (def test-db "grub-test")
 
 (defn short-delay []
-  (<!! (timeout 1)))
+  (<!! (timeout 20)))
+
+(defn get-test-grub []
+  {:_id (str "grub" (rand-int 10000))
+   :grub (str "testtext" (rand-int 1000))
+   :completed ([true false] (rand-int 1))})
 
 (describe 
  "grub.db"
- (before (do (db/connect-and-handle-events test-db)
-             (mc/drop db/grub-collection)))
+ (before-all (db/connect-and-handle-events test-db))
+ (before (mc/drop db/grub-collection))
  (describe "Create grub" 
            (it "should create a grub when a create event comes"
                (let [test-grub "testgrub"
diff --git a/src/clj/grub/core.clj b/src/clj/grub/core.clj
index 05ec523..604b43e 100644
--- a/src/clj/grub/core.clj
+++ b/src/clj/grub/core.clj
@@ -38,8 +38,7 @@
 (defn -main [& args]
   (let [port 3000]
     (println (str "Starting server on localhost:" port))
-    (db/connect-and-handle-events)
     (defonce stop-server (httpkit/run-server app {:port port}))
     (when (some #(= % "integration") args)
-      (integration-test/run)
+      (integration-test/run port)
       (stop-server))))
diff --git a/src/clj/grub/db.clj b/src/clj/grub/db.clj
index 56a226c..0f427c8 100644
--- a/src/clj/grub/db.clj
+++ b/src/clj/grub/db.clj
@@ -15,7 +15,7 @@
   (let [grub (-> event
                  (select-keys [:_id :grub])
                  (assoc :completed false))]
-    (when (and (:_id grub) (:grub grub)) (mc/insert grub-collection grub))))
+    (mc/insert grub-collection grub)))
 
 (defmethod handle-event :complete [event]
   (mc/update grub-collection 
@@ -57,3 +57,5 @@
      (handle-incoming-events!)
      (m/connect!)
      (m/set-db! (m/get-db db-name))))
+
+(connect-and-handle-events default-db)
diff --git a/src/clj/grub/websocket.clj b/src/clj/grub/websocket.clj
index 2d6dc7e..7a6ed71 100644
--- a/src/clj/grub/websocket.clj
+++ b/src/clj/grub/websocket.clj
@@ -37,7 +37,8 @@
 (defn handle-incoming-events []
   (let [[incoming incoming'] (fan-out incoming-events 2)]
     (do-chan! push-event-to-others incoming)
-    (go-loop (let [event (<! incoming')]
+    (go-loop (let [event (<! incoming')
+                   parsed-event (dissoc event :ws-channel)]
                (>! @db/incoming-events event)))))
 
 (defn websocket-handler [request]