Merge branch 'master' into logging

Author: matryer

.travis.yml

@@ -3,7 +3,7 @@ language: go
 go:
   - 1.7.x
   - 1.8.x
-  - master
+  - 1.9.x
 
 before_install:
   - go get github.com/golang/lint/golint

README.md

@@ -1,4 +1,4 @@
-# graphql [![GoDoc](https://godoc.org/github.com/machinebox/graphql?status.png)](http://godoc.org/github.com/machinebox/graphql) [![Build Status](https://travis-ci.org/machinebox/graphql.svg?branch=master)](https://travis-ci.org/machinebox/graphql)
+# graphql [![GoDoc](https://godoc.org/github.com/machinebox/graphql?status.png)](http://godoc.org/github.com/machinebox/graphql) [![Build Status](https://travis-ci.org/machinebox/graphql.svg?branch=master)](https://travis-ci.org/machinebox/graphql) [![Go Report Card](https://goreportcard.com/badge/github.com/machinebox/graphql)](https://goreportcard.com/report/github.com/machinebox/graphql)
 
 Low-level GraphQL client for Go.
 

graphql.go

@@ -107,12 +107,10 @@ func (c *Client) Run(ctx context.Context, req *Request, resp interface{}) error
 		return errors.Wrap(err, "close writer")
 	}
 	c.logf(">> vars:%+v files:%d query:%s", req.vars, len(req.files), req.q)
-	var graphResponse = struct {
-		Data   interface{}
-		Errors []graphErr
-	}{
+	gr := &graphResponse{
 		Data: resp,
 	}
+
 	r, err := http.NewRequest(http.MethodPost, c.endpoint, &requestBody)
 	if err != nil {
 		return err
@@ -130,12 +128,12 @@ func (c *Client) Run(ctx context.Context, req *Request, resp interface{}) error
 		return errors.Wrap(err, "reading body")
 	}
 	c.logf("<< %s", buf.String())
-	if err := json.NewDecoder(&buf).Decode(&graphResponse); err != nil {
+	if err := json.NewDecoder(&buf).Decode(&gr); err != nil {
 		return errors.Wrap(err, "decoding response")
 	}
-	if len(graphResponse.Errors) > 0 {
+	if len(gr.Errors) > 0 {
 		// return first error
-		return graphResponse.Errors[0]
+		return gr.Errors[0]
 	}
 	return nil
 }
@@ -161,6 +159,11 @@ func (e graphErr) Error() string {
 	return "graphql: " + e.Message
 }
 
+type graphResponse struct {
+	Data   interface{}
+	Errors []graphErr
+}
+
 // Request is a GraphQL request.
 type Request struct {
 	q     string