New Render API

render/html.go

@@ -1,66 +1,57 @@
 package render
 
 import (
-	"errors"
-	"fmt"
 	"html/template"
 	"net/http"
 )
 
 type (
-	HTMLRender struct {
+	HTMLRender interface {
+		Instance(string, interface{}) Render
+	}
+
+	HTMLProduction struct {
 		Template *template.Template
 	}
 
-	htmlPlainRender struct{}
-
-	HTMLDebugRender struct {
+	HTMLDebug struct {
 		Files []string
 		Glob  string
 	}
+
+	HTML struct {
+		Template *template.Template
+		Name     string
+		Data     interface{}
+	}
 )
 
-func (html HTMLRender) Render(w http.ResponseWriter, code int, data ...interface{}) error {
-	writeHeader(w, code, "text/html; charset=utf-8")
-	file := data[0].(string)
-	args := data[1]
-	return html.Template.ExecuteTemplate(w, file, args)
-}
-
-func (r *HTMLDebugRender) Render(w http.ResponseWriter, code int, data ...interface{}) error {
-	writeHeader(w, code, "text/html; charset=utf-8")
-	file := data[0].(string)
-	obj := data[1]
-
-	if t, err := r.loadTemplate(); err == nil {
-		return t.ExecuteTemplate(w, file, obj)
-	} else {
-		return err
+func (r HTMLProduction) Instance(name string, data interface{}) Render {
+	return HTML{
+		Template: r.Template,
+		Name:     name,
+		Data:     data,
 	}
 }
 
-func (r *HTMLDebugRender) loadTemplate() (*template.Template, error) {
+func (r HTMLDebug) Instance(name string, data interface{}) Render {
+	return HTML{
+		Template: r.loadTemplate(),
+		Name:     name,
+		Data:     data,
+	}
+}
+func (r HTMLDebug) loadTemplate() *template.Template {
 	if len(r.Files) > 0 {
-		return template.ParseFiles(r.Files...)
+		return template.Must(template.ParseFiles(r.Files...))
 	}
 	if len(r.Glob) > 0 {
-		return template.ParseGlob(r.Glob)
+		return template.Must(template.ParseFiles(r.Files...))
 	}
-	return nil, errors.New("the HTML debug render was created without files or glob pattern")
+	panic("the HTML debug render was created without files or glob pattern")
 }
 
-func (_ htmlPlainRender) Render(w http.ResponseWriter, code int, data ...interface{}) error {
-	format := data[0].(string)
-	values := data[1].([]interface{})
-	WriteHTMLString(w, code, format, values)
-	return nil
-}
-
-func WriteHTMLString(w http.ResponseWriter, code int, format string, values []interface{}) {
-	writeHeader(w, code, "text/html; charset=utf-8")
-	if len(values) > 0 {
-		fmt.Fprintf(w, format, values...)
-	} else {
-		w.Write([]byte(format))
-	}
+func (r HTML) Write(w http.ResponseWriter) error {
+	w.Header().Set("Content-Type", "text/html; charset=utf-8")
+	return r.Template.ExecuteTemplate(w, r.Name, r.Data)
 }