Merge pull request #5 from graphql-go/update_package_name

Updated imports to `github.com/graphql-go/handler` and package to `handler`

Author: sogko

CHANGELOG.md

@@ -1,6 +1,6 @@
 # graphql-go-handler
 
-Golang HTTP.Handler for [graphl-go](https://github.com/chris-ramon/graphql)
+Golang HTTP.Handler for [graphl-go](https://github.com/graphql-go/graphql)
 
 ### Notes:
 This is based on alpha version of `graphql-go` and `graphql-relay-go`. 
@@ -13,15 +13,15 @@ package main
 
 import (
 	"net/http"
-	"github.com/sogko/graphql-go-handler"
+	"github.com/graphql-go/handler"
 )
 
 func main() {
 
 	// define GraphQL schema using relay library helpers
 	schema := graphql.NewSchema(...)
 
-	h := gqlhandler.New(&gqlhandler.Config{
+	h := handler.New(&handler.Config{
 		Schema: schema,
 		Pretty: true,
 	})
@@ -68,14 +68,11 @@ depending on the provided `Content-Type` header.
 
 
 ### Examples
-- [golang-graphql-playground](https://github.com/sogko/golang-graphql-playground)
+- [golang-graphql-playground](https://github.com/graphql-go/golang-graphql-playground)
 - [golang-relay-starter-kit](https://github.com/sogko/golang-relay-starter-kit)
 - [todomvc-relay-go](https://github.com/sogko/todomvc-relay-go)
 
 ### Test
 ```bash
-$ go get github.com/sogko/graphql-go-handler
-$ go build && go test ./...
-```
-### Changelog
-For recent changes, see [Changelog](./CHANGELOG.md)
+$ go get github.com/graphql-go/handler
+$ go build && go test ./...

README.md

@@ -1,13 +1,13 @@
-package gqlhandler
+package handler
 
 import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"strings"
 
-	"github.com/chris-ramon/graphql"
 	"github.com/gorilla/schema"
+	"github.com/graphql-go/graphql"
 	"github.com/unrolled/render"
 )
 
@@ -111,15 +111,13 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	opts := getRequestOptions(r)
 
 	// execute graphql query
-	resultChannel := make(chan *graphql.Result)
 	params := graphql.Params{
 		Schema:         *h.Schema,
 		RequestString:  opts.Query,
 		VariableValues: opts.Variables,
 		OperationName:  opts.OperationName,
 	}
-	go graphql.Graphql(params, resultChannel)
-	result := <-resultChannel
+	result := graphql.Graphql(params)
 
 	// render result
 	h.render.JSON(w, http.StatusOK, result)

handler.go

@@ -1,4 +1,4 @@
-package gqlhandler_test
+package handler_test
 
 import (
 	"encoding/json"
@@ -10,10 +10,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/chris-ramon/graphql"
-	"github.com/chris-ramon/graphql/testutil"
-	"github.com/sogko/graphql-go-handler"
-	"github.com/sogko/graphql-relay-go/examples/starwars"
+	"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
 )
 
 func decodeResponse(t *testing.T, recorder *httptest.ResponseRecorder) *graphql.Result {
@@ -32,7 +32,7 @@ func decodeResponse(t *testing.T, recorder *httptest.ResponseRecorder) *graphql.
 	}
 	return &target
 }
-func executeTest(t *testing.T, h *gqlhandler.Handler, req *http.Request) (*graphql.Result, *httptest.ResponseRecorder) {
+func executeTest(t *testing.T, h *handler.Handler, req *http.Request) (*graphql.Result, *httptest.ResponseRecorder) {
 	resp := httptest.NewRecorder()
 	h.ServeHTTP(resp, req)
 	result := decodeResponse(t, resp)
@@ -52,7 +52,7 @@ func TestHandler_BasicQuery(t *testing.T) {
 	queryString := `query=query RebelsShipsQuery { rebels { id, name } }`
 	req, _ := http.NewRequest("GET", fmt.Sprintf("/graphql?%v", queryString), nil)
 
-	h := gqlhandler.New(&gqlhandler.Config{
+	h := handler.New(&handler.Config{
 		Schema: &starwars.Schema,
 		Pretty: true,
 	})
@@ -79,6 +79,6 @@ func TestHandler_Params_NilParams(t *testing.T) {
 		}
 		t.Fatalf("expected to panic, did not panic")
 	}()
-	_ = gqlhandler.New(nil)
+	_ = handler.New(nil)
 
 }

handler_test.go

@@ -1,4 +1,4 @@
-package gqlhandler
+package handler
 
 import (
 	"bytes"
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/chris-ramon/graphql/testutil"
+	"github.com/graphql-go/graphql/testutil"
 )
 
 func TestRequestOptions_GET_BasicQueryString(t *testing.T) {