Tidy, update travis config.yml

Author: nicholasjackson

.travis.yml

@@ -2,6 +2,9 @@ language: go
 
 go:
   - 1.4
+  - 1.5
+  - 1.6
+  - 1.7
 
 before_install:
   - go get github.com/axw/gocov/gocov

handler.go

@@ -1,13 +1,14 @@
 package handler
 
 import (
-	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
 
+	"golang.org/x/net/context"
+
 	"github.com/graphql-go/graphql"
 )
 
@@ -141,11 +142,6 @@ func (h *Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r *
 	}
 }
 
-// ServeHTTP provides an entrypoint into executing graphQL queries.
-func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	h.ContextHandler(r.Context(), w, r)
-}
-
 type Config struct {
 	Schema *graphql.Schema
 	Pretty bool

handler_test.go

@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -11,6 +10,8 @@ import (
 	"strings"
 	"testing"
 
+	"golang.org/x/net/context"
+
 	"github.com/graphql-go/graphql"
 	"github.com/graphql-go/graphql/testutil"
 )

serve_http.go

@@ -0,0 +1,11 @@
+
+// +build go1.7
+
+package handler
+
+import "net/http"
+
+// ServeHTTP provides an entrypoint into executing graphQL queries.
+func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	h.ContextHandler(r.Context(), w, r)
+}

serve_http_legacy.go

@@ -0,0 +1,15 @@
+
+// +build !go1.7
+
+package handler
+
+import (
+	"net/http"
+
+	"golang.org/x/net/context"
+)
+
+// ServeHTTP provides an entrypoint into executing graphQL queries.
+func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	h.ContextHandler(context.Background(), w, r)
+}