diff --git a/ace/ace.go b/ace/ace.go index 62a9e2c..31140d0 100644 --- a/ace/ace.go +++ b/ace/ace.go @@ -32,14 +32,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine if len(funcmap) > 0 { engine.funcs = funcmap[0] } - if err := engine.load(); err != nil { + if err := engine.Parse(); err != nil { log.Fatalf("ace.New(): %v", err) } return engine } -// load parses the templates to the engine. -func (e *Engine) load() error { +// Parse parses the templates to the engine. +func (e *Engine) Parse() error { // Loop trough each directory and register template files err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error { path = strings.TrimRight(path, ".") diff --git a/amber/amber.go b/amber/amber.go index eac8428..0bf97ef 100644 --- a/amber/amber.go +++ b/amber/amber.go @@ -32,14 +32,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine if len(funcmap) > 0 { amber.FuncMap = funcmap[0] } - if err := engine.load(); err != nil { + if err := engine.Parse(); err != nil { log.Fatalf("amber.New(): %v", err) } return engine } -// load parses the templates to the engine. -func (e *Engine) load() error { +// Parse parses the templates to the engine. +func (e *Engine) Parse() error { // Loop trough each directory and register template files err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error { // Return error if exist diff --git a/django/django.go b/django/django.go index 30b642a..a99b0a2 100644 --- a/django/django.go +++ b/django/django.go @@ -31,14 +31,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine if len(funcmap) > 0 { // pongo2.RegisterFilter() } - if err := engine.load(); err != nil { + if err := engine.Parse(); err != nil { log.Fatalf("django.New(): %v", err) } return engine } -// Load parses the templates to the engine. -func (e *Engine) load() error { +// Parse parses the templates to the engine. +func (e *Engine) Parse() error { // Loop trough each directory and register template files err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error { // Return error if exist diff --git a/handlebars/handlebars.go b/handlebars/handlebars.go index b711e91..195f39f 100644 --- a/handlebars/handlebars.go +++ b/handlebars/handlebars.go @@ -31,14 +31,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine if len(funcmap) > 0 { raymond.RegisterHelpers(funcmap[0]) } - if err := engine.load(); err != nil { + if err := engine.Parse(); err != nil { log.Fatalf("handlebars.New(): %v", err) } return engine } -// Load parses the templates to the engine. -func (e *Engine) load() error { +// Parse parses the templates to the engine. +func (e *Engine) Parse() error { // Loop trough each directory and register template files err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error { // Return error if exist diff --git a/html/html.go b/html/html.go index 336cd06..8880226 100644 --- a/html/html.go +++ b/html/html.go @@ -28,14 +28,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine if len(funcmap) > 0 { engine.Templates.Funcs(funcmap[0]) } - if err := engine.load(); err != nil { + if err := engine.Parse(); err != nil { log.Fatalf("html.New(): %v", err) } return engine } -// load parses the templates to the engine. -func (e *Engine) load() error { +// Parse parses the templates to the engine. +func (e *Engine) Parse() error { // Loop trough each directory and register template files err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error { // Return error if exist diff --git a/jet/jet.go b/jet/jet.go index dd5ee4a..edf8087 100644 --- a/jet/jet.go +++ b/jet/jet.go @@ -2,6 +2,7 @@ package jet import ( "io" + "log" "github.com/CloudyKit/jet" ) @@ -19,16 +20,24 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine engine := &Engine{ directory: directory, extension: extension, - Templates: jet.NewHTMLSet(directory), } if len(funcmap) > 0 { for key, value := range funcmap[0] { engine.Templates.AddGlobal(key, value) } } + if err := engine.Parse(); err != nil { + log.Fatalf("jet.New(): %v", err) + } return engine } +// Parse parses the templates to the engine. +func (e *Engine) Parse() error { + e.Templates = jet.NewHTMLSet(e.directory) + return nil +} + func getJetBinding(binding interface{}) jet.VarMap { if binding == nil { return nil diff --git a/mustache/mustache.go b/mustache/mustache.go index 62446d8..a10162b 100644 --- a/mustache/mustache.go +++ b/mustache/mustache.go @@ -31,14 +31,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine if len(funcmap) > 0 { //raymond.RegisterHelpers(funcmap[0]) } - if err := engine.load(); err != nil { + if err := engine.Parse(); err != nil { log.Fatalf("mustache.New(): %v", err) } return engine } -// Load parses the templates to the engine. -func (e *Engine) load() error { +// Parse parses the templates to the engine. +func (e *Engine) Parse() error { // Loop trough each directory and register template files err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error { // Return error if exist diff --git a/pug/pug.go b/pug/pug.go index 337f2ac..6b12583 100644 --- a/pug/pug.go +++ b/pug/pug.go @@ -31,14 +31,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine if len(funcmap) > 0 { engine.Templates.Funcs(funcmap[0]) } - if err := engine.load(); err != nil { + if err := engine.Parse(); err != nil { log.Fatalf("pug.New(): %v", err) } return engine } -// load parses the templates to the engine. -func (e *Engine) load() error { +// Parse parses the templates to the engine. +func (e *Engine) Parse() error { // Loop trough each directory and register template files err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error { // Return error if exist