Merge pull request #215 from metosin/mw-execution-order

Small fixes for 1.0.0-RC1

Author: ikitommi

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 1.0.0-SNAPSHOT
+## 1.0.0-RC1 (1.2.2016)
 
 * Move from compile-time to runtime route resolution.
   * Most of the internal macro magic has been vaporized
@@ -53,6 +53,7 @@ Previously required a `type => matcher` map. Options are checked against `type =
 descriptive error is thrown when api is created with the old options format.
 
 * **BREAKING**: Renamed `middlewares` to `middleware` and `:middlewares` key (restructuring) to `:middleware`
+  * will break at macro-expansion time with helpful exception
 
 * **BREAKING**: Middleware must be defined as data: both middleware macro and :middleware restructuring
 take a vector of middleware containing either
@@ -67,6 +68,9 @@ take a vector of middleware containing either
 
 * **BREAKING**: (Custom restructuring handlers only) `:parameters` key used by `restructure-param`
 has been renamed to `:swagger`.
+  * will break at macro-expansion time with helpful exception
+
+* **BREAKING**: `compojure.api.legacy` namespace has been removed.
 
 ### Migration guide
 
@@ -82,6 +86,10 @@ https://github.com/metosin/compojure-api/wiki/Migration-Guide-to-1.0.0
 
 * `swagger-docs` and `swagger-ui` are now functions instead of macros.
 
+* Coercer cache is now at api-level with 10000 entries.
+
+* Code generated from restructured route macros is much cleaner now
+
 * Coercion is on by default for standalone (apiless) endpoints.
 
 ```clj

README.md

@@ -32,7 +32,7 @@ Stuff on top of [Compojure](https://github.com/weavejester/compojure) for making
             [ring.util.http-response :refer :all]))
 
 (defapi app
-  (GET* "/hello" []
+  (GET "/hello" []
     :query-params [name :- String]
     (ok {:message (str "Hello, " name)})))
 ```
@@ -57,12 +57,12 @@ Stuff on top of [Compojure](https://github.com/weavejester/compojure) for making
     {:info {:title "My Swagger API"
             :description "Compojure Api example"}
      :tags [{:name "api", :description "sample api"}]})
-  (context* "/api" []
+  (context "/api" []
     :tags ["api"]
-    (GET* "/hello" []
+    (GET "/hello" []
       :query-params [name :- String]
       (ok {:message (str "Hello, " name)}))
-    (POST* "/pizza" []
+    (POST "/pizza" []
       :return Pizza
       :body [pizza Pizza]
       :summary "echoes a pizza"

project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/compojure-api "1.0.0-SNAPSHOT"
+(defproject metosin/compojure-api "1.0.0-RC1"
   :description "Compojure Api"
   :url "https://github.com/metosin/compojure-api"
   :license {:name "Eclipse Public License"
@@ -22,6 +22,7 @@
                        :source-paths ["examples/src"]
                        :dependencies [[org.clojure/clojure "1.7.0"]
                                       [http-kit "2.1.19"]
+                                      [reloaded.repl "0.2.1"]
                                       [com.stuartsierra/component "0.3.1"]]}
              :dev {:repl-options {:init-ns user}
                    :plugins [[lein-clojars "0.9.1"]

src/compojure/api/api.clj

@@ -4,8 +4,8 @@
             [compojure.api.middleware :as middleware]
             [compojure.api.routes :as routes]
             [compojure.api.common :as common]
-            [clojure.tools.macro :as macro]
-            [ring.swagger.common :as rsc]))
+            [ring.swagger.common :as rsc]
+            [compojure.api.meta :as meta]))
 
 (def api-defaults
   (merge
@@ -46,6 +46,7 @@
         api-handler (-> handler
                         (middleware/api-middleware (dissoc options :api))
                         (middleware/wrap-options {:paths paths
+                                                  :coercer (meta/memoized-coercer)
                                                   :lookup lookup}))]
     (routes/create nil nil {} [handler] api-handler)))
 

src/compojure/api/core.clj

@@ -30,7 +30,10 @@
   [bindings & body]
   `(let ~bindings (routes ~@body)))
 
