Skip to content

Commit fd53cec

Browse files
authored
Merge pull request #7 from Fenny/master
Make Parse Public
2 parents cdd9840 + 4c57d7f commit fd53cec

File tree

8 files changed

+31
-22
lines changed

8 files changed

+31
-22
lines changed

ace/ace.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine
3232
if len(funcmap) > 0 {
3333
engine.funcs = funcmap[0]
3434
}
35-
if err := engine.load(); err != nil {
35+
if err := engine.Parse(); err != nil {
3636
log.Fatalf("ace.New(): %v", err)
3737
}
3838
return engine
3939
}
4040

41-
// load parses the templates to the engine.
42-
func (e *Engine) load() error {
41+
// Parse parses the templates to the engine.
42+
func (e *Engine) Parse() error {
4343
// Loop trough each directory and register template files
4444
err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error {
4545
path = strings.TrimRight(path, ".")

amber/amber.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine
3232
if len(funcmap) > 0 {
3333
amber.FuncMap = funcmap[0]
3434
}
35-
if err := engine.load(); err != nil {
35+
if err := engine.Parse(); err != nil {
3636
log.Fatalf("amber.New(): %v", err)
3737
}
3838
return engine
3939
}
4040

41-
// load parses the templates to the engine.
42-
func (e *Engine) load() error {
41+
// Parse parses the templates to the engine.
42+
func (e *Engine) Parse() error {
4343
// Loop trough each directory and register template files
4444
err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error {
4545
// Return error if exist

django/django.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine
3131
if len(funcmap) > 0 {
3232
// pongo2.RegisterFilter()
3333
}
34-
if err := engine.load(); err != nil {
34+
if err := engine.Parse(); err != nil {
3535
log.Fatalf("django.New(): %v", err)
3636
}
3737
return engine
3838
}
3939

40-
// Load parses the templates to the engine.
41-
func (e *Engine) load() error {
40+
// Parse parses the templates to the engine.
41+
func (e *Engine) Parse() error {
4242
// Loop trough each directory and register template files
4343
err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error {
4444
// Return error if exist

handlebars/handlebars.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine
3131
if len(funcmap) > 0 {
3232
raymond.RegisterHelpers(funcmap[0])
3333
}
34-
if err := engine.load(); err != nil {
34+
if err := engine.Parse(); err != nil {
3535
log.Fatalf("handlebars.New(): %v", err)
3636
}
3737
return engine
3838
}
3939

40-
// Load parses the templates to the engine.
41-
func (e *Engine) load() error {
40+
// Parse parses the templates to the engine.
41+
func (e *Engine) Parse() error {
4242
// Loop trough each directory and register template files
4343
err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error {
4444
// Return error if exist

html/html.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine
2828
if len(funcmap) > 0 {
2929
engine.Templates.Funcs(funcmap[0])
3030
}
31-
if err := engine.load(); err != nil {
31+
if err := engine.Parse(); err != nil {
3232
log.Fatalf("html.New(): %v", err)
3333
}
3434
return engine
3535
}
3636

37-
// load parses the templates to the engine.
38-
func (e *Engine) load() error {
37+
// Parse parses the templates to the engine.
38+
func (e *Engine) Parse() error {
3939
// Loop trough each directory and register template files
4040
err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error {
4141
// Return error if exist

jet/jet.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package jet
22

33
import (
44
"io"
5+
"log"
56

67
"github.com/CloudyKit/jet"
78
)
@@ -19,16 +20,24 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine
1920
engine := &Engine{
2021
directory: directory,
2122
extension: extension,
22-
Templates: jet.NewHTMLSet(directory),
2323
}
2424
if len(funcmap) > 0 {
2525
for key, value := range funcmap[0] {
2626
engine.Templates.AddGlobal(key, value)
2727
}
2828
}
29+
if err := engine.Parse(); err != nil {
30+
log.Fatalf("jet.New(): %v", err)
31+
}
2932
return engine
3033
}
3134

35+
// Parse parses the templates to the engine.
36+
func (e *Engine) Parse() error {
37+
e.Templates = jet.NewHTMLSet(e.directory)
38+
return nil
39+
}
40+
3241
func getJetBinding(binding interface{}) jet.VarMap {
3342
if binding == nil {
3443
return nil

mustache/mustache.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine
3131
if len(funcmap) > 0 {
3232
//raymond.RegisterHelpers(funcmap[0])
3333
}
34-
if err := engine.load(); err != nil {
34+
if err := engine.Parse(); err != nil {
3535
log.Fatalf("mustache.New(): %v", err)
3636
}
3737
return engine
3838
}
3939

40-
// Load parses the templates to the engine.
41-
func (e *Engine) load() error {
40+
// Parse parses the templates to the engine.
41+
func (e *Engine) Parse() error {
4242
// Loop trough each directory and register template files
4343
err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error {
4444
// Return error if exist

pug/pug.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ func New(directory, extension string, funcmap ...map[string]interface{}) *Engine
3131
if len(funcmap) > 0 {
3232
engine.Templates.Funcs(funcmap[0])
3333
}
34-
if err := engine.load(); err != nil {
34+
if err := engine.Parse(); err != nil {
3535
log.Fatalf("pug.New(): %v", err)
3636
}
3737
return engine
3838
}
3939

40-
// load parses the templates to the engine.
41-
func (e *Engine) load() error {
40+
// Parse parses the templates to the engine.
41+
func (e *Engine) Parse() error {
4242
// Loop trough each directory and register template files
4343
err := filepath.Walk(e.directory, func(path string, info os.FileInfo, err error) error {
4444
// Return error if exist

0 commit comments

Comments
 (0)