whitespace and other cosmetic changes

src/robotwar/handler.clj

@@ -15,15 +15,13 @@
                 :*GAME-SECONDS-PER-TICK* *GAME-SECONDS-PER-TICK*})
 
 (defn parse-program-names
-  "takes a string parameter from the browser and returns a seqence
+  "takes a string parameter from the browser and returns a sequence
   of program keys"
   [programs-str]
   (map keyword (split programs-str #"[,\s]\s*")))
 
-(defn get-programs 
-  "gets a sequence of programs from the source-code 
-  repository. some may be repeats. discards failed matches.
-  cuts off after five."
+(defn get-programs
+  "gets a sequence of five programs from the source-code repository."
   [program-keys]
   (take 5 (filter identity (map #(% source-programs/programs) program-keys))))
 
@@ -37,15 +35,15 @@
         programs (get-programs program-names)
         world (world/init-world programs)
         combined-worlds (world/build-combined-worlds world)
-        worlds-for-browser (browser/worlds-for-browser combined-worlds)] 
+        worlds-for-browser (browser/worlds-for-browser combined-worlds)]
     {:games (merge games {next-id worlds-for-browser})
-     :next-id (inc next-id)})) 
+     :next-id (inc next-id)}))
 
-(defn take-drop-send 
-  "takes the games-store atom, a game id, and a number n, 
+(defn take-drop-send
+  "takes the games-store atom, a game id, and a number n,
   and returns a collection of the first n items from that game,
   then drops those items from the game in the atom's state."
-  [games-store id n] 
+  [games-store id n]
   (let [coll (get-in @games-store [:games id])]
     (swap! games-store #(assoc-in % [:games id] (drop n coll)))
     (take n coll)))
@@ -81,4 +79,4 @@
       (wrap-file "public")
       (wrap-json-response)
       (wrap-json-body)
-      (wrap-params)))
+      (wrap-params)))

test/robotwar/handler_test.clj

@@ -2,18 +2,18 @@
   (:require [clojure.test :refer :all]
             [robotwar.handler :refer :all]
             [ring.mock.request :as mock]))
-  
-  
+
+
 (deftest app-handler-test
   (testing "program-names"
     (let [response (app (mock/request :get "/program-names"))]
       (is (= (:status response) 200))
       (is (.contains (:body response) "mover"))))
-  
+
   (testing "not-found route"
     (let [response (app (mock/request :get "/invalid"))]
       (is (= (:status response) 404))))
-  
+
   (testing "files"
     (let [response (app (mock/request :get "/index.html"))]
       (is (= (:status response) 200))
@@ -21,13 +21,13 @@
     (let [response (app (mock/request :get "/js/main.js"))]
       (is (= (:status response) 200))
       (is (.contains (slurp (:body response)) "function"))))
-  
+
   (testing "worlds route"
     (let [response (app (mock/request :get "/worlds/0/99"))]
       (is (= (:status response) 200))
       (is (.contains (:body response) "["))))
-  
+
   (testing "init route"
     (let [response (app (mock/request :get "/init?programs=mover"))]
       (is (= (:status response) 200))
-      (is (.contains (:body response) "game-info")))))
+      (is (.contains (:body response) "game-info")))))