Merge remote-tracking branch 'r0man/fix-json-auto'

Author: dakrone

src/clj_http/client.clj

@@ -243,16 +243,16 @@
 (defmethod coerce-response-body :json [req resp]
   (coerce-json-body req resp true))
 
-(defmethod coerce-response-body :json-string-keys [_ resp]
-  (coerce-json-body resp false))
+(defmethod coerce-response-body :json-string-keys [req resp]
+  (coerce-json-body req resp false))
 
 (defmethod coerce-response-body :clojure [_ {:keys [body] :as resp}]
   (if edn-enabled?
     (assoc resp :body (parse-edn (String. #^"[B" body "UTF-8")))
     (binding [*read-eval* false]
       (assoc resp :body (read-string (String. #^"[B" body "UTF-8"))))))
 
-(defmethod coerce-response-body :auto [_ {:keys [body coerce status] :as resp}]
+(defmethod coerce-response-body :auto [req {:keys [body coerce status] :as resp}]
   (assoc resp
     :body
     (let [typestring (get-in resp [:headers "content-type"])]
@@ -276,8 +276,8 @@
             json-enabled?)
        (if-let [charset (second (re-find #"charset=(.*)"
                                          (str typestring)))]
-         (coerce-json-body resp true charset)
-         (coerce-json-body resp true "UTF-8"))
+         (:body (coerce-json-body req resp true charset))
+         (:body (coerce-json-body req resp true "UTF-8")))
 
        :else
        (String. #^"[B" body "UTF-8")))))

test/clj_http/test/core.clj

@@ -30,7 +30,7 @@
     {:status 200 :body "{:foo \"bar\" :baz #=(+ 1 1)}"
      :headers {"content-type" "application/clojure"}}
     [:get "/json"]
-    {:status 200 :body "{\"foo\":\"bar\"}"}
+    {:status 200 :body "{\"foo\":\"bar\"}" :headers {"content-type" "application/json"}}
     [:get "/json-bad"]
     {:status 400 :body "{\"foo\":\"bar\"}"}
     [:get "/redirect"]
@@ -303,6 +303,7 @@
   (let [resp (client/get (localhost "/json") {:as :json})
         resp-str (client/get (localhost "/json")
                              {:as :json :coerce :exceptional})
+        resp-auto (client/get (localhost "/json") {:as :auto})
         bad-resp (client/get (localhost "/json-bad")
                              {:throw-exceptions false :as :json})
         bad-resp-json (client/get (localhost "/json-bad")
@@ -311,8 +312,13 @@
         bad-resp-json2 (client/get (localhost "/json-bad")
                                    {:throw-exceptions false :as :json
                                     :coerce :unexceptional})]
-    (is (= 200 (:status resp) (:status resp-str)))
-    (is (= {:foo "bar"} (:body resp)))
+    (is (= 200
+           (:status resp)
+           (:status resp-str)
+           (:status resp-auto)))
+    (is (= {:foo "bar"}
+           (:body resp)
+           (:body resp-auto)))
     (is (= "{\"foo\":\"bar\"}" (:body resp-str)))
     (is (= 400
            (:status bad-resp)