- More unit tests

- Improves HTML debug render
- InputHolder removed
- More debug logs
This commit is contained in:
Manu Mtz-Almeida
2015-05-05 15:06:38 +02:00
parent 0a192fb0fa
commit f414648384
13 changed files with 371 additions and 298 deletions

View File

@ -5,6 +5,7 @@
package render
import (
"errors"
"html/template"
"net/http"
)
@ -19,24 +20,19 @@ func (r *HTMLDebugRender) Render(w http.ResponseWriter, code int, data ...interf
file := data[0].(string)
obj := data[1]
if t, err := r.newTemplate(); err == nil {
if t, err := r.loadTemplate(); err == nil {
return t.ExecuteTemplate(w, file, obj)
} else {
return err
}
}
func (r *HTMLDebugRender) newTemplate() (*template.Template, error) {
t := template.New("")
func (r *HTMLDebugRender) loadTemplate() (*template.Template, error) {
if len(r.Files) > 0 {
if _, err := t.ParseFiles(r.Files...); err != nil {
return nil, err
}
return template.ParseFiles(r.Files...)
}
if len(r.Glob) > 0 {
if _, err := t.ParseGlob(r.Glob); err != nil {
return nil, err
}
return template.ParseGlob(r.Glob)
}
return t, nil
return nil, errors.New("the HTML debug render was created without files or glob pattern")
}

View File

@ -75,5 +75,4 @@ func TestRenderJoinStrings(t *testing.T) {
assert.Equal(t, joinStrings("a", "BB", "c"), "aBBc")
assert.Equal(t, joinStrings("a", "", "c"), "ac")
assert.Equal(t, joinStrings("text/html", "; charset=utf-8"), "text/html; charset=utf-8")
}