👔 up: httpreq - add new func IsValidMethod

Author: inhere

netutil/httpreq/client.go

@@ -18,7 +18,7 @@ type Client struct {
 	method  string
 	baseURL string
 	timeout int // unit: ms
-	// custom set headers
+	// custom set default headers
 	headerMap map[string]string
 
 	// before send callback
@@ -217,12 +217,11 @@ func (h *Client) MustSend(method, url string, optFns ...OptionFn) *http.Response
 
 // SendWithOpt request and return http response
 func (h *Client) SendWithOpt(url string, opt *Option) (*http.Response, error) {
-	cli := h
-	if len(cli.baseURL) > 0 {
+	if len(h.baseURL) > 0 {
 		if !strings.HasPrefix(url, "http") {
-			url = cli.baseURL + url
+			url = h.baseURL + url
 		} else if len(url) == 0 {
-			url = cli.baseURL
+			url = h.baseURL
 		}
 	}
 
@@ -233,7 +232,7 @@ func (h *Client) SendWithOpt(url string, opt *Option) (*http.Response, error) {
 	}
 
 	// create request
-	method := strings.ToUpper(strutil.OrElse(opt.Method, cli.method))
+	method := strings.ToUpper(strutil.OrElse(opt.Method, h.method))
 
 	if opt.Data != nil {
 		if IsNoBodyMethod(method) {

netutil/httpreq/httpreq.go

@@ -9,6 +9,19 @@ import (
 	"github.com/gookit/goutil/netutil/httpctype"
 )
 
+// ValidMethods valid http methods
+var ValidMethods = []string{
+	http.MethodGet,
+	http.MethodPost,
+	http.MethodPut,
+	http.MethodPatch,
+	http.MethodDelete,
+	http.MethodConnect,
+	http.MethodHead,
+	http.MethodOptions,
+	http.MethodTrace,
+}
+
 // AfterSendFn callback func
 type AfterSendFn func(resp *http.Response, err error)
 

netutil/httpreq/util.go

@@ -72,6 +72,20 @@ func IsNoBodyMethod(method string) bool {
 	return method != "POST" && method != "PUT" && method != "PATCH"
 }
 
+// IsValidMethod check method is valid
+func IsValidMethod(method string) bool {
+	method = strings.ToUpper(method)
+	return http.MethodGet == method ||
+		http.MethodPost == method ||
+		http.MethodPut == method ||
+		http.MethodPatch == method ||
+		http.MethodDelete == method ||
+		http.MethodConnect == method ||
+		http.MethodHead == method ||
+		http.MethodOptions == method ||
+		http.MethodTrace == method
+}
+
 // BuildBasicAuth returns the base64 encoded username:password for basic auth.
 // Then set to header "Authorization".
 //
@@ -101,14 +115,14 @@ func SetHeaders(req *http.Request, headers ...http.Header) {
 	}
 }
 
-// AddHeaderMap to reqeust instance.
+// AddHeaderMap to request instance.
 func AddHeaderMap(req *http.Request, headerMap map[string]string) {
 	for k, v := range headerMap {
 		req.Header.Add(k, v)
 	}
 }
 
-// SetHeaderMap to reqeust instance.
+// SetHeaderMap to request instance.
 func SetHeaderMap(req *http.Request, headerMap map[string]string) {
 	for k, v := range headerMap {
 		req.Header.Set(k, v)

netutil/httpreq/util_test.go

@@ -36,8 +36,18 @@ func TestAddHeaders(t *testing.T) {
 	httpreq.AddHeaders(req, http.Header{
 		"key0": []string{"val0"},
 	})
-
 	assert.Eq(t, "val0", req.Header.Get("key0"))
+
+	httpreq.AddHeaderMap(req, map[string]string{
+		"key1": "val1",
+	})
+	assert.Eq(t, "val1", req.Header.Get("key1"))
+
+	// IsValidMethod
+	assert.NotEmpty(t, httpreq.ValidMethods)
+	assert.True(t, httpreq.IsValidMethod("get"))
+	assert.True(t, httpreq.IsValidMethod("GET"))
+	assert.False(t, httpreq.IsValidMethod("get1"))
 }
 
 func TestHeaderToStringMap(t *testing.T) {
@@ -67,6 +77,12 @@ func TestToQueryValues(t *testing.T) {
 		"field2": {"value2"},
 	})
 	assert.StrContains(t, vs.Encode(), "field1=234")
+
+	reqURL, err := url.Parse("abc.dev")
+	assert.NoErr(t, err)
+	err = httpreq.AppendQueryToURL(reqURL, vs)
+	assert.NoErr(t, err)
+	assert.Eq(t, "field1=234&field2=value2", reqURL.RawQuery)
 }
 
 func TestRequestToString(t *testing.T) {