0.9.2 Add :middleware-wrapper-fn option to inject middleware

README.md

@@ -199,6 +199,7 @@ as a map (preferred) or as an arbitrary number of inline key / value pairs (lega
 * `:home` - the _"section.item"_ pair used for the / URL, defaults to `:default-section` and `:default-item` values.
 * `:json-config` - specify formatting information for Cheshire's JSON `generate-string`, used in `render-json` (`:date-format`, `:ex`, `:key-fn`, etc).
 * `:middleware-default-fn` - an optional function that will be applied to Ring's site defaults; note that by default we do **not** enable the XSRF Anti-Forgery middleware that is normally part of the site defaults since that requires session scope and client knowledge which is not appropriate for many uses of FW/1. Specify `#(assoc-in % [:security :anti-forgery] true)` here to opt into XSRF Anti-Forgery (you'll probably also want to change the `:session :store` from the in-memory default unless you have just a single server instance).
+* `:middleware-wrapper-fn` - an optional function that will be applied as the outermost piece of middleware, wrapping all of Ring's defaults (and the JSON parameters middleware).
 * `:options-access-control` - specify what an `OPTIONS` request should return (`:origin`, `:headers`, `:credentials`, `:max-age`).
 * `:password` - specify a password for the application reload URL flag, default `"secret"` - see also `:reload`.
 * `:reload` - specify an `rc` key for the application reload URL flag, default `:reload` - see also `:password`.

resources/fw1.version

@@ -1 +1 @@
-0.9.1
+0.9.2

src/framework/one.clj

@@ -451,15 +451,17 @@
 (defn- default-middleware
   "The default Ring middleware we apply in FW/1. Returns a single
   composed piece of middleware. We start with Ring's site defaults
-  and the fn passed in may modify those defaults."
-  [modifier-fn]
+  and the modifier-fn passed in may modify those defaults. Then we
+  wrapper the handler in one last optional piece of middleware."
+  [modifier-fn wrapper-fn]
   (fn [handler]
     (-> handler
         (ring-md/wrap-defaults (-> ring-md/site-defaults
                                         ; you have to explicitly opt in to this:
                                    (assoc-in [:security :anti-forgery] false)
                                    modifier-fn))
-        (ring-json/wrap-json-params))))
+        (ring-json/wrap-json-params)
+        (wrapper-fn))))
 
 (def ^:private default-options-access-control
   {:origin      "*"
@@ -479,6 +481,8 @@
                   [(:default-section options) (:default-item options)])
                                         ; can modify site-defaults
          :middleware (default-middleware (or (:middleware-default-fn options)
+                                             identity)
+                                         (or (:middleware-wrapper-fn options)
                                              identity))
          :options-access-control (merge default-options-access-control
                                         (:options-access-control options))))