Made ns bindings amalloy-friendly.

src/foreclojure/config.clj

@@ -1,6 +1,6 @@
 (ns foreclojure.config
-  (:use [clojure.java.io :only (file)]
-        [clj-config.core :only (safely read-config)]))
+  (:use [clojure.java.io :only [file]]
+        [clj-config.core :only [safely read-config]]))
 
 (def config-file (file (System/getProperty "user.dir") "config.clj"))
 

src/foreclojure/core.clj

@@ -2,25 +2,25 @@
   (:require [compojure.route            :as   route]
             [compojure.handler          :as   handler]
             [sandbar.stateful-session   :as   session])
-  (:use     [compojure.core             :only (defroutes GET)]
-            [foreclojure.static         :only (static-routes welcome-page)]
-            [foreclojure.problems       :only (problems-routes)]
-            [foreclojure.login          :only (login-routes)]
-            [foreclojure.register       :only (register-routes)]
-            [foreclojure.golf           :only (golf-routes)]
-            [foreclojure.ring           :only (resources wrap-strip-trailing-slash wrap-url-as-file)]
-            [foreclojure.users          :only (users-routes)]
-            [foreclojure.config         :only (config)]
-            [foreclojure.social         :only (social-routes)]
-            [foreclojure.version        :only (version-routes)]
-            [foreclojure.graphs         :only (graph-routes)]
-            [foreclojure.mongo          :only (prepare-mongo)]
-            [foreclojure.utils          :only (wrap-uri-binding)]
-            [ring.adapter.jetty         :only (run-jetty)]
-            [ring.middleware.reload     :only (wrap-reload)]
-            [ring.middleware.stacktrace :only (wrap-stacktrace)]
-            [ring.middleware.file-info  :only (wrap-file-info)]
-            [ring.middleware.gzip       :only (wrap-gzip)]))
+  (:use     [compojure.core             :only [defroutes GET]]
+            [foreclojure.static         :only [static-routes welcome-page]]
+            [foreclojure.problems       :only [problems-routes]]
+            [foreclojure.login          :only [login-routes]]
+            [foreclojure.register       :only [register-routes]]
+            [foreclojure.golf           :only [golf-routes]]
+            [foreclojure.ring           :only [resources wrap-strip-trailing-slash wrap-url-as-file]]
+            [foreclojure.users          :only [users-routes]]
+            [foreclojure.config         :only [config]]
+            [foreclojure.social         :only [social-routes]]
+            [foreclojure.version        :only [version-routes]]
+            [foreclojure.graphs         :only [graph-routes]]
+            [foreclojure.mongo          :only [prepare-mongo]]
+            [foreclojure.utils          :only [wrap-uri-binding]]
+            [ring.adapter.jetty         :only [run-jetty]]
+            [ring.middleware.reload     :only [wrap-reload]]
+            [ring.middleware.stacktrace :only [wrap-stacktrace]]
+            [ring.middleware.file-info  :only [wrap-file-info]]
+            [ring.middleware.gzip       :only [wrap-gzip]]))
 
 (def *block-server* false)
 

src/foreclojure/feeds.clj

@@ -1,5 +1,5 @@
 (ns foreclojure.feeds
-  (:use [clojure.contrib.prxml :only (prxml)]))
+  (:use [clojure.contrib.prxml :only [prxml]]))
 
 (defn escape [x]
   (str "<![CDATA[" x "]>"))

src/foreclojure/golf.clj

@@ -1,12 +1,12 @@
 (ns foreclojure.golf
   (:require [ring.util.response       :as   response]
             [sandbar.stateful-session :as   session])
-  (:use     [hiccup.form-helpers      :only (form-to check-box)]
-            [hiccup.page-helpers      :only (link-to)]
-            [foreclojure.utils        :only (def-page with-user)]
-            [foreclojure.users        :only (golfer?)]
-            [compojure.core           :only (defroutes POST GET)]
-            [somnium.congomongo       :only (update!)]))
+  (:use     [hiccup.form-helpers      :only [form-to check-box]]
+            [hiccup.page-helpers      :only [link-to]]
+            [foreclojure.utils        :only [def-page with-user]]
+            [foreclojure.users        :only [golfer?]]
+            [compojure.core           :only [defroutes POST GET]]
+            [somnium.congomongo       :only [update!]]))
 
 (def-page golfer-page []
   "Your preferences have been saved.")

src/foreclojure/graphs.clj

@@ -4,11 +4,11 @@
             [incanter.stats          :as   stats])
   (:import  [java.io                 ByteArrayInputStream
                                      ByteArrayOutputStream])
