Support g (#14)

* 支持-G; --get

* 使用-G选项

Author: guonaihong

pcurl.go

@@ -13,6 +13,7 @@ import (
 // Curl结构体
 type Curl struct {
 	Method   string   `clop:"-X; --request" usage:"Specify request command to use"`
+	Get      bool     `clop:"-G; --get" usage:"Put the post data in the URL and use GET"`
 	Header   []string `clop:"-H; --header" usage:"Pass custom header(s) to server"`
 	Data     string   `clop:"-d; --data"   usage:"HTTP POST data"`
 	DataRaw  string   `clop:"--data-raw" usage:"HTTP POST data, '@' allowed"`
@@ -107,14 +108,22 @@ func (c *Curl) getURL() string {
 	return url
 }
 
-func (c *Curl) emptySetMethod() {
+func (c *Curl) setMethod() {
+	// 在curl里面-X的选项的优先级别比-G高，所以c.Method为空时才会看c.Get是否设置
+	if len(c.Method) == 0 && c.Get {
+		c.Method = "GET"
+		return
+	}
+
 	if len(c.Method) != 0 {
 		return
 	}
+
 	if len(c.Data) > 0 {
 		c.Method = "POST"
 		return
 	}
+
 	c.Method = "GET"
 }
 
@@ -130,7 +139,7 @@ func (c *Curl) Request() (req *http.Request, err error) {
 		}
 	}()
 
-	c.emptySetMethod() //如果method为空，设置一个默认值
+	c.setMethod()
 
 	header := c.createHeader()
 

pcurl_test.go

@@ -209,8 +209,42 @@ func createGeneralForm(need H, t *testing.T) *httptest.Server {
 	return httptest.NewServer(http.HandlerFunc(router.ServeHTTP))
 }
 
-//TODO
 func Test_Method(t *testing.T) {
+	methodServer := func() *httptest.Server {
+		router := func() *gin.Engine {
+			router := gin.New()
+
+			router.DELETE("/", func(c *gin.Context) {
+				c.String(200, "DELETE")
+			})
+
+			router.GET("/", func(c *gin.Context) {
+				c.String(200, "GET")
+			})
+			return router
+		}()
+
+		return httptest.NewServer(http.HandlerFunc(router.ServeHTTP))
+	}
+
+	need := []string{"DELETE", "DELETE", "GET"}
+
+	for index, curlStr := range []string{
+		`curl -X DELETE -G `,
+		`curl -G -XDELETE `,
+		`curl -G `,
+	} {
+		ts := methodServer()
+		req, err := ParseAndRequest(curlStr + ts.URL)
+
+		assert.NoError(t, err)
+
+		got := ""
+		err = gout.New().SetRequest(req).BindBody(&got).Do()
+
+		assert.Equal(t, got, need[index])
+		assert.NoError(t, err)
+	}
 }
 
 func Test_URL(t *testing.T) {