test decompression

Author: mmcgrana

src/clj_http/util.clj

@@ -2,8 +2,9 @@
   "Helper functions for the HTTP client."
   (:import (java.net URLEncoder))
   (:import (org.apache.commons.codec.binary Base64))
-  (:import (java.io ByteArrayInputStream))
-  (:import (java.util.zip InflaterInputStream GZIPInputStream))
+  (:import (java.io ByteArrayInputStream ByteArrayOutputStream))
+  (:import (java.util.zip InflaterInputStream DeflaterInputStream
+                          GZIPInputStream GZIPOutputStream))
   (:import (org.apache.commons.io IOUtils)))
 
 (defn url-encode
@@ -21,7 +22,21 @@
   [b]
   (IOUtils/toByteArray (GZIPInputStream. (ByteArrayInputStream. b))))
 
+(defn gzip
+  "Returns a gzip'd version of the given byte array."
+  [b]
+  (let [baos (ByteArrayOutputStream.)
+        gos  (GZIPOutputStream. baos)]
+    (IOUtils/copy (ByteArrayInputStream. b) gos)
+    (.close gos)
+    (.toByteArray baos)))
+
 (defn inflate
   "Returns a zlib inflate'd version of the given byte array."
   [b]
   (IOUtils/toByteArray (InflaterInputStream. (ByteArrayInputStream. b))))
+
+(defn deflate
+  "Returns a deflate'd version of the given byte array."
+  [b]
+  (IOUtils/toByteArray (DeflaterInputStream. (ByteArrayInputStream. b))))

test/clj_http/client_test.clj

@@ -1,6 +1,7 @@
 (ns clj-http.client-test
   (:use clojure.test)
-  (:require [clj-http.client :as client]))
+  (:require [clj-http.client :as client])
+  (:require [clj-http.util :as util]))
 
 (def base-req
   {:scheme "http"
@@ -72,6 +73,26 @@
     (is (= 200 (:status resp)))))
 
 
+(deftest apply-on-compressed
+  (let [client (fn [req] {:body (util/gzip (.getBytes "foofoofoo" "UTF-8"))
+                          :headers {"Content-Encoding" "gzip"}})
+        c-client (client/wrap-decompression client)
+        resp (c-client {})]
+    (is (= "foofoofoo" (String. (:body resp) "UTF-8")))))
+
+(deftest apply-on-deflated
+  (let [client (fn [req] {:body (util/deflate (.getBytes "barbarbar" "UTF-8"))
+                          :headers {"Content-Encoding" "deflate"}})
+        c-client (client/wrap-decompression client)
+        resp (c-client {})]
+    (is (= "barbarbar" (String. (:body resp) "UTF-8")))))
+
+(deftest pass-on-non-compressed
+  (let [c-client (client/wrap-decompression (fn [req] {:body "foo"}))
+        resp (c-client {:uri "/foo"})]
+    (is (= "foo" (:body resp)))))
+
+
 (deftest apply-on-accept
   (is-applied client/wrap-accept
     {:accept :json}