fixup: style

Author: calvis

src/compojure/core.clj

@@ -134,11 +134,17 @@
 (defn- wrap-route-info [handler route-info]
   (fn
     ([request]
-     (handler (assoc request :compojure/route route-info
-                     :compojure/full-route (str (:compojure/context request) (second route-info)))))
+     (let [full-route (str (:compojure/context request) (second route-info))]
+       (handler (assoc request
+                       :compojure/route route-info
+                       :compojure/full-route full-route))))
     ([request respond raise]
-     (handler (assoc request :compojure/route route-info
-                     :compojure/full-route (str (:compojure/context request) (second route-info)) respond raise)))))
+     (let [full-route (str (:compojure/context request) (second route-info))]
+       (handler (assoc request
+                       :compojure/route route-info
+                       :compojure/full-route full-route)
+                respond
+                raise)))))
 
 (defn- wrap-route-matches [handler method path]
   (fn
@@ -264,32 +270,34 @@
       (-> request
           (assoc-route-params (decode-route-params params))
           (assoc :path-info (if (= subpath "") "/" subpath)
-                 :context   (remove-suffix uri subpath)
-                 :compojure/context (str (:compojure/context request) context-route))))))
+                 :context   (remove-suffix uri subpath))
+          (update :compojure/context (fn [ctx] (str ctx context-route)))))))
 
 (defn- context-route [route]
   (let [re-context {:__path-info #"|/.*"}]
-        (cond
-          (string? route)
-          (with-meta (clout/route-compile (str route ":__path-info") re-context) {:context-route route})
-          (and (vector? route) (literal? route))
-          (with-meta (clout/route-compile
-                      (str (first route) ":__path-info")
-                      (merge (apply hash-map (rest route)) re-context)) {:context-route (first route)})
-          (vector? route)
-          `(let [uncompiled-route# ~(first route)]
-             (with-meta
-               (clout/route-compile
-                (str uncompiled-route# ":__path-info")
-                ~(merge (apply hash-map (rest route)) re-context))
-               {:context-route uncompiled-route#}))
-          :else
-          `(let [path# ~route]
-             (with-meta
-                (clout/route-compile (str path# ":__path-info") ~re-context)
-               (if (string? path#)
-                 {:context-route path#}
-                 {}))))))
+    (cond
+      (string? route)
+      (with-meta (clout/route-compile (str route ":__path-info") re-context)
+        {:context-route route})
+      (and (vector? route) (literal? route))
+      (with-meta (clout/route-compile
+                   (str (first route) ":__path-info")
+                   (merge (apply hash-map (rest route)) re-context))
+        {:context-route (first route)})
+      (vector? route)
+      `(let [route# ~(first route)]
+         (with-meta
+           (clout/route-compile
+             (str route# ":__path-info")
+             ~(merge (apply hash-map (rest route)) re-context))
+           {:context-route route#}))
+      :else
+      `(let [route# ~route]
+         (with-meta
+           (clout/route-compile (str route# ":__path-info") ~re-context)
+           (if (string? route#)
+             {:context-route route#}
+             {}))))))
 
 (defn ^:no-doc make-context [route make-handler]
   (letfn [(handler