Updated to use Go 1.7 request based context

Author: nicholasjackson

handler.go

@@ -8,8 +8,6 @@ import (
 	"strings"
 
 	"github.com/graphql-go/graphql"
-
-	"golang.org/x/net/context"
 )
 
 const (
@@ -20,7 +18,7 @@ const (
 
 type Handler struct {
 	Schema *graphql.Schema
-	
+
 	pretty bool
 }
 type RequestOptions struct {
@@ -115,7 +113,7 @@ func NewRequestOptions(r *http.Request) *RequestOptions {
 
 // ContextHandler provides an entrypoint into executing graphQL queries with a
 // user-provided context.
-func (h *Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) {
+func (h *Handler) ContextHandler(w http.ResponseWriter, r *http.Request) {
 	// get query
 	opts := NewRequestOptions(r)
 
@@ -125,11 +123,10 @@ func (h *Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r *
 		RequestString:  opts.Query,
 		VariableValues: opts.Variables,
 		OperationName:  opts.OperationName,
-		Context:        ctx,
+		Context:        r.Context(),
 	}
 	result := graphql.Do(params)
 
-	
 	if h.pretty {
 		w.WriteHeader(http.StatusOK)
 		buff, _ := json.MarshalIndent(result, "", "\t")
@@ -138,14 +135,14 @@ func (h *Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r *
 	} else {
 		w.WriteHeader(http.StatusOK)
 		buff, _ := json.Marshal(result)
-	
+
 		w.Write(buff)
 	}
 }
 
 // ServeHTTP provides an entrypoint into executing graphQL queries.
 func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	h.ContextHandler(context.Background(), w, r)
+	h.ContextHandler(w, r)
 }
 
 type Config struct {

handler_test.go

@@ -1,6 +1,7 @@
-package handler_test
+package handler
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -12,9 +13,6 @@ import (
 
 	"github.com/graphql-go/graphql"
 	"github.com/graphql-go/graphql/testutil"
-	"github.com/graphql-go/handler"
-	"github.com/graphql-go/relay/examples/starwars" // TODO: remove this dependency
-	"golang.org/x/net/context"
 )
 
 func decodeResponse(t *testing.T, recorder *httptest.ResponseRecorder) *graphql.Result {
@@ -33,7 +31,7 @@ func decodeResponse(t *testing.T, recorder *httptest.ResponseRecorder) *graphql.
 	}
 	return &target
 }
-func executeTest(t *testing.T, h *handler.Handler, req *http.Request) (*graphql.Result, *httptest.ResponseRecorder) {
+func executeTest(t *testing.T, h *Handler, req *http.Request) (*graphql.Result, *httptest.ResponseRecorder) {
 	resp := httptest.NewRecorder()
 	h.ServeHTTP(resp, req)
 	result := decodeResponse(t, resp)
@@ -53,7 +51,8 @@ func TestContextPropagated(t *testing.T) {
 			},
 		},
 	})
-	myNameSchema, err := graphql.NewSchema(graphql.SchemaConfig{myNameQuery, nil})
+
+	myNameSchema, err := graphql.NewSchema(graphql.SchemaConfig{Query: myNameQuery})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -66,18 +65,19 @@ func TestContextPropagated(t *testing.T) {
 	queryString := `query={name}`
 	req, _ := http.NewRequest("GET", fmt.Sprintf("/graphql?%v", queryString), nil)
 
-	h := handler.New(&handler.Config{
-		Schema: &myNameSchema,
-		Pretty: true,
-	})
+	h := New(&Config{Schema: &myNameSchema, Pretty: true})
 
-	ctx := context.WithValue(context.Background(), "name", "context-data")
+	*req = *req.WithContext(context.WithValue(context.Background(), "name", "context-data"))
 	resp := httptest.NewRecorder()
-	h.ContextHandler(ctx, resp, req)
+
+	h.ContextHandler(resp, req)
+
 	result := decodeResponse(t, resp)
+
 	if resp.Code != http.StatusOK {
 		t.Fatalf("unexpected server response %v", resp.Code)
 	}
+
 	if !reflect.DeepEqual(result, expected) {
 		t.Fatalf("wrong result, graphql result diff: %v", testutil.Diff(expected, result))
 	}
@@ -92,17 +92,18 @@ func TestHandler_BasicQuery_Pretty(t *testing.T) {
 			},
 		},
 	}
+
 	queryString := `query=query RebelsShipsQuery { rebels { id, name } }`
 	req, _ := http.NewRequest("GET", fmt.Sprintf("/graphql?%v", queryString), nil)
 
-	h := handler.New(&handler.Config{
-		Schema: &starwars.Schema,
-		Pretty: true,
-	})
+	h := New(&Config{Schema: &schema, Pretty: true})
+
 	result, resp := executeTest(t, h, req)
+
 	if resp.Code != http.StatusOK {
 		t.Fatalf("unexpected server response %v", resp.Code)
 	}
+
 	if !reflect.DeepEqual(result, expected) {
 		t.Fatalf("wrong result, graphql result diff: %v", testutil.Diff(expected, result))
 	}
@@ -117,17 +118,18 @@ func TestHandler_BasicQuery_Ugly(t *testing.T) {
 			},
 		},
 	}
+
 	queryString := `query=query RebelsShipsQuery { rebels { id, name } }`
 	req, _ := http.NewRequest("GET", fmt.Sprintf("/graphql?%v", queryString), nil)
 
-	h := handler.New(&handler.Config{
-		Schema: &starwars.Schema,
-		Pretty: false,
-	})
+	h := New(&Config{Schema: &schema, Pretty: false})
+
 	result, resp := executeTest(t, h, req)
+
 	if resp.Code != http.StatusOK {
 		t.Fatalf("unexpected server response %v", resp.Code)
 	}
+
 	if !reflect.DeepEqual(result, expected) {
 		t.Fatalf("wrong result, graphql result diff: %v", testutil.Diff(expected, result))
 	}
@@ -148,6 +150,6 @@ func TestHandler_Params_NilParams(t *testing.T) {
 		}
 		t.Fatalf("expected to panic, did not panic")
 	}()
-	_ = handler.New(nil)
 
+	_ = New(nil)
 }

schema_test.go

@@ -0,0 +1,46 @@
+package handler
+
+import (
+	"github.com/graphql-go/graphql"
+)
+
+type faction struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+}
+
+var rebels = &faction{
+	"RmFjdGlvbjox",
+	"Alliance to Restore the Republic",
+}
+
+var factionType = graphql.NewObject(graphql.ObjectConfig{
+	Name:        "Faction",
+	Description: "A faction in the Star Wars saga",
+	Fields: graphql.Fields{
+		"id": &graphql.Field{
+			Type:        graphql.String,
+			Description: "Id of the faction",
+		},
+		"name": &graphql.Field{
+			Type:        graphql.String,
+			Description: "The name of the faction.",
+		},
+	},
+})
+
+var queryType = graphql.NewObject(graphql.ObjectConfig{
+	Name: "Query",
+	Fields: graphql.Fields{
+		"rebels": &graphql.Field{
+			Type: factionType,
+			Resolve: func(p graphql.ResolveParams) (interface{}, error) {
+				return rebels, nil
+			},
+		},
+	},
+})
+
+var schema, _ = graphql.NewSchema(graphql.SchemaConfig{
+	Query: queryType,
+})