Code review of ring-devel: bug fixes and more consistent style.

@@ -1,6 +1,7 @@
 (ns ring.handler.dump
+  "Reflect Ring requests into responses for debugging."
   (:use (clj-html core helpers)
-        (clojure.contrib [def :only (defvar-)])
+        [clojure.contrib.def :only (defvar-)]
         ring.util.response)
   (:require (clojure [set :as set])))
 

@@ -1,9 +1,10 @@
 (ns ring.middleware.lint
-  (:use (clojure set)
-        (clojure.contrib except))
+  "Lint Ring requests and responses."
+  (:use [clojure.contrib.except :only (throwf)])
+  (:require [clojure.set :as set])
   (:import (java.io File InputStream)))
 
-(defn lint
+(defn- lint
   "Asserts that spec applied to val returns logical truth, otherwise raises
   an exception with a message produced by applying format to the message-pattern
   argument and a printing of an invalid val."
@@ -18,16 +19,16 @@
           message (pr-str val) (.getMessage e))
         (throw e)))))
 
-(defn lint-namespacing
+(defn- lint-namespacing
   "Asserts that all keys are namespaces other than those included in a 
   specified set of permitted unnamspaced keys"
   [map map-name no-namespace-needed]
-  (let [must-namespace (difference (set (keys map)) no-namespace-needed)]
+  (let [must-namespace (set/difference (set (keys map)) no-namespace-needed)]
     (doseq [k must-namespace]
       (lint k namespace
         (format "user keys in the %s map must be namespaced" map-name)))))
 
-(defn check-req
+(defn- check-req
   "Validates the request, throwing an exception on violations of the spec"
   [req]
   (lint req map?
@@ -73,7 +74,7 @@
       :request-method :content-type :content-length :character-encoding
       :headers :body}))
 
-(defn check-resp
+(defn- check-resp
   "Validates the response, throwing an exception on violations of the spec"
   [resp]
   (lint resp map?

@@ -1,4 +1,5 @@
-(ns ring.middleware.reload)
+(ns ring.middleware.reload
+  "Reload namespaces before requests.")
 
 (defn wrap-reload
   "Wrap an app such that before a request is passed to the app, each namespace
@@ -10,4 +11,4 @@
   (fn [req]
     (doseq [ns-sym reloadables]
       (require ns-sym :reload))
-    (app req)))
+    (app req)))

@@ -1,4 +1,5 @@
 (ns ring.middleware.stacktrace
+  "Catch exceptions and render a stacktrace for debugging."
   (:use (clj-html core helpers)
         (clj-stacktrace core repl)
         (clojure.contrib [def :only (defvar-)])
@@ -32,7 +33,7 @@
           [:div#content
             [:h3.info (h (str e))]
             [:table.trace [:tbody
-              (map elem-partial (:trace-elems excp))]]]]]]))
+              (map elem-partial (:trace-elems e))]]]]]]))
 
 (defn- html-ex-response [e]
   (-> (response (html-ex-view e))
@@ -46,7 +47,7 @@
   (let [accept (get-in req [:headers "accept"])]
     (if (and accept (re-find #"^text/javascript" accept))
       (js-ex-response e)
-      (html-ex-reponse e))))
+      (html-ex-response e))))
 
 (defn wrap-stacktrace
   "Wrap an app such that exceptions thrown within the wrapped app are caught 
@@ -67,7 +68,6 @@ version: 2.6.0
 */
 html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}del,ins{text-decoration:none;}
 
-
 h3.info {
  font-size: 1.6em; 
  margin-left: 1em;

@@ -1,6 +1,6 @@
 (ns ring.middleware.lint-test
-  (:use (clojure test)
-        (ring.middleware lint))
+  (:use clojure.test
+        ring.middleware.lint)
   (:import (java.io File InputStream ByteArrayInputStream)))
 
 (defn str-input-stream

@@ -1,6 +1,6 @@
 (ns ring.middleware.reload-test
-  (:use (clojure test)
-        (ring.middleware reload)))
+  (:use clojure.test
+        ring.middleware.reload))
 
 (def app
   (wrap-reload (constantly :response) '(ring.middleware.reload)))

@@ -1,6 +1,6 @@
 (ns ring.middleware.stacktrace-test
-  (:use (clojure test)
-        (ring.middleware stacktrace)))
+  (:use clojure.test
+        ring.middleware.stacktrace))
 
 (def app (wrap-stacktrace #(throw (Exception. "fail"))))