better api names

cmd/gogi/main.go

@@ -30,7 +30,7 @@ func init() {
 	if apiURL == "" {
 		gogiClient, _ = gogi.NewHTTPClient()
 	} else {
-		gogiClient, err = gogi.NewHTTPClient(gogi.APIUrl(apiURL))
+		gogiClient, err = gogi.NewHTTPClient(gogi.WithAPIUrl(apiURL))
 		if err != nil {
 			panic(err)
 		}

gogi.go

@@ -29,7 +29,7 @@ func NewHTTPClient(options ...func(*Client) error) (*Client, error) {
 	}
 
 	// Default API url
-	err := APIUrl(defaultAPIURL)(c)
+	err := WithAPIUrl(defaultAPIURL)(c)
 	if err != nil {
 		return nil, err
 	}
@@ -44,8 +44,8 @@ func NewHTTPClient(options ...func(*Client) error) (*Client, error) {
 	return c, nil
 }
 
-// APIUrl sets the API url option for gogi client
-func APIUrl(u string) func(*Client) error {
+// WithAPIUrl sets the API url option for gogi client
+func WithAPIUrl(u string) func(*Client) error {
 	return func(c *Client) error {
 		apiURL, err := url.Parse(u)
 		if err != nil {
@@ -58,8 +58,8 @@ func APIUrl(u string) func(*Client) error {
 	}
 }
 
-// HTTPClient sets the client option for gogi client
-func HTTPClient(client *http.Client) func(*Client) error {
+// WithHTTPClient sets the client option for gogi client
+func WithHTTPClient(client *http.Client) func(*Client) error {
 	return func(c *Client) error {
 		if client == nil {
 			return errors.New("client is nil")

gogi_test.go

@@ -79,20 +79,20 @@ func TestDo(t *testing.T) {
 	}
 }
 
-func TestAPIUrl(t *testing.T) {
+func TestWithAPIUrl(t *testing.T) {
 	c, _ := NewHTTPClient()
 	u := "http://cuonglm.xyz"
-	if err := APIUrl(u)(c); err != nil {
+	if err := WithAPIUrl(u)(c); err != nil {
 		t.Fatalf("APIUrl() %+v", err)
 	}
 
 	assertEqual(t, c.APIURL.String(), u)
 }
 
-func TestHTTPClient(t *testing.T) {
+func TestWithHTTPClient(t *testing.T) {
 	c, _ := NewHTTPClient()
 
-	if err := HTTPClient(nil)(c); err == nil {
+	if err := WithHTTPClient(nil)(c); err == nil {
 		t.Fatal("APIUrl() want error, got nil")
 	}
 }