small bug fixes to template caching

render/template.go

@@ -69,10 +69,8 @@ func (s *templateRenderer) source(name string) (*raymond.Template, error) {
 	var ok bool
 	var err error
 	if s.CacheTemplates {
-		s.moot.Lock()
-		defer s.moot.Unlock()
 		if t, ok = s.templateCache[name]; ok {
-			return t, nil
+			return t.Clone(), nil
 		}
 	}
 	b, err := ioutil.ReadFile(filepath.Join(s.TemplatesPath, name))
@@ -91,10 +89,9 @@ func (s *templateRenderer) source(name string) (*raymond.Template, error) {
 	}
 	t.RegisterHelpers(s.Helpers)
 	if s.CacheTemplates {
-		s.moot.Lock()
 		s.templateCache[name] = t
 	}
-	return t, err
+	return t.Clone(), err
 }
 
 func (s *templateRenderer) partial(name string, data Data) (raymond.SafeString, error) {

render/template_test.go

@@ -73,3 +73,32 @@ func Test_Template_Partial(t *testing.T) {
 		r.Equal("Foo -> Mark", strings.TrimSpace(bb.String()))
 	}
 }
+
+func Test_Template_WithCaching(t *testing.T) {
+	r := require.New(t)
+
+	tmpFile, err := ioutil.TempFile("", "test")
+	r.NoError(err)
+	defer os.Remove(tmpFile.Name())
+
+	_, err = tmpFile.Write([]byte("{{name}}"))
+	r.NoError(err)
+
+	type ji func(string, ...string) render.Renderer
+
+	table := []ji{
+		render.Template,
+		render.New(render.Options{
+			CacheTemplates: true,
+		}).Template,
+	}
+
+	for _, j := range table {
+		re := j("foo/bar", tmpFile.Name())
+		r.Equal("foo/bar", re.ContentType())
+		bb := &bytes.Buffer{}
+		err = re.Render(bb, render.Data{"name": "Mark"})
+		r.NoError(err)
+		r.Equal("Mark", strings.TrimSpace(bb.String()))
+	}
+}