Skip to content

Return destination write errors from rendering engines #115

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
bensynapse wants to merge 1 commit into
base: v1
Choose a base branch
from
Open

Return destination write errors from rendering engines #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 30 additions & 18 deletions engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ func (d Data) Render(w io.Writer, v interface{}) error {
d.Write(hw)
}

_, _ = w.Write(v.([]byte))
_, err := w.Write(v.([]byte))

return nil
return err
}

// Render a HTML response.
Expand All @@ -110,9 +110,9 @@ func (h HTML) Render(w io.Writer, binding interface{}) error {
h.Write(hw)
}

_, _ = buf.WriteTo(w)
_, err = buf.WriteTo(w)

return nil
return err
}

// Render a JSON response.
Expand Down Expand Up @@ -141,17 +141,19 @@ func (j JSON) Render(w io.Writer, v interface{}) error {
}

if len(j.Prefix) > 0 {
_, _ = w.Write(j.Prefix)
if _, err := w.Write(j.Prefix); err != nil {
return err
}
}

// Remove the newline that json.Encode injects when not indenting the output.
if !j.Indent {
output = bytes.TrimSuffix(output, []byte("\n"))
}

_, _ = w.Write(output)
_, err := w.Write(output)

return nil
return err
}

func (j JSON) renderStreamingJSON(w io.Writer, v interface{}) error {
Expand All @@ -160,7 +162,9 @@ func (j JSON) renderStreamingJSON(w io.Writer, v interface{}) error {
}

if len(j.Prefix) > 0 {
_, _ = w.Write(j.Prefix)
if _, err := w.Write(j.Prefix); err != nil {
return err
}
}

encoder := j.Encoder(w)
Expand Down Expand Up @@ -194,16 +198,22 @@ func (j JSONP) Render(w io.Writer, v interface{}) error {
j.Write(hw)
}

_, _ = w.Write([]byte(j.Callback + "("))
_, _ = w.Write(result)
_, _ = w.Write([]byte(");"))
if _, err = w.Write([]byte(j.Callback + "(")); err != nil {
return err
}
if _, err = w.Write(result); err != nil {
return err
}
if _, err = w.Write([]byte(");")); err != nil {
return err
}

// If indenting, append a new line.
if j.Indent {
_, _ = w.Write([]byte("\n"))
_, err = w.Write([]byte("\n"))
}

return nil
return err
}

// Render a text response.
Expand All @@ -217,9 +227,9 @@ func (t Text) Render(w io.Writer, v interface{}) error {
t.Write(hw)
}

_, _ = w.Write([]byte(v.(string)))
_, err := w.Write([]byte(v.(string)))

return nil
return err
}

// Render an XML response.
Expand All @@ -245,10 +255,12 @@ func (x XML) Render(w io.Writer, v interface{}) error {
}

if len(x.Prefix) > 0 {
_, _ = w.Write(x.Prefix)
if _, err = w.Write(x.Prefix); err != nil {
return err
}
}

_, _ = w.Write(result)
_, err = w.Write(result)

return nil
return err
}
Loading