Merge branch 'verify' of github.com:TechEmpower/FrameworkBenchmarks into verify

http-kit/hello/project.clj

@@ -2,7 +2,7 @@
   :description "JSON/Database tests"
   :url "http://example.com/FIXME"
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [compojure "1.1.5"]
+                 [compojure "1.1.6"]
                  [ring/ring-json "0.2.0"]
                  [org.clojure/tools.cli "0.2.1"]
                  [http-kit/dbcp "0.1.0"]
@@ -12,4 +12,4 @@
   :main hello.handler
   :aot [hello.handler]
   :uberjar-name "http-kit-standalone.jar"
-  :profiles {:dev {:dependencies [[ring-mock "0.1.3"]]}})
+  :profiles {:dev {:dependencies [[ring-mock "0.1.5"]]}})

http-kit/hello/src/hello/handler.clj

@@ -23,16 +23,17 @@
 
 ;; Run the specified number of queries, return the results
 (defn run-queries [queries]
-  (vec ; Return as a vector
    (flatten ; Make it a list of maps
     (take
      queries ; Number of queries to run
-     (repeatedly get-world)))))
+     (repeatedly get-world))))
 
 ;; Define route handlers
 (defroutes app-routes
   (GET "/http-kit/" [] "Hello, World!")
   (GET "/http-kit/json" [] (response {:message "Hello, World!"}))
+  (GET "/http-kit/db" []
+       (response (first (run-queries 1))))
   (GET "/http-kit/db/:queries" [queries]
        (response (run-queries (Integer/parseInt queries))))
   (route/not-found "Not Found"))

luminus/hello/project.clj

@@ -6,7 +6,7 @@
    [lib-noir "0.6.6"]
    [compojure "1.1.6"]
    [ring-server "0.3.1"]
-   [selmer "0.4.0"]
+   [selmer "0.5.6"]
    [com.taoensso/timbre "1.6.0"]
    [com.postspectacular/rotor "0.1.0"]
    [com.taoensso/tower "1.5.1"]