Merge pull request #1 from hlship/master

Capture recent changes to apply to real repo

Author: hlship

dev-resources/clojure_game_geek/test_utils.clj

@@ -0,0 +1,23 @@
+(ns clojure-game-geek.test-utils
+  (:require
+    [clojure.walk :as walk])
+  (:import
+    (clojure.lang IPersistentMap)))
+
+(defn simplify
+  "Converts all ordered maps nested within the map into standard hash maps, and
+   sequences into vectors, which makes for easier constants in the tests, and eliminates ordering problems."
+  [m]
+  (walk/postwalk
+    (fn [node]
+      (cond
+        (instance? IPersistentMap node)
+        (into {} node)
+
+        (seq? node)
+        (vec node)
+
+        :else
+        node))
+    m))
+

dev-resources/user.clj

@@ -3,26 +3,8 @@
     [com.walmartlabs.lacinia :as lacinia]
     [clojure.java.browse :refer [browse-url]]
     [clojure-game-geek.system :as system]
-    [clojure.walk :as walk]
-    [com.stuartsierra.component :as component])
-  (:import (clojure.lang IPersistentMap)))
-
-(defn simplify
-  "Converts all ordered maps nested within the map into standard hash maps, and
-   sequences into vectors, which makes for easier constants in the tests, and eliminates ordering problems."
-  [m]
-  (walk/postwalk
-    (fn [node]
-      (cond
-        (instance? IPersistentMap node)
-        (into {} node)
-
-        (seq? node)
-        (vec node)
-
-        :else
-        node))
-    m))
+    [clojure-game-geek.test-utils :refer [simplify]]
+    [com.stuartsierra.component :as component]))
 
 (defonce system nil)
 

project.clj

@@ -3,10 +3,10 @@
   :url "https://github.com/walmartlabs/clojure-game-geek"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/core.async "0.3.443"]
+  :dependencies [[org.clojure/clojure "1.9.0"]
+                 [org.clojure/core.async "0.4.474"]
                  [com.stuartsierra/component "0.3.2"]
-                 [com.walmartlabs/lacinia "0.25.0"]
-                 [com.walmartlabs/lacinia-pedestal "0.7.0"]
+                 [com.walmartlabs/lacinia "0.30.0"]
+                 [com.walmartlabs/lacinia-pedestal "0.10.0"]
                  [alaisi/postgres.async "0.8.0"]
-                 [io.aviso/logging "0.2.0"]])
+                 [io.aviso/logging "0.3.1"]])

src/clojure_game_geek/db.clj

@@ -1,6 +1,5 @@
 (ns clojure-game-geek.db
   (:require
-    [clojure.java.io :as io]
     [com.stuartsierra.component :as component]
     [postgres.async :refer [open-db query! close-db!]]
     [clojure.core.async :refer [<!!]]))
@@ -27,6 +26,8 @@
   {:db (map->ClojureGameGeekDb {})})
 
 (defn ^:private take!
+  "Takes a value from a channel and rethrows an exception if that is the
+  conveyed value."
   [ch]
   (let [v (<!! ch)]
     (if (instance? Throwable v)

src/clojure_game_geek/server.clj

@@ -3,13 +3,14 @@
             [com.walmartlabs.lacinia.pedestal :as lp]
             [io.pedestal.http :as http]))
 
-(defrecord Server [schema-provider server]
+(defrecord Server [schema-provider server port]
 
   component/Lifecycle
   (start [this]
     (assoc this :server (-> schema-provider
                             :schema
-                            (lp/service-map {:graphiql true})
+                            (lp/service-map {:graphiql true
+                                             :port port})
                             http/create-server
                             http/start)))
 
@@ -19,7 +20,7 @@
 
 (defn new-server
   []
-  {:server (component/using (map->Server {})
+  {:server (component/using (map->Server {:port 8888})
                             [:schema-provider])})
 
 

test/clojure_game_geek/system_tests.clj

@@ -0,0 +1,35 @@
+(ns clojure-game-geek.system-tests
+  (:require
+    [clojure.test :refer [deftest is]]
+    [clojure-game-geek.system :as system]
+    [clojure-game-geek.test-utils :refer [simplify]]
+    [com.stuartsierra.component :as component]
+    [com.walmartlabs.lacinia :as lacinia]))
+
+(defn ^:private test-system
+  "Creates a new system suitable for testing, and ensures that
+  the HTTP port won't conflict with a default running system."
+  []
+  (-> (system/new-system)
+      (assoc-in [:server :port] 8989)))
+
+(defn ^:private q
+  "Extracts the compiled schema and executes a query."
+  [system query variables]
+  (-> system
+      (get-in [:schema-provider :schema])
+      (lacinia/execute query variables nil)
+      simplify))
+
+(deftest can-read-board-game
+  (let [system (component/start-system (test-system))
+        results (q system
+                   "{ game_by_id(id: 1234) { name summary min_players max_players play_time }}"
+                   nil)]
+    (is (= {:data {:game_by_id {:max_players 2
+                                :min_players 2
+                                :name "Zertz"
+                                :play_time nil
+                                :summary "Two player abstract with forced moves and shrinking board"}}}
+           results))
+    (component/stop-system system)))