simplified interface

Author: matryer

client.go

@@ -18,16 +18,13 @@ type Client struct {
 	httpClient *http.Client
 }
 
-type ClientOption interface {
-	apply(*Client)
-}
-
-func NewClient(ctx context.Context, endpoint string, opts ...ClientOption) (*Client, error) {
+// NewClient makes a new Client capable of making GraphQL requests.
+func NewClient(endpoint string, opts ...ClientOption) (*Client, error) {
 	c := &Client{
 		endpoint: endpoint,
 	}
-	for _, o := range opts {
-		o.apply(c)
+	for _, optionFunc := range opts {
+		optionFunc(c)
 	}
 	if c.httpClient == nil {
 		c.httpClient = http.DefaultClient
@@ -109,18 +106,16 @@ func (c *Client) Run(ctx context.Context, request *Request, response interface{}
 	return nil
 }
 
-type httpClientOption struct {
-	hc *http.Client
-}
-
-func (o httpClientOption) apply(c *Client) {
-	c.httpClient = o.hc
+// WithHTTPClient specifies the underlying http.Client to use when
+// making requests.
+func WithHTTPClient(httpclient *http.Client) ClientOption {
+	return ClientOption(func(client *Client) {
+		client.httpClient = httpclient
+	})
 }
 
-// WithHTTPClient specifies the http.Client that requests will use.
-func WithHTTPClient(client *http.Client) ClientOption {
-	return httpClientOption{client}
-}
+// ClientOption is a function that modifies the client in some way.
+type ClientOption func(*Client)
 
 type graphErr struct {
 	Message string

client_test.go

@@ -27,7 +27,7 @@ func TestWithClient(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	client, err := NewClient(ctx, "", WithHTTPClient(testClient))
+	client, err := NewClient("", WithHTTPClient(testClient))
 	is.NoErr(err)
 
 	req := NewRequest(``)
@@ -53,7 +53,7 @@ func TestDo(t *testing.T) {
 	defer srv.Close()
 
 	ctx := context.Background()
-	client, err := NewClient(ctx, srv.URL)
+	client, err := NewClient(srv.URL)
 	is.NoErr(err)
 
 	ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
@@ -82,7 +82,7 @@ func TestDoErr(t *testing.T) {
 	defer srv.Close()
 
 	ctx := context.Background()
-	client, err := NewClient(ctx, srv.URL)
+	client, err := NewClient(srv.URL)
 	is.NoErr(err)
 
 	ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
@@ -110,7 +110,7 @@ func TestDoNoResponse(t *testing.T) {
 	defer srv.Close()
 
 	ctx := context.Background()
-	client, err := NewClient(ctx, srv.URL)
+	client, err := NewClient(srv.URL)
 	is.NoErr(err)
 
 	ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
@@ -136,7 +136,7 @@ func TestQuery(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 	defer cancel()
 
-	client, err := NewClient(ctx, srv.URL)
+	client, err := NewClient(srv.URL)
 	is.NoErr(err)
 
 	req := NewRequest("query {}")
@@ -180,7 +180,7 @@ func TestFile(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 	defer cancel()
 
-	client, err := NewClient(ctx, srv.URL)
+	client, err := NewClient(srv.URL)
 	is.NoErr(err)
 
 	f := strings.NewReader(`This is a file`)