Set xxx ex (#339)

* 支持绑定多个对象

* 使用低版本有的api

Author: guonaihong

README.md

@@ -67,6 +67,7 @@ gout 是go写的http 客户端，为提高工作效率而开发
 		- [protobuf](#protobuf)
         - [callback](#callback)
 		- [get *http.Response](#get-response)
+		- [multiple binding functions](#multiple-binding-functions)
 	- [Set request timeout](#Set-request-timeout)
     - [proxy](#proxy)
 	- [socks5](#socks5)
@@ -1118,6 +1119,31 @@ func main() {
 	}
 }
 
+```
+### multiple binding functions
+支持绑定多个对象
+```go
+var responseStruct struct {
+	Name string `json:"name"`
+	Age  int    `json:"age"`
+}
+
+func main() {
+
+	var responseStr string
+	err := gout.GET("url").
+		SetQuery(gout.H{}).
+		BindJSON(&responseStruct).
+		BindBody(&responseStr).
+		Do()
+
+	if err != nil {
+		return
+	}
+
+	log.Println(responseStr)
+}
+
 ```
 ## Set request timeout
 setimeout是request级别的超时方案。相比http.Client级别，更灵活。

dataflow/dataflow.go

@@ -296,33 +296,44 @@ func (df *DataFlow) BindHeader(obj interface{}) *DataFlow {
 // BindBody parse the variables in http body to obj.
 // obj must be a pointer variable
 func (df *DataFlow) BindBody(obj interface{}) *DataFlow {
-
-	df.Req.bodyDecoder = decode.NewBodyDecode(obj)
+	if obj == nil {
+		return df
+	}
+	df.Req.bodyDecoder = append(df.Req.bodyDecoder, decode.NewBodyDecode(obj))
 	return df
 }
 
 // BindJSON parse the json string in http body to obj.
 // obj must be a pointer variable
 func (df *DataFlow) BindJSON(obj interface{}) *DataFlow {
+	if obj == nil {
+		return df
+	}
 	df.out.opt.RspBodyType = "json"
-	df.Req.bodyDecoder = decode.NewJSONDecode(obj)
+	df.Req.bodyDecoder = append(df.Req.bodyDecoder, decode.NewJSONDecode(obj))
 	return df
 
 }
 
 // BindYAML parse the yaml string in http body to obj.
 // obj must be a pointer variable
 func (df *DataFlow) BindYAML(obj interface{}) *DataFlow {
+	if obj == nil {
+		return df
+	}
 	df.out.opt.RspBodyType = "yaml"
-	df.Req.bodyDecoder = decode.NewYAMLDecode(obj)
+	df.Req.bodyDecoder = append(df.Req.bodyDecoder, decode.NewYAMLDecode(obj))
 	return df
 }
 
 // BindXML parse the xml string in http body to obj.
 // obj must be a pointer variable
 func (df *DataFlow) BindXML(obj interface{}) *DataFlow {
+	if obj == nil {
+		return df
+	}
 	df.out.opt.RspBodyType = "xml"
-	df.Req.bodyDecoder = decode.NewXMLDecode(obj)
+	df.Req.bodyDecoder = append(df.Req.bodyDecoder, decode.NewXMLDecode(obj))
 	return df
 }
 

dataflow/dataflow_body_test.go

@@ -241,6 +241,31 @@ func TestSetBody(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, code, 200)
 }
+
+// 同时绑定json, body
+func TestBindBodyJSON(t *testing.T) {
+	router := gin.New()
+
+	router.GET("", func(c *gin.Context) {
+		c.JSON(200, gin.H{"code": 1})
+	})
+
+	ts := httptest.NewServer(http.HandlerFunc(router.ServeHTTP))
+	defer ts.Close()
+
+	type body struct {
+		Code int
+	}
+
+	gotJson := body{}
+	s := ""
+
+	err := GET(ts.URL).BindJSON(&gotJson).BindBody(&s).Do()
+	assert.NoError(t, err)
+	assert.Equal(t, body{Code: 1}, gotJson)
+	assert.Equal(t, `{"code":1}`, s)
+}
+
 func TestBindBody(t *testing.T) {
 	router := func() *gin.Engine {
 		router := gin.New()
@@ -290,6 +315,7 @@ func TestBindBody(t *testing.T) {
 	}()
 
 	ts := httptest.NewServer(http.HandlerFunc(router.ServeHTTP))
+	defer ts.Close()
 
 	tests := []testBodyReq{
 		{url: "/uint", got: new(uint), need: core.NewPtrVal(uint(1))},

dataflow/debug.go

@@ -73,6 +73,8 @@ func (do *DebugOption) resetBodyAndPrint(req *http.Request, resp *http.Response)
 		return err
 	}
 
+	resp.Body.Close()
+
 	resp.Body = ioutil.NopCloser(bytes.NewReader(all))
 	err = do.debugPrint(req, resp)
 	resp.Body = ioutil.NopCloser(bytes.NewReader(all))

dataflow/req.go

@@ -35,7 +35,7 @@ type Req struct {
 
 	// http body
 	bodyEncoder encode.Encoder
-	bodyDecoder decode.Decoder
+	bodyDecoder []decode.Decoder
 
 	// http header
 	headerEncode []interface{}
@@ -375,6 +375,34 @@ func (r *Req) GetContext() context.Context {
 	return r.c
 }
 
+// TODO 优化代码，每个decode都有自己的指针偏移直接指向流，减少大body的内存使用
+func (r *Req) decodeBody(req *http.Request, resp *http.Response) (err error) {
+
+	if r.bodyDecoder != nil {
+		var all []byte
+		if len(r.bodyDecoder) > 1 {
+			all, err = ioutil.ReadAll(resp.Body)
+			if err != nil {
+				return err
+			}
+			//已经取走数据，直接关闭body
+			resp.Body.Close()
+		}
+
+		for _, bodyDecoder := range r.bodyDecoder {
+			if len(all) > 0 {
+				resp.Body = ioutil.NopCloser(bytes.NewReader(all))
+			}
+
+			if err = bodyDecoder.Decode(resp.Body); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
 func (r *Req) decode(req *http.Request, resp *http.Response, openDebug bool) (err error) {
 	defer func() {
 		if err == io.EOF {
@@ -412,13 +440,7 @@ func (r *Req) decode(req *http.Request, resp *http.Response, openDebug bool) (er
 		}
 	}
 
-	if r.bodyDecoder != nil {
-		if err = r.bodyDecoder.Decode(resp.Body); err != nil {
-			return err
-		}
-	}
-
-	return nil
+	return r.decodeBody(req, resp)
 }
 
 func (r *Req) getDataFlow() *DataFlow {
@@ -539,8 +561,13 @@ func (r *Req) Do() (err error) {
 	}
 
 	if r.bodyDecoder != nil {
-		return valid.ValidateStruct(r.bodyDecoder.Value())
+		for _, bodyDecoder := range r.bodyDecoder {
+			if err := valid.ValidateStruct(bodyDecoder.Value()); err != nil {
+				return err
+			}
+		}
 	}
+
 	return nil
 }
 

version.go

@@ -1,4 +1,4 @@
 package gout
 
 // Version show version
-const Version = "v0.2.10"
+const Version = "v0.3.0"