Skip to content

Commit

Permalink
run latest slamhound 1.3.0 (requires clojure 1.4.x)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Vaughan committed Dec 28, 2012
1 parent 73a156e commit 339ab5b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 26 deletions.
12 changes: 5 additions & 7 deletions src/mametipsum/core.clj
@@ -1,11 +1,9 @@
(ns mametipsum.core
(:use
[ring.adapter.jetty :only [run-jetty]])
(:require
[compojure.handler :as handler]
[mametipsum.db :as db]
[mametipsum.middleware :as middleware]
[mametipsum.routes :as routes]))
(:require [compojure.handler :as handler]
[compojure.handler :as middleware]
[mametipsum.db :as db]
[mametipsum.routes :as routes]
[ring.adapter.jetty :refer [run-jetty]]))

(def app
(do
Expand Down
7 changes: 3 additions & 4 deletions src/mametipsum/db.clj
@@ -1,8 +1,7 @@
(ns mametipsum.db
(:use
[clojure.java.io :only (resource)]
[clojure.string :only (split)]
[mametipsum.scripts :as scripts]))
(:require [mametipsum.scripts :as scripts]
[clojure.java.io :refer [resource]]
[clojure.string :refer [split]]))

(defn- remove-directories [list]
(remove #(.isDirectory %) list))
Expand Down
5 changes: 2 additions & 3 deletions src/mametipsum/middleware.clj
@@ -1,7 +1,6 @@
(ns mametipsum.middleware
(:use
[ring.middleware.format-params :only (wrap-restful-params)]
[ring.middleware.format-response :only (wrap-restful-response)]))
(:require [ring.middleware.format-params :refer [wrap-restful-params]]
[ring.middleware.format-response :refer [wrap-restful-response]]))

;; http://stackoverflow.com/a/7730478/162963
(defn- wrap-dir-index [handler]
Expand Down
8 changes: 3 additions & 5 deletions src/mametipsum/routes.clj
@@ -1,9 +1,7 @@
(ns mametipsum.routes
(:require
[compojure.route :as route]
[mametipsum.views :as views])
(:use
[compojure.core]))
(:require [compojure.route :as route]
[mametipsum.views :as views]
[compojure.core :refer [DELETE GET POST PUT defroutes]]))

(defroutes main-routes
(GET "/mametipsum" []
Expand Down
3 changes: 1 addition & 2 deletions src/mametipsum/views.clj
@@ -1,6 +1,5 @@
(ns mametipsum.views
(:require
[mametipsum.scripts :as scripts]))
(:require [mametipsum.scripts :as scripts]))

(defn- with-handle [f & args]
(let [handle (scripts/get-handle)]
Expand Down
8 changes: 3 additions & 5 deletions test/mametipsum/test/core.clj
@@ -1,9 +1,7 @@
(ns mametipsum.test.core
(:require
[mametipsum.db :as db]
[mametipsum.scripts :as scripts])
(:use
[clojure.test]))
(:require [mametipsum.db :as db]
[mametipsum.scripts :as scripts]
[clojure.test :refer [deftest is use-fixtures]]))

(defn db-fixture [f]
(db/init)
Expand Down

0 comments on commit 339ab5b

Please sign in to comment.