Merge fa57c98 into 35839cd

request.go

@@ -11,7 +11,7 @@ import (
 )
 
 // Version export version
-const Version = "0.6.0"
+const Version = "0.7.0"
 
 // DefaultClient for NewArgs and NewRequest
 var DefaultClient = new(http.Client)

request_test.go

@@ -233,6 +233,23 @@ func TestGzip(t *testing.T) {
 	assert.Equal(t, d.Get("gzipped").MustBool(), true)
 }
 
+func TestDeflate(t *testing.T) {
+	c := new(http.Client)
+	req := NewRequest(c)
+	url := "http://httpbin.org/deflate"
+	resp, _ := req.Get(url)
+	d, _ := resp.Json()
+	t2, _ := resp.Text()
+	c2, _ := resp.Content()
+	defer resp.Body.Close()
+
+	assert.Equal(t, resp.Reason() != "", true)
+	assert.Equal(t, resp.OK(), true)
+	assert.Equal(t, t2 != "", true)
+	assert.Equal(t, c2 != nil, true)
+	assert.Equal(t, d.Get("deflated").MustBool(), true)
+}
+
 func TestBasicAuth(t *testing.T) {
 	c := new(http.Client)
 	req := NewRequest(c)

response.go

@@ -2,6 +2,7 @@ package request
 
 import (
 	"compress/gzip"
+	"compress/zlib"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -34,20 +35,22 @@ func (resp *Response) Content() (b []byte, err error) {
 	var reader io.ReadCloser
 	switch resp.Header.Get("Content-Encoding") {
 	case "gzip":
-		reader, err := gzip.NewReader(resp.Body)
-		if err != nil {
+		if reader, err = gzip.NewReader(resp.Body); err != nil {
+			return nil, err
+		}
+	case "deflate":
+		if reader, err = zlib.NewReader(resp.Body); err != nil {
 			return nil, err
 		}
-		b, err = ioutil.ReadAll(reader)
-		defer reader.Close()
 	default:
 		reader = resp.Body
-		b, err = ioutil.ReadAll(reader)
 	}
 
-	if err != nil {
+	defer reader.Close()
+	if b, err = ioutil.ReadAll(reader); err != nil {
 		return nil, err
 	}
+
 	resp.content = b
 	return b, err
 }