define a customized error type to carry status code and body

doc.go

@@ -5,4 +5,4 @@
 // That package is driving the feature development.
 //
 // For now, see README for more details.
-package graphql // import "github.com/shurcooL/graphql"
+package graphql // import "github.com/leslie-qiwa/graphql"

example/graphqldev/main.go

@@ -17,7 +17,7 @@ import (
 	graphqlserver "github.com/graph-gophers/graphql-go"
 	"github.com/graph-gophers/graphql-go/example/starwars"
 	"github.com/graph-gophers/graphql-go/relay"
-	"github.com/shurcooL/graphql"
+	"github.com/leslie-qiwa/graphql"
 )
 
 func main() {

graphql.go

@@ -4,18 +4,19 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 
-	"github.com/shurcooL/graphql/internal/jsonutil"
+	"github.com/leslie-qiwa/graphql/internal/jsonutil"
 	"golang.org/x/net/context/ctxhttp"
 )
 
 // Client is a GraphQL client.
 type Client struct {
 	url        string // GraphQL server URL.
 	httpClient *http.Client
+	logger     io.Writer
 }
 
 // NewClient creates a GraphQL client targeting the specified GraphQL server URL.
@@ -30,6 +31,11 @@ func NewClient(url string, httpClient *http.Client) *Client {
 	}
 }
 
+// SetLogger set verbose logger
+func (c *Client) SetLogger(l io.Writer) {
+	c.logger = l
+}
+
 // Query executes a single GraphQL query request,
 // with a query derived from q, populating the response into it.
 // q should be a pointer to struct that corresponds to the GraphQL schema.
@@ -65,14 +71,17 @@ func (c *Client) do(ctx context.Context, op operationType, v interface{}, variab
 	if err != nil {
 		return err
 	}
+	if c.logger != nil {
+		c.logger.Write(append([]byte("request:\n\t"), buf.Bytes()...))
+	}
 	resp, err := ctxhttp.Post(ctx, c.httpClient, c.url, "application/json", &buf)
 	if err != nil {
 		return err
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
-		body, _ := ioutil.ReadAll(resp.Body)
-		return fmt.Errorf("non-200 OK status code: %v body: %q", resp.Status, body)
+		body, err := ioutil.ReadAll(resp.Body)
+		return &GithubError{Status: resp.Status, StatusCode: resp.StatusCode, Body: body, Err: err}
 	}
 	var out struct {
 		Data   *json.RawMessage
@@ -85,6 +94,9 @@ func (c *Client) do(ctx context.Context, op operationType, v interface{}, variab
 		return err
 	}
 	if out.Data != nil {
+		if c.logger != nil {
+			c.logger.Write(append([]byte("reply:\n\t"), (*out.Data)...))
+		}
 		err := jsonutil.UnmarshalGraphQL(*out.Data, v)
 		if err != nil {
 			// TODO: Consider including response body in returned error, if deemed helpful.

graphql_test.go

@@ -8,7 +8,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/shurcooL/graphql"
+	"github.com/leslie-qiwa/graphql"
 )
 
 func TestClient_Query_partialDataWithErrorResponse(t *testing.T) {

ident/ident_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/shurcooL/graphql/ident"
+	"github.com/leslie-qiwa/graphql/ident"
 )
 
 func Example_lowerCamelCaseToMixedCaps() {

internal/jsonutil/benchmark_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/shurcooL/graphql"
-	"github.com/shurcooL/graphql/internal/jsonutil"
+	"github.com/leslie-qiwa/graphql"
+	"github.com/leslie-qiwa/graphql/internal/jsonutil"
 )
 
 func TestUnmarshalGraphQL_benchmark(t *testing.T) {

internal/jsonutil/graphql_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/shurcooL/graphql"
-	"github.com/shurcooL/graphql/internal/jsonutil"
+	"github.com/leslie-qiwa/graphql"
+	"github.com/leslie-qiwa/graphql/internal/jsonutil"
 )
 
 func TestUnmarshalGraphQL(t *testing.T) {

query.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"sort"
 
-	"github.com/shurcooL/graphql/ident"
+	"github.com/leslie-qiwa/graphql/ident"
 )
 
 func constructQuery(v interface{}, variables map[string]interface{}) string {

scalar.go

@@ -1,5 +1,9 @@
 package graphql
 
+import (
+	"fmt"
+)
+
 // Note: These custom types are meant to be used in queries for now.
 // But the plan is to switch to using native Go types (string, int, bool, time.Time, etc.).
 // See https://github.com/shurcooL/githubv4/issues/9 for details.
@@ -49,3 +53,16 @@ func NewInt(v Int) *Int { return &v }
 
 // NewString is a helper to make a new *String.
 func NewString(v String) *String { return &v }
+
+// GithubError is error to contain http status code and body
+type GithubError struct {
+	Err        error
+	Status     string
+	StatusCode int
+	Body       []byte
+}
+
+// Error is method inherited from error interface
+func (m *GithubError) Error() string {
+	return fmt.Sprintf("non-200 OK status code: %v body: %q", m.Status, m.Body)
+}

scalar_test.go

@@ -3,7 +3,7 @@ package graphql_test
 import (
 	"testing"
 
-	"github.com/shurcooL/graphql"
+	"github.com/leslie-qiwa/graphql"
 )
 
 func TestNewScalars(t *testing.T) {