Merge pull request #8 from DarkDNA/master

Remove extrenious dependencies.

Author: sogko

handler.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"strings"
 
-	"github.com/gorilla/schema"
 	"github.com/graphql-go/graphql"
-	"github.com/unrolled/render"
+
 	"golang.org/x/net/context"
 )
 
@@ -18,11 +18,10 @@ const (
 	ContentTypeFormURLEncoded = "application/x-www-form-urlencoded"
 )
 
-var decoder = schema.NewDecoder()
-
 type Handler struct {
 	Schema *graphql.Schema
-	render *render.Render
+	
+	pretty bool
 }
 type RequestOptions struct {
 	Query         string                 `json:"query" url:"query" schema:"query"`
@@ -37,26 +36,34 @@ type requestOptionsCompatibility struct {
 	OperationName string `json:"operationName" url:"operationName" schema:"operationName"`
 }
 
-// RequestOptions Parses a http.Request into GraphQL request options struct
-func NewRequestOptions(r *http.Request) *RequestOptions {
-
-	query := r.URL.Query().Get("query")
+func getFromForm(values url.Values) *RequestOptions {
+	query := values.Get("query")
 	if query != "" {
-
 		// get variables map
 		var variables map[string]interface{}
-		variablesStr := r.URL.Query().Get("variables")
+		variablesStr := values.Get("variables")
 		json.Unmarshal([]byte(variablesStr), variables)
 
 		return &RequestOptions{
 			Query:         query,
 			Variables:     variables,
-			OperationName: r.URL.Query().Get("operationName"),
+			OperationName: values.Get("operationName"),
 		}
 	}
+
+	return nil
+}
+
+// RequestOptions Parses a http.Request into GraphQL request options struct
+func NewRequestOptions(r *http.Request) *RequestOptions {
+	if reqOpt := getFromForm(r.URL.Query()); reqOpt != nil {
+		return reqOpt
+	}
+
 	if r.Method != "POST" {
 		return &RequestOptions{}
 	}
+
 	if r.Body == nil {
 		return &RequestOptions{}
 	}
@@ -76,16 +83,16 @@ func NewRequestOptions(r *http.Request) *RequestOptions {
 			Query: string(body),
 		}
 	case ContentTypeFormURLEncoded:
-		var opts RequestOptions
-		err := r.ParseForm()
-		if err != nil {
+		if err := r.ParseForm(); err != nil {
 			return &RequestOptions{}
 		}
-		err = decoder.Decode(&opts, r.PostForm)
-		if err != nil {
-			return &RequestOptions{}
+
+		if reqOpt := getFromForm(r.PostForm); reqOpt != nil {
+			return reqOpt
 		}
-		return &opts
+
+		return &RequestOptions{}
+
 	case ContentTypeJSON:
 		fallthrough
 	default:
@@ -122,8 +129,18 @@ func (h *Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r *
 	}
 	result := graphql.Do(params)
 
-	// render result
-	h.render.JSON(w, http.StatusOK, result)
+	
+	if h.pretty {
+		w.WriteHeader(http.StatusOK)
+		buff, _ := json.MarshalIndent(result, "", "\t")
+
+		w.Write(buff)
+	} else {
+		w.WriteHeader(http.StatusOK)
+		buff, _ := json.Marshal(result)
+	
+		w.Write(buff)
+	}
 }
 
 // ServeHTTP provides an entrypoint into executing graphQL queries.
@@ -150,11 +167,9 @@ func New(p *Config) *Handler {
 	if p.Schema == nil {
 		panic("undefined GraphQL schema")
 	}
-	r := render.New(render.Options{
-		IndentJSON: p.Pretty,
-	})
+
 	return &Handler{
 		Schema: p.Schema,
-		render: r,
+		pretty: p.Pretty,
 	}
 }

handler_test.go

@@ -83,8 +83,7 @@ func TestContextPropagated(t *testing.T) {
 	}
 }
 
-func TestHandler_BasicQuery(t *testing.T) {
-
+func TestHandler_BasicQuery_Pretty(t *testing.T) {
 	expected := &graphql.Result{
 		Data: map[string]interface{}{
 			"rebels": map[string]interface{}{
@@ -108,6 +107,32 @@ func TestHandler_BasicQuery(t *testing.T) {
 		t.Fatalf("wrong result, graphql result diff: %v", testutil.Diff(expected, result))
 	}
 }
+
+func TestHandler_BasicQuery_Ugly(t *testing.T) {
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"rebels": map[string]interface{}{
+				"id":   "RmFjdGlvbjox",
+				"name": "Alliance to Restore the Republic",
+			},
+		},
+	}
+	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,
+	})
+	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))
+	}
+}
+
 func TestHandler_Params_NilParams(t *testing.T) {
 	defer func() {
 		if r := recover(); r != nil {