From 153d76e20071f4e963088c9f815aa003e15c4eb9 Mon Sep 17 00:00:00 2001
From: Mark Mindenhall <mark@machineshop.io>
Date: Tue, 10 May 2016 22:54:33 -0600
Subject: [PATCH 1/2] More flexible support for template engines

---
 template.go | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/template.go b/template.go
index 63eae741..3d07ec55 100644
--- a/template.go
+++ b/template.go
@@ -33,13 +33,12 @@ import (
 var (
 	beegoTplFuncMap = make(template.FuncMap)
 	// beeTemplates caching map and supported template file extensions.
-	beeTemplates  = make(map[string]TemplateRenderer)
+	beeTemplates  = make(map[string]*template.Template)
 	templatesLock sync.RWMutex
 	// beeTemplateExt stores the template extension which will build
 	beeTemplateExt = []string{"tpl", "html"}
 	// beeTemplatePreprocessors stores associations of extension -> preprocessor handler
-	beeTemplateEngines = map[string]templateHandler{}
-)
+	beeTemplateEngines = map[string]templatePreProcessor{})
 
 // ExecuteTemplate applies the template with name  to the specified data object,
 // writing the output to wr.
@@ -50,11 +49,22 @@ func ExecuteTemplate(wr io.Writer, name string, data interface{}) error {
 		defer templatesLock.RUnlock()
 	}
 	if t, ok := beeTemplates[name]; ok {
-		err := t.ExecuteTemplate(wr, name, data)
-		if err != nil {
-			logs.Trace("template Execute err:", err)
+		if t.Lookup(name) != nil {
+			err := t.ExecuteTemplate(wr, name, data)
+			if err != nil {
+				logs.Trace("template Execute err:", err)
+			}
+			return err
+		} else {
+			err := t.Execute(wr, data)
+			if err != nil {
+				if err != nil {
+					logs.Trace("template Execute err:", err)
+				}
+				return err
+			}
 		}
-		return err
+		return nil
 	}
 	panic("can't find templatefile in the path:" + name)
 }
@@ -94,10 +104,8 @@ func AddFuncMap(key string, fn interface{}) error {
 	return nil
 }
 
-type templateHandler func(root, path string, funcs template.FuncMap) (TemplateRenderer, error)
-type TemplateRenderer interface {
-	ExecuteTemplate(wr io.Writer, name string, data interface{}) error
-}
+type templatePreProcessor func(root, path string, funcs template.FuncMap) (*template.Template, error)
+
 type templateFile struct {
 	root  string
 	files map[string][]string
@@ -172,7 +180,7 @@ func BuildTemplate(dir string, files ...string) error {
 			if buildAllFiles || utils.InSlice(file, files) {
 				templatesLock.Lock()
 				ext := filepath.Ext(file)
-				var t TemplateRenderer
+				var t *template.Template
 				if len(ext) == 0 {
 					t, err = getTemplate(self.root, file, v...)
 				} else if fn, ok := beeTemplateEngines[ext[1:]]; ok {
@@ -325,7 +333,7 @@ func DelStaticPath(url string) *App {
 	return BeeApp
 }
 
-func AddTemplateEngine(extension string, fn templateHandler) *App {
+func AddTemplateEngine(extension string, fn templatePreProcessor) *App {
 	AddTemplateExt(extension)
 	beeTemplateEngines[extension] = fn
 	return BeeApp

From 24b887063728f4f93d8d6d9a91bf612b3032d303 Mon Sep 17 00:00:00 2001
From: Mark Mindenhall <mark@machineshop.io>
Date: Mon, 23 May 2016 21:43:18 -0600
Subject: [PATCH 2/2] move paren to new line

---
 template.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template.go b/template.go
index 3d07ec55..494acc4f 100644
--- a/template.go
+++ b/template.go
@@ -38,7 +38,8 @@ var (
 	// beeTemplateExt stores the template extension which will build
 	beeTemplateExt = []string{"tpl", "html"}
 	// beeTemplatePreprocessors stores associations of extension -> preprocessor handler
-	beeTemplateEngines = map[string]templatePreProcessor{})
+	beeTemplateEngines = map[string]templatePreProcessor{}
+)
 
 // ExecuteTemplate applies the template with name  to the specified data object,
 // writing the output to wr.