-  (:use     [compojure.core          :only (defroutes GET)]
-            [foreclojure.utils       :only (from-mongo)]
-            [somnium.congomongo      :only (fetch-one)]
-            [amalloy.utils.transform :only (with-adjustments)]
-            [amalloy.utils.reorder   :only (reorder)]))
+  (:use     [compojure.core          :only [defroutes GET]]
+            [foreclojure.utils       :only [from-mongo]]
+            [somnium.congomongo      :only [fetch-one]]
+            [amalloy.utils.transform :only [with-adjustments]]
+            [amalloy.utils.reorder   :only [reorder]]))
 
 (defn un-group
   "Turn a compact set of [data-point num-repetitions] pairs into a

src/foreclojure/login.clj

@@ -2,13 +2,13 @@
   (:require [sandbar.stateful-session :as   session]
             [ring.util.response       :as   response])
   (:import  [org.jasypt.util.password StrongPasswordEncryptor])
-  (:use     [hiccup.form-helpers      :only (form-to label text-field password-field)]
-            [foreclojure.utils        :only (def-page from-mongo flash-error flash-msg with-user form-row assuming send-email login-url)]
-            [compojure.core           :only (defroutes GET POST)]
-            [amalloy.utils            :only (rand-in-range keywordize)]
-            [clojail.core             :only (thunk-timeout)]
-            [clojure.stacktrace       :only (print-cause-trace)]
-            [somnium.congomongo       :only (update! fetch-one)]))
+  (:use     [hiccup.form-helpers      :only [form-to label text-field password-field]]
+            [foreclojure.utils        :only [def-page from-mongo flash-error flash-msg with-user form-row assuming send-email login-url]]
+            [compojure.core           :only [defroutes GET POST]]
+            [amalloy.utils            :only [rand-in-range keywordize]]
+            [clojail.core             :only [thunk-timeout]]
+            [clojure.stacktrace       :only [print-cause-trace]]
+            [somnium.congomongo       :only [update! fetch-one]]))
 
 (def-page my-login-page [location]
   (when location

src/foreclojure/mongo.clj

@@ -1,9 +1,9 @@
 (ns foreclojure.mongo
   (:use somnium.congomongo
-        [foreclojure.data-set :only (load-problems)]
-        [foreclojure.config   :only (config)]
-        [foreclojure.problems :only (total-solved get-problem-list)]
-        [foreclojure.users    :only (get-users)]))
+        [foreclojure.data-set :only [load-problems]]
+        [foreclojure.config   :only [config]]
+        [foreclojure.problems :only [total-solved get-problem-list]]
+        [foreclojure.users    :only [get-users]]))
 
 (defn connect-to-db []
   (let [{:keys [db-user db-pwd db-host]} config]

src/foreclojure/problems.clj

@@ -3,22 +3,22 @@
             [sandbar.stateful-session :as      session]
             [clojure.string           :as      s]
             [ring.util.response       :as      response])
-  (:use     [foreclojure.utils        :only    (from-mongo get-user get-solved login-link *url* flash-msg flash-error def-page row-class approver? can-submit? send-email)]
-            [foreclojure.social       :only    (tweet-link gist!)]
-            [foreclojure.feeds        :only    (create-feed)]
-            [foreclojure.users        :only    (golfer? get-user-id)]
-            [foreclojure.solutions    :only    (save-solution get-solution)]
-            [clojail.core             :exclude (safe-read)]
-            [clojail.testers          :only    (secure-tester)]
-            [somnium.congomongo       :only    (update! fetch-one fetch fetch-and-modify destroy!)]
-            [hiccup.form-helpers      :only    (form-to text-area hidden-field label text-field drop-down)]
-            [hiccup.page-helpers      :only    (link-to)]
-            [hiccup.core              :only    (html)]
-            [amalloy.utils.debug      :only    (?)]
-            [amalloy.utils.reorder    :only    (reorder)]
-            [amalloy.utils            :only    (defcomp)]
-            [compojure.core           :only    (defroutes GET POST)]
-            [clojure.contrib.json     :only    (json-str)]))
+  (:use     [foreclojure.utils        :only    [from-mongo get-user get-solved login-link *url* flash-msg flash-error def-page row-class approver? can-submit? send-email]]
+            [foreclojure.social       :only    [tweet-link gist!]]
+            [foreclojure.feeds        :only    [create-feed]]
+            [foreclojure.users        :only    [golfer? get-user-id]]
+            [foreclojure.solutions    :only    [save-solution get-solution]]
+            [clojail.core             :exclude [safe-read]]
+            [clojail.testers          :only    [secure-tester]]
+            [somnium.congomongo       :only    [update! fetch-one fetch fetch-and-modify destroy!]]
+            [hiccup.form-helpers      :only    [form-to text-area hidden-field label text-field drop-down]]
+            [hiccup.page-helpers      :only    [link-to]]
+            [hiccup.core              :only    [html]]
+            [amalloy.utils.debug      :only    [?]]
+            [amalloy.utils.reorder    :only    [reorder]]
+            [amalloy.utils            :only    [defcomp]]
+            [compojure.core           :only    [defroutes GET POST]]
+            [clojure.contrib.json     :only    [json-str]]))
 
 (def total-solved (agent 0))
 

src/foreclojure/register.clj

@@ -2,10 +2,10 @@
   (:require [sandbar.stateful-session :as   session]
             [ring.util.response       :as   response])
   (:import  [org.jasypt.util.password StrongPasswordEncryptor])