-(defn undocumented [& handlers]
+(defn undocumented
+  "Routes without route-documentation. Can be used to wrap routes,
+  not satisfying compojure.api.routes/Routing -protocol."
+  [& handlers]
   (let [handlers (keep identity handlers)]
     (routes/create nil nil {} nil (ring-handler handlers))))
 
@@ -41,12 +44,11 @@
   do not match the request uri. Be careful with middlewares that
   have side-effects."
   [middleware & body]
-  (let [routes? (> (count body) 1)]
-    `(let [body# ~(if routes? `(routes ~@body) (first body))
-           wrap-mw# (mw/compose-middleware ~middleware)]
-       (routes/create "" nil {} [body#] (wrap-mw# body#)))))
+  `(let [body# (routes ~@body)
+         wrap-mw# (mw/compose-middleware ~middleware)]
+     (routes/create nil nil {} [body#] (wrap-mw# body#))))
 
-(defmacro context [& args] (meta/restructure nil      args {:routes #'routes}))
+(defmacro context [& args] (meta/restructure nil      args {:context? true}))
 
 (defmacro GET     [& args] (meta/restructure :get     args nil))
 (defmacro ANY     [& args] (meta/restructure nil      args nil))

src/compojure/api/exception.clj

@@ -1,6 +1,6 @@
 (ns compojure.api.exception
-  (:require [ring.util.http-response :refer [internal-server-error bad-request]]
-            [clojure.walk :refer [postwalk]]
+  (:require [ring.util.http-response :as response]
+            [clojure.walk :as walk]
             [compojure.api.impl.logging :as logging]
             [schema.utils :as su])
   (:import [schema.utils ValidationError NamedError]
@@ -18,44 +18,44 @@
   expose secret details."
   [^Exception e data req]
   (logging/log! :error e (.getMessage e))
-  (internal-server-error {:type "unknown-exception"
-                          :class (.getName (.getClass e))}))
+  (response/internal-server-error {:type "unknown-exception"
+                                   :class (.getName (.getClass e))}))
 
 (defn stringify-error
   "Stringifies symbols and validation errors in Schema error, keeping the structure intact."
   [error]
-  (postwalk
-   (fn [x]
-     (cond
-       (instance? ValidationError x) (str (su/validation-error-explain x))
-       (instance? NamedError x) (str (su/named-error-explain x))
-       :else x))
-   error))
+  (walk/postwalk
+    (fn [x]
+      (cond
+        (instance? ValidationError x) (str (su/validation-error-explain x))
+        (instance? NamedError x) (str (su/named-error-explain x))
+        :else x))
+    error))
 
 (defn response-validation-handler
   "Creates error response based on Schema error."
   [e data req]
-  (internal-server-error {:errors (stringify-error (su/error-val data))}))
+  (response/internal-server-error {:errors (stringify-error (su/error-val data))}))
 
 (defn request-validation-handler
   "Creates error response based on Schema error."
   [e data req]
-  (bad-request {:errors (stringify-error (su/error-val data))}))
+  (response/bad-request {:errors (stringify-error (su/error-val data))}))
 
 (defn schema-error-handler
   "Creates error response based on Schema error."
   [e data req]
   ; FIXME: Why error is not wrapped to ErrorContainer here?
-  (bad-request {:errors (stringify-error (:error data))}))
+  (response/bad-request {:errors (stringify-error (:error data))}))
 
 (defn request-parsing-handler
   [^Exception ex data req]
   (let [cause (.getCause ex)]
-    (bad-request {:type (cond
-                          (instance? JsonParseException cause) "json-parse-exception"
-                          (instance? ParserException cause) "yaml-parse-exception"
-                          :else "parse-exception")
-                  :message (.getMessage cause)})))
+    (response/bad-request {:type (cond
+                                   (instance? JsonParseException cause) "json-parse-exception"
+                                   (instance? ParserException cause) "yaml-parse-exception"
+                                   :else "parse-exception")
+                           :message (.getMessage cause)})))
 
 ;;
 ;; Logging