New Render API

render/render_test.go

@@ -18,30 +18,27 @@ import (
 
 func TestRenderJSON(t *testing.T) {
 	w := httptest.NewRecorder()
-	w2 := httptest.NewRecorder()
 	data := map[string]interface{}{
 		"foo": "bar",
 	}
 
-	err := JSON.Render(w, 201, data)
-	WriteJSON(w2, 201, data)
+	err := (JSON{data}).Write(w)
 
-	assert.Equal(t, w, w2)
 	assert.NoError(t, err)
-	assert.Equal(t, w.Code, 201)
 	assert.Equal(t, w.Body.String(), "{\"foo\":\"bar\"}\n")
 	assert.Equal(t, w.Header().Get("Content-Type"), "application/json; charset=utf-8")
 }
 
 func TestRenderIndentedJSON(t *testing.T) {
 	w := httptest.NewRecorder()
-	err := IndentedJSON.Render(w, 202, map[string]interface{}{
+	data := map[string]interface{}{
 		"foo": "bar",
 		"bar": "foo",
-	})
+	}
+
+	err := (IndentedJSON{data}).Write(w)
 
 	assert.NoError(t, err)
-	assert.Equal(t, w.Code, 202)
 	assert.Equal(t, w.Body.String(), "{\n    \"bar\": \"foo\",\n    \"foo\": \"bar\"\n}")
 	assert.Equal(t, w.Header().Get("Content-Type"), "application/json; charset=utf-8")
 }
@@ -74,17 +71,13 @@ func (h xmlmap) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
 
 func TestRenderXML(t *testing.T) {
 	w := httptest.NewRecorder()
-	w2 := httptest.NewRecorder()
 	data := xmlmap{
 		"foo": "bar",
 	}
 
-	err := XML.Render(w, 200, data)
-	WriteXML(w2, 200, data)
+	err := (XML{data}).Write(w)
 
-	assert.Equal(t, w, w2)
 	assert.NoError(t, err)
-	assert.Equal(t, w.Code, 200)
 	assert.Equal(t, w.Body.String(), "<map><foo>bar</foo></map>")
 	assert.Equal(t, w.Header().Get("Content-Type"), "application/xml; charset=utf-8")
 }
@@ -95,53 +88,43 @@ func TestRenderRedirect(t *testing.T) {
 
 func TestRenderData(t *testing.T) {
 	w := httptest.NewRecorder()
-	w2 := httptest.NewRecorder()
 	data := []byte("#!PNG some raw data")
 
-	err := Data.Render(w, 400, "image/png", data)
-	WriteData(w2, 400, "image/png", data)
+	err := (Data{
+		ContentType: "image/png",
+		Data:        data,
+	}).Write(w)
 
-	assert.Equal(t, w, w2)
 	assert.NoError(t, err)
-	assert.Equal(t, w.Code, 400)
 	assert.Equal(t, w.Body.String(), "#!PNG some raw data")
 	assert.Equal(t, w.Header().Get("Content-Type"), "image/png")
 }
 
-func TestRenderPlain(t *testing.T) {
+func TestRenderString(t *testing.T) {
 	w := httptest.NewRecorder()
-	w2 := httptest.NewRecorder()
 
-	err := Plain.Render(w, 400, "hola %s %d", []interface{}{"manu", 2})
-	WritePlainText(w2, 400, "hola %s %d", []interface{}{"manu", 2})
+	err := (String{
+		Format: "hola %s %d",
+		Data:   []interface{}{"manu", 2},
+	}).Write(w)
 
-	assert.Equal(t, w, w2)
 	assert.NoError(t, err)
-	assert.Equal(t, w.Code, 400)
 	assert.Equal(t, w.Body.String(), "hola manu 2")
 	assert.Equal(t, w.Header().Get("Content-Type"), "text/plain; charset=utf-8")
 }
 
-func TestRenderPlainHTML(t *testing.T) {
-	w := httptest.NewRecorder()
-	err := HTMLPlain.Render(w, 401, "hola %s %d", []interface{}{"manu", 2})
-
-	assert.NoError(t, err)
-	assert.Equal(t, w.Code, 401)
-	assert.Equal(t, w.Body.String(), "hola manu 2")
-	assert.Equal(t, w.Header().Get("Content-Type"), "text/html; charset=utf-8")
-}
-
 func TestRenderHTMLTemplate(t *testing.T) {
 	w := httptest.NewRecorder()
 	templ := template.Must(template.New("t").Parse(`Hello {{.name}}`))
-	htmlRender := HTMLRender{Template: templ}
-	err := htmlRender.Render(w, 402, "t", map[string]interface{}{
+
+	htmlRender := HTMLProduction{Template: templ}
+	instance := htmlRender.Instance("t", map[string]interface{}{
 		"name": "alexandernyquist",
 	})
 
+	err := instance.Write(w)
+
 	assert.NoError(t, err)
-	assert.Equal(t, w.Code, 402)
 	assert.Equal(t, w.Body.String(), "Hello alexandernyquist")
 	assert.Equal(t, w.Header().Get("Content-Type"), "text/html; charset=utf-8")
 }