-  (:use     [hiccup.form-helpers      :only (form-to text-field password-field)]
-            [compojure.core           :only (defroutes GET POST)]
-            [foreclojure.utils        :only (def-page form-row assuming flash-error)]
-            [somnium.congomongo       :only (insert! fetch-one)]))
+  (:use     [hiccup.form-helpers      :only [form-to text-field password-field]]
+            [compojure.core           :only [defroutes GET POST]]
+            [foreclojure.utils        :only [def-page form-row assuming flash-error]]
+            [somnium.congomongo       :only [insert! fetch-one]]))
 
 (def-page register-page []
   [:div.error (session/flash-get :error)]

src/foreclojure/ring.clj

@@ -2,8 +2,8 @@
   (:require [clojure.java.io    :as   io]
             [clojure.string     :as   s])
   (:import  [java.net           URL])
-  (:use     [compojure.core     :only (GET)]
-            [ring.util.response :only (response)]))
+  (:use     [compojure.core     :only [GET]]
+            [ring.util.response :only [response]]))
 
 ;; copied from compojure.route, modified to use File instead of Stream
 (defn resources

src/foreclojure/social.clj

@@ -2,10 +2,10 @@
   (:require [clj-github.gists         :as   gist]
             [sandbar.stateful-session :as   session])
   (:import  [java.net                 URLEncoder])
-  (:use     [foreclojure.utils        :only (def-page)]
-            [compojure.core           :only (defroutes GET)]
-            [hiccup.page-helpers      :only (link-to)]
-            [somnium.congomongo       :only (fetch-one)]))
+  (:use     [foreclojure.utils        :only [def-page]]
+            [compojure.core           :only [defroutes GET]]
+            [hiccup.page-helpers      :only [link-to]]
+            [somnium.congomongo       :only [fetch-one]]))
 
 (defn throttled
   "Create a version of a function which 'refuses' to be called too

src/foreclojure/solutions.clj

@@ -1,7 +1,7 @@
 (ns foreclojure.solutions
   (:require [clojure.string      :as   s])
-  (:use     [somnium.congomongo  :only (fetch-one update!)]
-            [amalloy.utils.debug :only (?)]))
+  (:use     [somnium.congomongo  :only [fetch-one update!]]
+            [amalloy.utils.debug :only [?]]))
 
 (defn get-solution [user-id problem-id]
   (:code (fetch-one :solutions

src/foreclojure/static.clj

@@ -1,7 +1,7 @@
 (ns foreclojure.static
-  (:use [compojure.core       :only (defroutes GET)]
-        [foreclojure.problems :only (total-solved)]
-        [foreclojure.utils    :only (def-page)]))
+  (:use [compojure.core       :only [defroutes GET]]
+        [foreclojure.problems :only [total-solved]]
+        [foreclojure.utils    :only [def-page]]))
 
 (def df
   (let [df (java.text.DecimalFormat.)

src/foreclojure/users.clj

@@ -1,9 +1,9 @@
 (ns foreclojure.users
-  (:use [foreclojure.utils   :only (from-mongo def-page row-class)]
-        [foreclojure.config  :only (config)]
-        [somnium.congomongo  :only (fetch-one fetch)]
-        [compojure.core      :only (defroutes GET)]
-        [hiccup.page-helpers :only (link-to)]))
+  (:use [foreclojure.utils   :only [from-mongo def-page row-class]]
+        [foreclojure.config  :only [config]]
+        [somnium.congomongo  :only [fetch-one fetch]]
+        [compojure.core      :only [defroutes GET]]
+        [hiccup.page-helpers :only [link-to]]))
 
 (def golfer-tags (into [:contributor]
                        (when (:golfing-active config)

src/foreclojure/utils.clj

@@ -4,12 +4,12 @@
             [clojure.walk             :as   walk])
   (:import  [java.net                 URLEncoder]
             [org.apache.commons.mail  HtmlEmail])
-  (:use     [hiccup.core              :only (html)]
-            [hiccup.page-helpers      :only (doctype include-css javascript-tag link-to include-js)]
-            [hiccup.form-helpers      :only (label)]
-            [amalloy.utils.transform  :only (transform-if)]
-            [somnium.congomongo       :only (fetch-one)]
-            [foreclojure.config       :only (config)]))
+  (:use     [hiccup.core              :only [html]]
+            [hiccup.page-helpers      :only [doctype include-css javascript-tag link-to include-js]]
+            [hiccup.form-helpers      :only [label]]
+            [amalloy.utils.transform  :only [transform-if]]
+            [somnium.congomongo       :only [fetch-one]]
+            [foreclojure.config       :only [config]]))
 
 (def ^{:dynamic true} *url* nil)
 

src/foreclojure/version.clj

@@ -1,7 +1,7 @@
 (ns foreclojure.version
-  (:use [foreclojure.utils  :only (def-page)]
-        [compojure.core     :only (defroutes GET)]
-        [clojure.java.shell :only (sh)]))
+  (:use [foreclojure.utils  :only [def-page]]
+        [compojure.core     :only [defroutes GET]]
+        [clojure.java.shell :only [sh]]))
 
 ;; fetch this at load time rather than on demand, so that it's accurate even
 ;; if someone checks out a different revision to poke at without restarting