Browse Source

Using Render() instead of Write()

Manu Mtz-Almeida 10 years ago
parent
commit
1f56e50083
9 changed files with 15 additions and 15 deletions
  1. 1 1
      context.go
  2. 1 1
      render/data.go
  3. 1 1
      render/html.go
  4. 2 2
      render/json.go
  5. 1 1
      render/redirect.go
  6. 1 1
      render/render.go
  7. 6 6
      render/render_test.go
  8. 1 1
      render/text.go
  9. 1 1
      render/xml.go

+ 1 - 1
context.go

@@ -284,7 +284,7 @@ func (c *Context) Header(key, value string) {
 
 func (c *Context) Render(code int, r render.Render) {
 	c.writermem.WriteHeader(code)
-	if err := r.Write(c.Writer); err != nil {
+	if err := r.Render(c.Writer); err != nil {
 		debugPrintError(err)
 		c.AbortWithError(500, err).SetType(ErrorTypeRender)
 	}

+ 1 - 1
render/data.go

@@ -11,7 +11,7 @@ type Data struct {
 	Data        []byte
 }
 
-func (r Data) Write(w http.ResponseWriter) error {
+func (r Data) Render(w http.ResponseWriter) error {
 	if len(r.ContentType) > 0 {
 		w.Header()["Content-Type"] = []string{r.ContentType}
 	}

+ 1 - 1
render/html.go

@@ -57,7 +57,7 @@ func (r HTMLDebug) loadTemplate() *template.Template {
 	panic("the HTML debug render was created without files or glob pattern")
 }
 
-func (r HTML) Write(w http.ResponseWriter) error {
+func (r HTML) Render(w http.ResponseWriter) error {
 	w.Header()["Content-Type"] = htmlContentType
 	if len(r.Name) == 0 {
 		return r.Template.Execute(w, r.Data)

+ 2 - 2
render/json.go

@@ -21,12 +21,12 @@ type (
 
 var jsonContentType = []string{"application/json; charset=utf-8"}
 
-func (r JSON) Write(w http.ResponseWriter) error {
+func (r JSON) Render(w http.ResponseWriter) error {
 	w.Header()["Content-Type"] = jsonContentType
 	return json.NewEncoder(w).Encode(r.Data)
 }
 
-func (r IndentedJSON) Write(w http.ResponseWriter) error {
+func (r IndentedJSON) Render(w http.ResponseWriter) error {
 	w.Header()["Content-Type"] = jsonContentType
 	jsonBytes, err := json.MarshalIndent(r.Data, "", "    ")
 	if err != nil {

+ 1 - 1
render/redirect.go

@@ -15,7 +15,7 @@ type Redirect struct {
 	Location string
 }
 
-func (r Redirect) Write(w http.ResponseWriter) error {
+func (r Redirect) Render(w http.ResponseWriter) error {
 	if r.Code < 300 || r.Code > 308 {
 		panic(fmt.Sprintf("Cannot redirect with status code %d", r.Code))
 	}

+ 1 - 1
render/render.go

@@ -7,7 +7,7 @@ package render
 import "net/http"
 
 type Render interface {
-	Write(http.ResponseWriter) error
+	Render(http.ResponseWriter) error
 }
 
 var (

+ 6 - 6
render/render_test.go

@@ -22,7 +22,7 @@ func TestRenderJSON(t *testing.T) {
 		"foo": "bar",
 	}
 
-	err := (JSON{data}).Write(w)
+	err := (JSON{data}).Render(w)
 
 	assert.NoError(t, err)
 	assert.Equal(t, w.Body.String(), "{\"foo\":\"bar\"}\n")
@@ -36,7 +36,7 @@ func TestRenderIndentedJSON(t *testing.T) {
 		"bar": "foo",
 	}
 
-	err := (IndentedJSON{data}).Write(w)
+	err := (IndentedJSON{data}).Render(w)
 
 	assert.NoError(t, err)
 	assert.Equal(t, w.Body.String(), "{\n    \"bar\": \"foo\",\n    \"foo\": \"bar\"\n}")
@@ -75,7 +75,7 @@ func TestRenderXML(t *testing.T) {
 		"foo": "bar",
 	}
 
-	err := (XML{data}).Write(w)
+	err := (XML{data}).Render(w)
 
 	assert.NoError(t, err)
 	assert.Equal(t, w.Body.String(), "<map><foo>bar</foo></map>")
@@ -93,7 +93,7 @@ func TestRenderData(t *testing.T) {
 	err := (Data{
 		ContentType: "image/png",
 		Data:        data,
-	}).Write(w)
+	}).Render(w)
 
 	assert.NoError(t, err)
 	assert.Equal(t, w.Body.String(), "#!PNG some raw data")
@@ -106,7 +106,7 @@ func TestRenderString(t *testing.T) {
 	err := (String{
 		Format: "hola %s %d",
 		Data:   []interface{}{"manu", 2},
-	}).Write(w)
+	}).Render(w)
 
 	assert.NoError(t, err)
 	assert.Equal(t, w.Body.String(), "hola manu 2")
@@ -122,7 +122,7 @@ func TestRenderHTMLTemplate(t *testing.T) {
 		"name": "alexandernyquist",
 	})
 
-	err := instance.Write(w)
+	err := instance.Render(w)
 
 	assert.NoError(t, err)
 	assert.Equal(t, w.Body.String(), "Hello alexandernyquist")

+ 1 - 1
render/text.go

@@ -17,7 +17,7 @@ type String struct {
 
 var plainContentType = []string{"text/plain; charset=utf-8"}
 
-func (r String) Write(w http.ResponseWriter) error {
+func (r String) Render(w http.ResponseWriter) error {
 	header := w.Header()
 	if _, exist := header["Content-Type"]; !exist {
 		header["Content-Type"] = plainContentType

+ 1 - 1
render/xml.go

@@ -15,7 +15,7 @@ type XML struct {
 
 var xmlContentType = []string{"application/xml; charset=utf-8"}
 
-func (r XML) Write(w http.ResponseWriter) error {
+func (r XML) Render(w http.ResponseWriter) error {
 	w.Header()["Content-Type"] = xmlContentType
 	return xml.NewEncoder(w).Encode(r.Data)
 }