added schema-validation to swagger-validation, wrapped Options argume…

…nts into Maybe
metosin · Apr 26, 2015 · 6c0ada0 · 6c0ada0
1 parent abdc2b9
commit 6c0ada0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ring/swagger/swagger2.clj b/src/ring/swagger/swagger2.clj
@@ -201,8 +201,8 @@
 
    :default-response-description-fn ((constantly \"\")) - a fn to generate
    default response descriptions from http status code"
-  ([swagger :- Swagger] (swagger-json swagger {}))
-  ([swagger :- Swagger, options :- Options]
+  ([swagger :- Swagger] (swagger-json swagger nil))
+  ([swagger :- Swagger, options :- (s/maybe Options)]
     (let [options (merge option-defaults options)]
       (binding [jsons/*ignore-missing-mappings* (true? (:ignore-missing-mappings? options))
                 *options* options]

diff --git a/test/ring/swagger/swagger2_test.clj b/test/ring/swagger/swagger2_test.clj
@@ -21,7 +21,8 @@
 (s/defschema NotFound {:message s/Str})
 
 (defn validate-swagger-json [swagger & [options]]
-  (v/validate (swagger-json swagger options)))
+  (s/with-fn-validation
+    (v/validate (swagger-json swagger options))))
 
 (defn validate [swagger & [options]]
   (if-let [input-errors (s/check Swagger swagger)]