added WithClient to allow users to specify their own http.Client

Author: matryer

client.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"mime/multipart"
 	"net/http"
 
@@ -67,7 +68,12 @@ func (c *client) Do(ctx context.Context, request *Request, response interface{})
 	}
 	req.Header.Set("Content-Type", writer.FormDataContentType())
 	req.Header.Set("Accept", "application/json")
-	res, err := ctxhttp.Do(ctx, c.httpclient, req)
+	client := c.httpclient
+	if client == nil {
+		client = http.DefaultClient
+	}
+	log.Println("The client is", client)
+	res, err := ctxhttp.Do(ctx, client, req)
 	if err != nil {
 		return err
 	}
@@ -86,6 +92,18 @@ func (c *client) Do(ctx context.Context, request *Request, response interface{})
 	return nil
 }
 
+// WithClient specifies the http.Client that requests will use.
+func WithClient(ctx context.Context, client *http.Client) context.Context {
+	log.Printf("%+v", ctx)
+	c, err := fromContext(ctx)
+	if err != nil {
+		// can't set it, fail silently
+		return ctx
+	}
+	c.httpclient = client
+	return ctx
+}
+
 type graphErr struct {
 	Message string
 }
@@ -111,9 +129,9 @@ func NewRequest(q string) *Request {
 
 // Run executes the query and unmarshals the response into response.
 func (req *Request) Run(ctx context.Context, response interface{}) error {
-	client := fromContext(ctx)
-	if client == nil {
-		return errors.New("inappropriate context")
+	client, err := fromContext(ctx)
+	if err != nil {
+		return err
 	}
 	return client.Do(ctx, req, response)
 }

client_test.go

@@ -13,6 +13,28 @@ import (
 	"github.com/matryer/is"
 )
 
+func TestWithClient(t *testing.T) {
+	is := is.New(t)
+	var calls int
+	testClient := &http.Client{
+		Transport: roundTripperFunc(func(req *http.Request) (*http.Response, error) {
+			calls++
+			resp := &http.Response{
+				Body: ioutil.NopCloser(strings.NewReader(`{"data":{"key":"value"}}`)),
+			}
+			return resp, nil
+		}),
+	}
+
+	ctx := NewContext(context.Background(), "")
+	ctx = WithClient(ctx, testClient)
+
+	req := NewRequest(``)
+	req.Run(ctx, nil)
+
+	is.Equal(calls, 1) // calls
+}
+
 func TestDo(t *testing.T) {
 	is := is.New(t)
 	var calls int
@@ -171,3 +193,9 @@ func TestFile(t *testing.T) {
 	is.NoErr(err)
 
 }
+
+type roundTripperFunc func(req *http.Request) (*http.Response, error)
+
+func (fn roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
+	return fn(req)
+}

context.go

@@ -1,6 +1,14 @@
 package graphql
 
-import "context"
+import (
+	"context"
+
+	"github.com/pkg/errors"
+)
+
+// errInappropriateContext is returned when the context has not been
+// configured with graphql.NewContext.
+var errInappropriateContext = errors.New("inappropriate context")
 
 // contextKey provides unique keys for context values.
 type contextKey string
@@ -10,9 +18,12 @@ var clientContextKey = contextKey("graphql client context")
 
 // fromContext gets the client from the specified
 // Context.
-func fromContext(ctx context.Context) *client {
-	c, _ := ctx.Value(clientContextKey).(*client)
-	return c
+func fromContext(ctx context.Context) (*client, error) {
+	c, ok := ctx.Value(clientContextKey).(*client)
+	if !ok {
+		return nil, errInappropriateContext
+	}
+	return c, nil
 }
 
 // NewContext makes a new context.Context that enables requests.

context_test.go

@@ -18,10 +18,12 @@ func TestNewContext(t *testing.T) {
 	endpoint := "https://server.com/graphql"
 	ctx = NewContext(ctx, endpoint)
 
-	vclient := fromContext(ctx)
+	vclient, err := fromContext(ctx)
+	is.NoErr(err)
 	is.Equal(vclient.endpoint, endpoint)
 
-	vclient2 := fromContext(ctx)
+	vclient2, err := fromContext(ctx)
+	is.NoErr(err)
 	is.Equal(vclient, vclient2)
 
 	is.Equal(ctx.Value(testContextKey), true) // normal context stuff should work