Merge pull request #32 from appleboy/query

Support set query string.

Author: appleboy

Makefile

@@ -8,7 +8,7 @@ install:
 	glide install
 
 update:
-	glide update --all-dependencies --resolve-current
+	glide up
 
 example:
 	cd example && go test -v -cover -covermode=count -coverprofile=coverage.txt .

README.md

@@ -177,6 +177,42 @@ func TestPostRawData(t *testing.T) {
 }
 ```
 
+### Set Query String
+
+Using `SetQuery` to generate raw data.
+
+```go
+func TestQueryString(t *testing.T) {
+  r := gofight.New()
+
+  r.GET("/hello").
+    SetQUERY(gofight.H{
+      "a": "1",
+      "b": "2",
+    }).
+    Run(BasicEngine, func(r HTTPResponse, rq HTTPRequest) {
+      assert.Equal(t, http.StatusOK, r.Code)
+    })
+}
+```
+
+or append exist query parameter.
+
+```go
+func TestQueryString(t *testing.T) {
+  r := gofight.New()
+
+  r.GET("/hello?foo=bar").
+    SetQUERY(gofight.H{
+      "a": "1",
+      "b": "2",
+    }).
+    Run(BasicEngine, func(r HTTPResponse, rq HTTPRequest) {
+      assert.Equal(t, http.StatusOK, r.Code)
+    })
+}
+```
+
 ## Example
 
 * Basic HTTP Router: [basic.go](example/basic.go), [basic_test.go](example/basic_test.go)

example/basic.go

@@ -9,7 +9,7 @@ func basicHelloHandler(w http.ResponseWriter, r *http.Request) {
 	io.WriteString(w, "Hello World")
 }
 
-func basicHttpHelloHandler() {
+func basicHTTPHelloHandler() {
 	http.HandleFunc("/hello", basicHelloHandler)
 }
 

example/basic_test.go

@@ -26,7 +26,7 @@ func TestBasicHelloWorld(t *testing.T) {
 }
 
 func TestBasicHttpHelloWorld(t *testing.T) {
-	basicHttpHelloHandler()
+	basicHTTPHelloHandler()
 
 	r := gofight.New()
 

glide.lock

@@ -14,6 +14,13 @@
 //      "X-Version": version,
 //    })
 //
+// Set query string: Using SetQUERY to generate query string data.
+//
+//    SetQUERY(gofight.H{
+//      "a": "1",
+//      "b": "2",
+//    })
+//
 // POST FORM Data: Using SetFORM to generate form data.
 //
 //    SetFORM(gofight.H{
@@ -212,6 +219,23 @@ func (rc *RequestConfig) SetFORM(body H) *RequestConfig {
 	return rc
 }
 
+// SetQUERY supply query string.
+func (rc *RequestConfig) SetQUERY(query H) *RequestConfig {
+	f := make(url.Values)
+
+	for k, v := range query {
+		f.Set(k, v)
+	}
+
+	if strings.Contains(rc.Path, "?") {
+		rc.Path = rc.Path + "&" + f.Encode()
+	} else {
+		rc.Path = rc.Path + "?" + f.Encode()
+	}
+
+	return rc
+}
+
 // SetBody supply raw body.
 func (rc *RequestConfig) SetBody(body string) *RequestConfig {
 	if len(body) > 0 {

gofight.go

@@ -380,3 +380,23 @@ func TestEchoOptions(t *testing.T) {
 			assert.Equal(t, http.StatusOK, r.Status())
 		})
 }
+
+func TestSetQueryString(t *testing.T) {
+	r := New()
+
+	r.GET("/hello").
+		SetQUERY(H{
+			"a": "1",
+			"b": "2",
+		})
+
+	assert.Equal(t, "/hello?a=1&b=2", r.Path)
+
+	r.GET("/hello?foo=bar").
+		SetQUERY(H{
+			"a": "1",
+			"b": "2",
+		})
+
+	assert.Equal(t, "/hello?foo=bar&a=1&b=2", r.Path)
+}