Skip to content

Making JSON marshaling use Encoder #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Making JSON marshaling use Encoder #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
794217b
Using writer directly for marshalling
sjhitchner May 17, 2018
e70c16a
fixing weirdness with tests only testing root repo not forked repos
May 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions graphiql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package handler_test
package handler

import (
"net/http"
Expand All @@ -7,7 +7,6 @@ import (
"testing"

"github.com/graphql-go/graphql/testutil"
"github.com/graphql-go/handler"
)

func TestRenderGraphiQL(t *testing.T) {
Expand Down Expand Up @@ -61,7 +60,7 @@ func TestRenderGraphiQL(t *testing.T) {

req.Header.Set("Accept", tc.accept)

h := handler.New(&handler.Config{
h := New(&Config{
Schema: &testutil.StarWarsSchema,
GraphiQL: tc.graphiqlEnabled,
})
Expand Down
16 changes: 6 additions & 10 deletions handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,14 @@ func (h *Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r *

// use proper JSON Header
w.Header().Add("Content-Type", "application/json; charset=utf-8")

w.WriteHeader(http.StatusOK)

enc := json.NewEncoder(w)
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)
enc.SetIndent("", "\t")
}
// Not much you can do with this error.
_ = enc.Encode(result)
}

// ServeHTTP provides an entrypoint into executing graphQL queries.
Expand Down
14 changes: 7 additions & 7 deletions handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package handler_test
package handler

import (
"encoding/json"
Expand All @@ -13,7 +13,6 @@ import (
"context"
"github.com/graphql-go/graphql"
"github.com/graphql-go/graphql/testutil"
"github.com/graphql-go/handler"
)

func decodeResponse(t *testing.T, recorder *httptest.ResponseRecorder) *graphql.Result {
Expand All @@ -32,7 +31,8 @@ func decodeResponse(t *testing.T, recorder *httptest.ResponseRecorder) *graphql.
}
return &target
}
func executeTest(t *testing.T, h *handler.Handler, req *http.Request) (*graphql.Result, *httptest.ResponseRecorder) {

func executeTest(t *testing.T, h *Handler, req *http.Request) (*graphql.Result, *httptest.ResponseRecorder) {
resp := httptest.NewRecorder()
h.ServeHTTP(resp, req)
result := decodeResponse(t, resp)
Expand Down Expand Up @@ -67,7 +67,7 @@ func TestContextPropagated(t *testing.T) {
queryString := `query={name}`
req, _ := http.NewRequest("GET", fmt.Sprintf("/graphql?%v", queryString), nil)

h := handler.New(&handler.Config{
h := New(&Config{
Schema: &myNameSchema,
Pretty: true,
})
Expand Down Expand Up @@ -95,7 +95,7 @@ func TestHandler_BasicQuery_Pretty(t *testing.T) {
queryString := `query=query HeroNameQuery { hero { name } }`
req, _ := http.NewRequest("GET", fmt.Sprintf("/graphql?%v", queryString), nil)

h := handler.New(&handler.Config{
h := New(&Config{
Schema: &testutil.StarWarsSchema,
Pretty: true,
})
Expand All @@ -119,7 +119,7 @@ func TestHandler_BasicQuery_Ugly(t *testing.T) {
queryString := `query=query HeroNameQuery { hero { name } }`
req, _ := http.NewRequest("GET", fmt.Sprintf("/graphql?%v", queryString), nil)

h := handler.New(&handler.Config{
h := New(&Config{
Schema: &testutil.StarWarsSchema,
Pretty: false,
})
Expand Down Expand Up @@ -147,6 +147,6 @@ func TestHandler_Params_NilParams(t *testing.T) {
}
t.Fatalf("expected to panic, did not panic")
}()
_ = handler.New(nil)
_ = New(nil)

}