#11 Request.SetQueryString method is done and test cases.

Author: jeevatkm

client.go

@@ -354,12 +354,7 @@ func (c *Client) SetContentLength(l bool) *Client {
 //		resty.SetError(Error{})
 //
 func (c *Client) SetError(err interface{}) *Client {
-	t := reflect.TypeOf(err)
-	if t.Kind() == reflect.Ptr {
-		c.Error = t.Elem()
-	} else {
-		c.Error = t
-	}
+	c.Error = getType(err)
 	return c
 }
 
@@ -463,7 +458,7 @@ func (c *Client) SetTimeout(timeout time.Duration) *Client {
 	c.transport.Dial = func(network, addr string) (net.Conn, error) {
 		conn, err := net.DialTimeout(network, addr, timeout)
 		if err != nil {
-			c.Log.Printf("Error: %v", err)
+			c.Log.Printf("ERROR [%v]", err)
 			return nil, err
 		}
 		conn.SetDeadline(time.Now().Add(timeout))
@@ -484,7 +479,7 @@ func (c *Client) SetProxy(proxyURL string) *Client {
 	if pURL, err := url.Parse(proxyURL); err == nil {
 		c.transport.Proxy = http.ProxyURL(pURL)
 	} else {
-		c.Log.Printf("ERROR: %v", err)
+		c.Log.Printf("ERROR [%v]", err)
 	}
 
 	return c
@@ -643,6 +638,24 @@ func (r *Request) SetQueryParams(params map[string]string) *Request {
 	return r
 }
 
+// SetQueryString method provides ability to use string as an input to set URL query string for the request.
+//
+// Using String as an input
+// 		resty.R().
+//			SetQueryString("productId=232&template=fresh-sample&cat=resty&source=google&kw=buy a lot more")
+//
+func (r *Request) SetQueryString(query string) *Request {
+	values, err := url.ParseQuery(strings.TrimSpace(query))
+	if err == nil {
+		for p, _ := range values {
+			r.QueryParam.Add(p, values.Get(p))
+		}
+	} else {
+		r.client.Log.Printf("ERROR [%v]", err)
+	}
+	return r
+}
+
 // SetFormData method sets Form parameters and its values in the current request.
 // It's applicable only HTTP method `POST` and `PUT` and requets content type would be set as
 // `application/x-www-form-urlencoded`.
@@ -934,12 +947,7 @@ func IsStringEmpty(str string) bool {
 // DetectContentType method is used to figure out `Request.Body` content type for request header
 func DetectContentType(body interface{}) string {
 	contentType := plainTextType
-	kind := reflect.ValueOf(body).Kind()
-	if kind == reflect.Ptr {
-		kind = reflect.TypeOf(body).Elem().Kind()
-	}
-
-	switch kind {
+	switch getBaseKind(body) {
 	case reflect.Struct, reflect.Map:
 		contentType = jsonContentType
 	case reflect.String:
@@ -973,14 +981,7 @@ func Unmarshal(ct string, b []byte, d interface{}) (err error) {
 }
 
 func getLogger(w io.Writer) *log.Logger {
-	var l *log.Logger
-	if w == nil {
-		l = log.New(os.Stderr, "RESTY ", log.LstdFlags)
-	} else {
-		l = log.New(w, "RESTY ", log.LstdFlags)
-	}
-
-	return l
+	return log.New(w, "RESTY ", log.LstdFlags)
 }
 
 func addFile(w *multipart.Writer, fieldName, path string) error {
@@ -1064,14 +1065,25 @@ func getResponseBodyString(res *Response) string {
 }
 
 func getPointer(v interface{}) interface{} {
-	rv := reflect.TypeOf(v)
-	if rv.Kind() != reflect.Ptr {
-		return reflect.New(rv).Interface()
+	vv := reflect.ValueOf(v)
+	if vv.Kind() == reflect.Ptr {
+		return v
 	}
-
-	return v
+	return reflect.New(vv.Type()).Interface()
 }
 
 func isPayloadSupported(m string) bool {
 	return (m == POST || m == PUT || m == DELETE || m == PATCH)
 }
+
+func getBaseKind(v interface{}) reflect.Kind {
+	return getType(v).Kind()
+}
+
+func getType(v interface{}) reflect.Type {
+	vv := reflect.ValueOf(v)
+	if vv.Kind() == reflect.Ptr {
+		return vv.Elem().Type()
+	}
+	return vv.Type()
+}

middleware.go

@@ -136,11 +136,7 @@ func parseRequestBody(c *Client, r *Request) (err error) {
 			}
 
 			var bodyBytes []byte
-			kind := reflect.ValueOf(r.Body).Kind()
-			if kind == reflect.Ptr {
-				kind = reflect.TypeOf(r.Body).Elem().Kind()
-			}
-
+			kind := getBaseKind(r.Body)
 			if IsJSONType(contentType) && (kind == reflect.Struct || kind == reflect.Map) {
 				bodyBytes, err = json.Marshal(r.Body)
 			} else if IsXMLType(contentType) && (kind == reflect.Struct) {

resty_test.go

@@ -492,6 +492,28 @@ func TestMultiPartUploadFile(t *testing.T) {
 	assertEqual(t, http.StatusOK, resp.StatusCode())
 }
 
+func TestMultiPartUploadFileError(t *testing.T) {
+	ts := createFormPostServer(t)
+	defer ts.Close()
+
+	pwd, _ := os.Getwd()
+	basePath := pwd + "/test-data"
+
+	c := dc()
+	c.SetFormData(map[string]string{"zip_code": "00001", "city": "Los Angeles"})
+
+	resp, err := c.R().
+		SetFile("profile_img", basePath+"/test-img-not-exists.png").
+		Post(ts.URL + "/upload")
+
+	if err == nil {
+		t.Errorf("Expected [%v], got [%v]", nil, err)
+	}
+	if resp != nil {
+		t.Errorf("Expected [%v], got [%v]", nil, resp)
+	}
+}
+
 func TestMultiPartUploadFiles(t *testing.T) {
 	ts := createFormPostServer(t)
 	defer ts.Close()
@@ -747,6 +769,14 @@ func TestClientTimeout(t *testing.T) {
 	assertEqual(t, true, strings.Contains(err.Error(), "i/o timeout"))
 }
 
+func TestClientTimeoutInternalError(t *testing.T) {
+	c := dc()
+	c.SetHTTPMode()
+	c.SetTimeout(time.Duration(time.Second * 1))
+
+	c.R().Get("http://localhost:9000/set-timeout-test")
+}
+
 func TestHeadMethod(t *testing.T) {
 	ts := createGetServer(t)
 	defer ts.Close()
@@ -843,6 +873,34 @@ func TestDetectContentTypeForPointer(t *testing.T) {
 	logResponse(t, resp)
 }
 
+func TestSetQueryStringTypical(t *testing.T) {
+	ts := createGetServer(t)
+	defer ts.Close()
+
+	resp, err := dclr().
+		SetQueryString("productId=232&template=fresh-sample&cat=resty&source=google&kw=buy a lot more").
+		Get(ts.URL)
+
+	assertError(t, err)
+	assertEqual(t, http.StatusOK, resp.StatusCode())
+	assertEqual(t, "200 OK", resp.Status())
+	assertEqual(t, "TestGet: text response", resp.String())
+}
+
+func TestSetQueryStringTypicalError(t *testing.T) {
+	ts := createGetServer(t)
+	defer ts.Close()
+
+	resp, err := dclr().
+		SetQueryString("&%%amp;").
+		Get(ts.URL)
+
+	assertError(t, err)
+	assertEqual(t, http.StatusOK, resp.StatusCode())
+	assertEqual(t, "200 OK", resp.Status())
+	assertEqual(t, "TestGet: text response", resp.String())
+}
+
 func TestClientOptions(t *testing.T) {
 	SetHTTPMode().SetContentLength(true)
 	assertEqual(t, Mode(), "http")