wip

examples/ring-swagger/project.clj

@@ -2,6 +2,5 @@
   :description "Reitit Ring App with Swagger"
   :dependencies [[org.clojure/clojure "1.9.0"]
                  [ring "1.6.3"]
-                 [metosin/muuntaja "0.5.0"]
                  [metosin/reitit "0.2.0-SNAPSHOT"]]
   :repl-options {:init-ns example.server})

examples/ring-swagger/src/example/server.clj

@@ -5,11 +5,12 @@
             [reitit.ring.coercion :as rrc]
             [reitit.coercion.spec :as spec]
             [reitit.coercion.schema :as schema]
+            [reitit.ring.middleware.alpha.muuntaja :as muuntaja]
+
             [schema.core :refer [Int]]
 
             [ring.adapter.jetty :as jetty]
-            [ring.middleware.params]
+            [ring.middleware.params]))
-            [muuntaja.middleware]))
 
 (def app
   (ring/ring-handler
@@ -58,17 +59,11 @@
                              :body {:total (+ x y)}})}}]]]
 
       {:data {:middleware [ring.middleware.params/wrap-params
-                           muuntaja.middleware/wrap-format
+                           (muuntaja/create-format-middleware)
                            swagger/swagger-feature
                            rrc/coerce-exceptions-middleware
                            rrc/coerce-request-middleware
-                           rrc/coerce-response-middleware]
+                           rrc/coerce-response-middleware]}})
-              :swagger {:produces #{"application/json"
-                                    "application/edn"
-                                    "application/transit+json"}
-                        :consumes #{"application/json"
-                                    "application/edn"
-                                    "application/transit+json"}}}})
     (ring/routes
       (swagger-ui/create-swagger-ui-handler
         {:path "/", :url "/api/swagger.json"})

modules/reitit-middleware/project.clj

@@ -0,0 +1,10 @@
+(defproject metosin/reitit-middleware "0.2.0-SNAPSHOT"
+  :description "Reitit, common middleware bundled"
+  :url "https://github.com/metosin/reitit"
+  :license {:name "Eclipse Public License"
+            :url "http://www.eclipse.org/legal/epl-v10.html"}
+  :plugins [[lein-parent "0.3.2"]]
+  :parent-project {:path "../../project.clj"
+                   :inherit [:deploy-repositories :managed-dependencies]}
+  :dependencies [[metosin/reitit-ring]
+                 [metosin/muuntaja]])

modules/reitit-middleware/src/reitit/ring/middleware/alpha/exception.cljc

@@ -0,0 +1,78 @@
+(ns reitit.ring.middleware.alpha.exception
+  (:require [reitit.coercion :as coercion]
+            [reitit.ring :as ring]))
+
+(defn- super-classes [^Class k]
+  (loop [sk (.getSuperclass k), ks []]
+    (if-not (= sk Object)
+      (recur (.getSuperclass sk) (conj ks sk))
+      ks)))
+
+(defn- call-error-handler [default-handler handlers error request]
+  (let [{:keys [type] :as data} (ex-data error)
+        ex-class (class error)
+        error-handler (or (get handlers type)
+                          (get handlers ex-class)
+                          (some
+                            (partial get handlers)
+                            (super-classes ex-class))
+                          default-handler)]
+    (error-handler error data request)))
+
+(defn default-handler [^Exception e _ _]
+  {:status 500
+   :body {:type "exception"
+          :class (.getName (.getClass e))}})
+
+(defn coercion-handler [status]
+  (fn [_ data _]
+    {:status status
+     :body (coercion/encode-error data)}))
+
+(defn http-response-handler
+  "reads response from ex-data :response"
+  [_ {:keys [response]} _]
+  response)
+
+(defn request-parsing-handler [_ {:keys [format]} _]
+  {:status 400
+   :headers {"Content-Type" "text/plain"}
+   :body (str "Malformed " format " request.")})
+
+;;
+;; public api
+;;
+
+(def default-handlers
+  {::default default-handler
+   ::ring/response http-response-handler
+   :muuntaja/decode request-parsing-handler
+   ::coercion/request-coercion (coercion-handler 400)
+   ::coercion/response-coercion (coercion-handler 500)})
+
+(defn create-exceptions-middleware
+  "Catches all exceptions and looks up a exception handler:
+  1) `:type` of ex-data
+  2) Class of Exception
+  3) Super Classes of Exception
+  4) The ::default handler"
+  ([]
+    (create-exceptions-middleware default-handlers))
+  ([{:keys [handlers] :or {handlers default-handlers}}]
+   (let [default-handler (get handlers ::default default-handler)
+         on-exception (fn [e request respond raise]
+                        (try
+                          (respond (call-error-handler default-handler handlers e request))
+                          (catch Exception e
+                            (raise e))))]
+     (fn
+       ([request]
+        (try
+          (handler request)
+          (catch Throwable e
+            (on-exception e request identity #(throw %)))))
+       ([request respond raise]
+        (try
+          (handler request respond (fn [e] (on-exception e request respond raise)))
+          (catch Throwable e
+            (on-exception e request respond raise))))))))

modules/reitit-middleware/src/reitit/ring/middleware/alpha/multipart.cljc

@@ -0,0 +1,34 @@
+(ns reitit.ring.middleware.alpha.multipart
+  (:require [reitit.coercion :as coercion]
+            [ring.middleware.multipart-params :as multipart-params]))
+
+(defn multipart-params
+  "Creates a Middleware to handle the multipart params, based on
+  ring.middleware.multipart-params, taking same options. Mounts only
+  if endpoint has `[:parameters :multipart]` defined. Publishes coerced
+  parameters into `[:parameters :multipart]` under request."
+  ([]
+    (multipart-params nil))
+  ([options]
+   (let [parameter-coercion {:multipart (coercion/->ParameterCoercion :multipart-params :string true true)}
+         coerced-request (fn [request coercers]
+                           (if-let [coerced (if coercers (coercion/coerce-request coercers request))]
+                             (update request :parameters merge coerced)
+                             request))]
+     {:name ::multipart
+      :compile (fn [{:keys [parameters coercion]} opts]
+                 (if-let [multipart (:multipart parameters)]
+                   (let [opts (assoc opts ::coercion/parameter-coercion parameter-coercion)
+                         coercers (if multipart (coercion/request-coercers coercion parameters opts))]
+                     (fn [handler]
+                       (fn
+                         ([request]
+                          (-> request
+                              (multipart-params/multipart-params-request options)
+                              (coerced-request coercers)
+                              (handler)))
+                         ([request respond raise]
+                          (-> request
+                              (multipart-params/multipart-params-request options)
+                              (coerced-request coercers)
+                              (handler respond raise))))))))})))

modules/reitit-middleware/src/reitit/ring/middleware/alpha/muuntaja.cljc

@@ -0,0 +1,17 @@
+(ns reitit.ring.middleware.alpha.muuntaja
+  (:require [muuntaja.core :as m]
+            [muuntaja.middleware]))
+
+(defn create-format-middleware
+  ([]
+   (create-format-middleware m/default-options))
+  ([options]
+   {:name ::formats
+    :compile (fn [{:keys [muuntaja]} _]
+               (let [options (or muuntaja options)]
+                 (if options
+                   (let [m (m/create options)]
+                     {:data {:swagger {:produces (m/encodes m)
+                                       :consumes (m/encodes m)}}
+                      :wrap (fn [handler]
+                              (muuntaja.middleware/wrap-format handler m))}))))}))

modules/reitit/project.clj

@@ -8,6 +8,7 @@
                    :inherit [:deploy-repositories :managed-dependencies]}
   :dependencies [[metosin/reitit-core]
                  [metosin/reitit-ring]
+                 [metosin/reitit-middleware]
                  [metosin/reitit-spec]
                  [metosin/reitit-schema]
                  [metosin/reitit-swagger]

project.clj

@@ -12,17 +12,18 @@
   :managed-dependencies [[metosin/reitit "0.2.0-SNAPSHOT"]
                          [metosin/reitit-core "0.2.0-SNAPSHOT"]
                          [metosin/reitit-ring "0.2.0-SNAPSHOT"]
+                         [metosin/reitit-middleware "0.2.0-SNAPSHOT"]
                          [metosin/reitit-spec "0.2.0-SNAPSHOT"]
                          [metosin/reitit-schema "0.2.0-SNAPSHOT"]
                          [metosin/reitit-swagger "0.2.0-SNAPSHOT"]
                          [metosin/reitit-swagger-ui "0.2.0-SNAPSHOT"]
                          [metosin/reitit-frontend "0.2.0-SNAPSHOT"]
-
                          [meta-merge "1.0.0"]
                          [ring/ring-core "1.6.3"]
                          [metosin/spec-tools "0.7.1"]
                          [metosin/schema-tools "0.10.3"]
                          [metosin/ring-swagger-ui "2.2.10"]
+                         [metosin/muuntaja "0.6.0-alpha1"]
                          [metosin/jsonista "0.2.1"]]
 
   :plugins [[jonase/eastwood "0.2.6"]
@@ -38,6 +39,7 @@
                    :source-paths ["modules/reitit/src"
                                   "modules/reitit-core/src"
                                   "modules/reitit-ring/src"
+                                  "modules/reitit-middleware/src"
                                   "modules/reitit-spec/src"
                                   "modules/reitit-schema/src"
                                   "modules/reitit-swagger/src"
@@ -55,7 +57,7 @@
 
                                   [ring "1.6.3"]
                                   [ikitommi/immutant-web "3.0.0-alpha1"]
-                                  [metosin/muuntaja "0.6.0-SNAPSHOT"]
+                                  [metosin/muuntaja "0.6.0-alpha1"]
                                   [metosin/ring-swagger-ui "2.2.10"]
                                   [metosin/jsonista "0.2.1"]
 

scripts/lein-modules

@@ -3,6 +3,6 @@
 set -e
 
 # Modules
-for ext in reitit-core reitit-ring reitit-spec reitit-schema reitit-swagger reitit-swagger-ui reitit-frontend reitit; do
+for ext in reitit-core reitit-ring reitit-middleware reitit-spec reitit-schema reitit-swagger reitit-swagger-ui reitit-frontend reitit; do
   cd modules/$ext; lein "$@"; cd ../..;
 done

test/clj/reitit/ring/middleware/muuntaja_test.clj

@@ -0,0 +1,18 @@
+(ns reitit.ring.middleware.muuntaja-test
+  (:require [clojure.test :refer [deftest testing is]]
+            [reitit.ring :as ring]
+            [reitit.ring.middleware.alpha.muuntaja :as muuntaja]
+            [muuntaja.core :as m]))
+
+(deftest muuntaja-test
+  (let [data {:kikka "kukka"}
+        app (ring/ring-handler
+              (ring/router
+                ["/ping" {:get (constantly {:status 200, :body data})}]
+                {:data {:middleware [(muuntaja/create-format-middleware)]}}))]
+    (is (= data (->> {:request-method :get, :uri "/ping"}
+                     (app)
+                     :body
+                     (m/decode m/instance "application/json"))))))
+
+;; TODO: test swagger!