Merge branch 'pr/235'

Author: dakrone

src/clj_http/client.clj

@@ -59,12 +59,22 @@
   (apply (ns-resolve (symbol "crouton.html") (symbol "parse")) args))
 
 (defn ^:dynamic parse-transit
-  "Resolve and apply Transit's JSON/MessagePack parsing."
-  [& args]
+  "Resolve and apply Transit's JSON/MessagePack decoding."
+  [in type & [opts]]
   {:pre [transit-enabled?]}
   (let [reader (ns-resolve 'cognitect.transit 'reader)
         read (ns-resolve 'cognitect.transit 'read)]
-    (read (apply reader args))))
+    (read (reader in type opts))))
+
+(defn ^:dynamic transit-encode
+  "Resolve and apply Transit's JSON/MessagePack encoding."
+  [out type & [opts]]
+  {:pre [transit-enabled?]}
+  (let [output (java.io.ByteArrayOutputStream.)
+        writer (ns-resolve 'cognitect.transit 'writer)
+        write (ns-resolve 'cognitect.transit 'write)]
+    (write (writer output type opts) out)
+    (.toByteArray output)))
 
 (defn ^:dynamic json-encode
   "Resolve and apply cheshire's json encoding dynamically."
@@ -642,13 +652,7 @@
                      :form-params form-params
                      :transit-opts transit-opts
                      :transit-type type})))
-  (let [output (java.io.ByteArrayOutputStream.)
-        writer (ns-resolve 'cognitect.transit 'writer)
-        write (ns-resolve 'cognitect.transit 'write)
-        _ (write (writer output type transit-opts) form-params)
-        bytes (.toByteArray output)]
-    (.reset output)
-    bytes))
+  (transit-encode form-params type transit-opts))
 
 (defmethod coerce-form-params :application/transit+json [req]
   (coerce-transit-form-params :json req))
@@ -701,13 +705,15 @@
 (defn wrap-nested-params
   "Middleware wrapping nested parameters for query strings."
   [client]
-  (fn [{:keys [query-params form-params content-type] :as req}]
-    (if (= :json content-type)
-      (client req)
+  (fn [{:keys [query-params form-params content-type]
+        :as req}]
+    (if (or (nil? content-type)
+            (= content-type :x-www-form-urlencoded))
       (client (reduce
                nest-params
                req
-               [:query-params :form-params])))))
+               [:query-params :form-params]))
+      (client req))))
 
 (defn wrap-url
   "Middleware wrapping request URL parsing."

test/clj_http/test/client.clj

@@ -4,8 +4,11 @@
             [clj-http.conn-mgr :as conn]
             [clj-http.test.core :refer [run-server]]
             [clj-http.util :as util]
+            [clojure.string :as str]
             [clojure.java.io :refer [resource]]
-            [clojure.test :refer :all])
+            [clojure.test :refer :all]
+            [ring.util.codec :refer [form-decode-str]]
+            [ring.middleware.nested-params :refer [parse-nested-keys]])
   (:import (java.net UnknownHostException)
            (java.util Arrays)
            (java.io ByteArrayInputStream)
@@ -19,6 +22,15 @@
 (defn request [req]
   (client/request (merge base-req req)))
 
+(defn parse-form-params [s]
+  (->> (str/split (form-decode-str s) #"&")
+       (map #(str/split % #"="))
+       (map #(vector
+              (map keyword (parse-nested-keys (first %)))
+              (second %)))
+       (reduce (fn [m [ks v]]
+                 (assoc-in m ks v)) {})))
+
 (deftest ^:integration roundtrip
   (run-server)
   ;; roundtrip with scheme as a keyword
@@ -31,7 +43,22 @@
                        :scheme "http"})]
     (is (= 200 (:status resp)))
     (is (= "close" (get-in resp [:headers "connection"])))
-    (is (= "get" (:body resp)))))
+    (is (= "get" (:body resp))))
+  (let [params {:a "1" :b {:c "2"}}]
+    (doseq [[content-type read-fn]
+            [[nil (comp parse-form-params slurp)]
+             [:x-www-form-urlencoded (comp parse-form-params slurp)]
+             [:edn (comp read-string slurp)]
+             [:transit+json #(client/parse-transit % :json)]
+             [:transit+msgpack #(client/parse-transit % :msgpack)]]]
+      (let [resp (request {:uri "/post"
+                           :as :stream
+                           :method :post
+                           :content-type content-type
+                           :form-params params})]
+        (is (= 200 (:status resp)))
+        (is (= "close" (get-in resp [:headers "connection"])))
+        (is (= params (read-fn (:body resp))))))))
 
 (deftest ^:integration nil-input
   (is (thrown-with-msg? Exception #"Host URL cannot be nil"

test/clj_http/test/core.clj

@@ -73,7 +73,7 @@
     [:get "/header"]
     {:status 200 :body (get-in req [:headers "x-my-header"])}
     [:post "/post"]
-    {:status 200 :body (slurp (:body req))}
+    {:status 200 :body (:body req)}
     [:get "/error"]
     {:status 500 :body "o noes"}
     [:get "/timeout"]
@@ -100,7 +100,7 @@
 (defn run-server
   []
   (defonce server
-    (ring/run-jetty handler {:port 18080 :join? false})))
+    (ring/run-jetty #'handler {:port 18080 :join? false})))
 
 (defn localhost [path]
   (str "http://localhost:18080" path))