Made urlencoded-form? function public in ring.util.request

weavejester · weavejester · commit 45950697c753 · 2014-05-19T04:12:18.000+01:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -3,6 +3,7 @@
 * Deprecated :content-type, :content-length and :character-encoding keys in SPEC
 * Removed deprecated keys from source code
 * Added content-length, content-type and character-encoding to ring.util.request
+* Added urlencoded-form? to ring.util.request
 * Fixed 304 not-modified responses to set content-length header
 * Added options to wrap-cookies to specify encoder and decoder functions
 * Fixed wrap-head middleware when response is nil
diff --git a/ring-core/src/ring/middleware/params.clj b/ring-core/src/ring/middleware/params.clj
@@ -18,18 +18,12 @@
         {:query-params params, :params params})
       {:query-params {}, :params {}})))
 
-(defn- urlencoded-form?
-  "Does a request have a urlencoded form?"
-  [request]
-  (if-let [^String type (req/content-type request)]
-    (.startsWith type "application/x-www-form-urlencoded")))
-
 (defn assoc-form-params
   "Parse and assoc parameters from the request body with the request."
   {:added "1.2"}
   [request encoding]
   (merge-with merge request
-    (if-let [body (and (urlencoded-form? request) (:body request))]
+    (if-let [body (and (req/urlencoded-form? request) (:body request))]
       (let [params (parse-params (slurp body :encoding encoding) encoding)]
         {:form-params params, :params params})
       {:form-params {}, :params {}})))
diff --git a/ring-core/src/ring/util/request.clj b/ring-core/src/ring/util/request.clj
@@ -37,6 +37,13 @@
   (if-let [type (get-in request [:headers "content-type"])]
     (second (re-find charset-pattern type))))
 
+(defn urlencoded-form?
+  "True if a request contains a urlencoded form in the body."
+  {:added "1.3"}
+  [request]
+  (if-let [^String type (content-type request)]
+    (.startsWith type "application/x-www-form-urlencoded")))
+
 (defmulti body-string
   "Return the request body as a string."
   {:arglists '([request]), :added "1.2"}
diff --git a/ring-core/test/ring/util/test/request.clj b/ring-core/test/ring/util/test/request.clj
@@ -45,6 +45,16 @@
     (is (= (character-encoding {:headers {"content-type" "text/plain;charset=UTF-8"}})
            "UTF-8"))))
 
+(deftest test-urlencoded-form?
+  (testing "urlencoded form"
+    (is (urlencoded-form? {:headers {"content-type" "application/x-www-form-urlencoded"}}))
+    (is (urlencoded-form?
+         {:headers {"content-type" "application/x-www-form-urlencoded; charset=UTF-8"}})))
+  (testing "other content type"
+    (is (not (urlencoded-form? {:headers {"content-type" "application/json"}}))))
+  (testing "no content type"
+    (is (not (urlencoded-form? {:headers {}})))))
+
 (deftest test-body-string
   (testing "nil body"
     (is (= (body-string {:body nil}) nil)))
