mirror of
https://github.com/labstack/echo.git
synced 2025-01-12 01:22:21 +02:00
JSON Pretty Print
This commit is contained in:
parent
f5bf0eb0dd
commit
1bfd7762ca
14
context.go
14
context.go
@ -156,7 +156,19 @@ func (c *Context) String(code int, format string, a ...interface{}) (err error)
|
|||||||
|
|
||||||
// JSON sends a JSON response with status code.
|
// JSON sends a JSON response with status code.
|
||||||
func (c *Context) JSON(code int, i interface{}) (err error) {
|
func (c *Context) JSON(code int, i interface{}) (err error) {
|
||||||
b, err := json.Marshal(i)
|
return c.JSONPrettyPrint(code, i, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
// JSON sends a pretty printed JSON response with status code.
|
||||||
|
func (c *Context) JSONPrettyPrint(code int, i interface{}, prettyPrint bool) (err error) {
|
||||||
|
var b []byte
|
||||||
|
|
||||||
|
if prettyPrint {
|
||||||
|
b, err = json.MarshalIndent(i, " ", " ")
|
||||||
|
} else {
|
||||||
|
b, err = json.Marshal(i)
|
||||||
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,7 @@ func (t *Template) Render(w io.Writer, name string, data interface{}) error {
|
|||||||
|
|
||||||
func TestContext(t *testing.T) {
|
func TestContext(t *testing.T) {
|
||||||
userJSON := `{"id":"1","name":"Joe"}`
|
userJSON := `{"id":"1","name":"Joe"}`
|
||||||
|
userJSONPrettyPrint := "{\n \"id\": \"1\",\n \"name\": \"Joe\"\n }"
|
||||||
userXML := `<user><id>1</id><name>Joe</name></user>`
|
userXML := `<user><id>1</id><name>Joe</name></user>`
|
||||||
|
|
||||||
req, _ := http.NewRequest(POST, "/", strings.NewReader(userJSON))
|
req, _ := http.NewRequest(POST, "/", strings.NewReader(userJSON))
|
||||||
@ -97,6 +98,26 @@ func TestContext(t *testing.T) {
|
|||||||
assert.Equal(t, userJSON, rec.Body.String())
|
assert.Equal(t, userJSON, rec.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// JSONPrettyPrint (pretty)
|
||||||
|
rec = httptest.NewRecorder()
|
||||||
|
c = NewContext(req, NewResponse(rec), New())
|
||||||
|
err = c.JSONPrettyPrint(http.StatusOK, user{"1", "Joe"}, true)
|
||||||
|
if assert.NoError(t, err) {
|
||||||
|
assert.Equal(t, http.StatusOK, rec.Code)
|
||||||
|
assert.Equal(t, ApplicationJSONCharsetUTF8, rec.Header().Get(ContentType))
|
||||||
|
assert.Equal(t, userJSONPrettyPrint, rec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// JSONPrettyPrint (not pretty)
|
||||||
|
rec = httptest.NewRecorder()
|
||||||
|
c = NewContext(req, NewResponse(rec), New())
|
||||||
|
err = c.JSONPrettyPrint(http.StatusOK, user{"1", "Joe"}, false)
|
||||||
|
if assert.NoError(t, err) {
|
||||||
|
assert.Equal(t, http.StatusOK, rec.Code)
|
||||||
|
assert.Equal(t, ApplicationJSONCharsetUTF8, rec.Header().Get(ContentType))
|
||||||
|
assert.Equal(t, userJSON, rec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
// JSONP
|
// JSONP
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
c = NewContext(req, NewResponse(rec), New())
|
c = NewContext(req, NewResponse(rec), New())
|
||||||
|
Loading…
Reference in New Issue
Block a user