common: validation and generating unique template names
This commit is contained in:
parent
56728e6509
commit
7883d937a6
|
@ -8,12 +8,17 @@ import (
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Template processes string data as a text/template with some common
|
||||||
|
// elements and functions available. Plugin creators should process as
|
||||||
|
// many fields as possible through this.
|
||||||
type Template struct {
|
type Template struct {
|
||||||
UserData map[string]string
|
UserData map[string]string
|
||||||
|
|
||||||
root *template.Template
|
root *template.Template
|
||||||
|
i int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewTemplate creates a new template processor.
|
||||||
func NewTemplate() (*Template, error) {
|
func NewTemplate() (*Template, error) {
|
||||||
result := &Template{
|
result := &Template{
|
||||||
UserData: make(map[string]string),
|
UserData: make(map[string]string),
|
||||||
|
@ -28,8 +33,9 @@ func NewTemplate() (*Template, error) {
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Process processes a single string, compiling and executing the template.
|
||||||
func (t *Template) Process(s string, data interface{}) (string, error) {
|
func (t *Template) Process(s string, data interface{}) (string, error) {
|
||||||
tpl, err := t.root.New("tpl").Parse(s)
|
tpl, err := t.root.New(t.nextTemplateName()).Parse(s)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
@ -42,6 +48,18 @@ func (t *Template) Process(s string, data interface{}) (string, error) {
|
||||||
return buf.String(), nil
|
return buf.String(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Validate the template.
|
||||||
|
func (t *Template) Validate(s string) error {
|
||||||
|
_, err := t.root.New(t.nextTemplateName()).Parse(s)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Template) nextTemplateName() string {
|
||||||
|
name := fmt.Sprintf("tpl%d", t.i)
|
||||||
|
t.i++
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
// User is the function exposed as "user" within the templates and
|
// User is the function exposed as "user" within the templates and
|
||||||
// looks up user variables.
|
// looks up user variables.
|
||||||
func (t *Template) templateUser(n string) (string, error) {
|
func (t *Template) templateUser(n string) (string, error) {
|
||||||
|
|
|
@ -46,3 +46,22 @@ func TestTemplateProcess_user(t *testing.T) {
|
||||||
t.Fatalf("bad: %s", result)
|
t.Fatalf("bad: %s", result)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestTemplateValidate(t *testing.T) {
|
||||||
|
tpl, err := NewTemplate()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("err: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Valid
|
||||||
|
err = tpl.Validate(`{{user "foo"}}`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("err: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Invalid
|
||||||
|
err = tpl.Validate(`{{idontexist}}`)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("should have error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue