Refactor templates execution; add sprig functions

2 files changed, 26 insertions, 27 deletions

diff --git a/modules/caddyhttp/templates/templates.go b/modules/caddyhttp/templates/templates.go
index 56c3b66..a0fb87f 100644
--- a/modules/caddyhttp/templates/templates.go
+++ b/modules/caddyhttp/templates/templates.go
@@ -6,7 +6,6 @@ import (
 	"io"
 	"net/http"
 	"strconv"
-	"text/template"
 
 	"github.com/caddyserver/caddy"
 	"github.com/caddyserver/caddy/modules/caddyhttp"
@@ -67,29 +66,19 @@ func (t *Templates) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddy
 // executeTemplate executes the template contianed
 // in wb.buf and replaces it with the results.
 func (t *Templates) executeTemplate(wb *responseBuffer, r *http.Request) error {
-	tpl := template.New(r.URL.Path)
-
-	if len(t.Delimiters) == 2 {
-		tpl.Delims(t.Delimiters[0], t.Delimiters[1])
-	}
-
-	parsedTpl, err := tpl.Parse(wb.buf.String())
-	if err != nil {
-		return caddyhttp.Error(http.StatusInternalServerError, err)
-	}
-
 	var fs http.FileSystem
 	if t.FileRoot != "" {
 		fs = http.Dir(t.FileRoot)
 	}
+
 	ctx := &templateContext{
 		Root:       fs,
 		Req:        r,
 		RespHeader: tplWrappedHeader{wb.Header()},
+		config:     t,
 	}
 
-	wb.buf.Reset() // reuse buffer for output
-	err = parsedTpl.Execute(wb.buf, ctx)
+	err := ctx.executeTemplateInBuffer(r.URL.Path, wb.buf)
 	if err != nil {
 		return caddyhttp.Error(http.StatusInternalServerError, err)
 	}
diff --git a/modules/caddyhttp/templates/tplcontext.go b/modules/caddyhttp/templates/tplcontext.go
index 7123c42..31ef666 100644
--- a/modules/caddyhttp/templates/tplcontext.go
+++ b/modules/caddyhttp/templates/tplcontext.go
@@ -17,6 +17,7 @@ import (
 
 	"os"
 
+	"github.com/Masterminds/sprig"
 	"github.com/caddyserver/caddy/modules/caddyhttp"
 	"gopkg.in/russross/blackfriday.v2"
 )
@@ -27,7 +28,8 @@ type templateContext struct {
 	Req        *http.Request
 	Args       []interface{} // defined by arguments to .Include
 	RespHeader tplWrappedHeader
-	server     http.Handler
+
+	config *Templates
 }
 
 // Include returns the contents of filename relative to the site root.
@@ -53,7 +55,12 @@ func (c templateContext) Include(filename string, args ...interface{}) (string,
 
 	c.Args = args
 
-	return c.executeTemplate(filename, bodyBuf.Bytes())
+	err = c.executeTemplateInBuffer(filename, bodyBuf)
+	if err != nil {
+		return "", err
+	}
+
+	return bodyBuf.String(), nil
 }
 
 // HTTPInclude returns the body of a virtual (lightweight) request
@@ -81,25 +88,28 @@ func (c templateContext) HTTPInclude(uri string) (string, error) {
 		return "", fmt.Errorf("http %d", vrw.status)
 	}
 
-	return c.executeTemplate(uri, buf.Bytes())
-}
-
-func (c templateContext) executeTemplate(tplName string, body []byte) (string, error) {
-	tpl, err := template.New(tplName).Parse(string(body))
+	err = c.executeTemplateInBuffer(uri, buf)
 	if err != nil {
 		return "", err
 	}
 
-	buf := bufPool.Get().(*bytes.Buffer)
-	buf.Reset()
-	defer bufPool.Put(buf)
+	return buf.String(), nil
+}
+
+func (c templateContext) executeTemplateInBuffer(tplName string, buf *bytes.Buffer) error {
+	tpl := template.New(tplName).Funcs(sprig.TxtFuncMap())
+	if len(c.config.Delimiters) == 2 {
+		tpl.Delims(c.config.Delimiters[0], c.config.Delimiters[1])
+	}
 
-	err = tpl.Execute(buf, c)
+	parsedTpl, err := tpl.Parse(buf.String())
 	if err != nil {
-		return "", err
+		return err
 	}
 
-	return buf.String(), nil
+	buf.Reset() // reuse buffer for output
+
+	return parsedTpl.Execute(buf, c)
 }
 
 // Now returns the current timestamp.