Refactored isomorphic template rendering code

template.go

@@ -9,7 +9,7 @@ import (
 	"bytes"
 	"errors"
 	"html/template"
-	"net/http"
+	"io"
 	"strings"
 
 	"honnef.co/go/js/dom"
@@ -40,11 +40,11 @@ const (
 )
 
 type RenderParams struct {
-	Data           interface{}
-	ResponseWriter http.ResponseWriter
-	Element        dom.Element
-	Disposition    int8
-	Attributes     map[string]string
+	Data        interface{}
+	Writer      io.Writer
+	Element     dom.Element
+	Disposition int8
+	Attributes  map[string]string
 }
 
 func (t *Template) GetTemplateType() int8 {
@@ -82,7 +82,7 @@ func (t *Template) NameWithPrefix() string {
 
 func (t *Template) Render(params *RenderParams) error {
 
-	if OperatingEnvironment() == ServerEnvironment && (params.ResponseWriter == nil) {
+	if OperatingEnvironment() == ServerEnvironment && (params.Writer == nil) {
 		return errors.New("Either the response writer and/or the request is nil!")
 	}
 
@@ -135,7 +135,7 @@ func (t *Template) RenderTemplateOnClient(params *RenderParams) {
 
 func (t *Template) RenderTemplateOnServer(params *RenderParams) {
 
-	w := params.ResponseWriter
+	w := params.Writer
 
 	var tpl bytes.Buffer
 	if err := t.Execute(&tpl, params.Data); err != nil {

templatesetcontents.go → templatebundle.go

@@ -13,24 +13,24 @@ import (
 	"strings"
 )
 
-type TemplateSetContents struct {
+type TemplateBundle struct {
 	items map[string]string
 }
 
-func NewTemplateSetContents() *TemplateSetContents {
+func NewTemplateBundle() *TemplateBundle {
 
-	return &TemplateSetContents{
+	return &TemplateBundle{
 		items: map[string]string{},
 		// Funcs:   template.FuncMap{},
 	}
 
 }
 
-func (tsc *TemplateSetContents) Items() map[string]string {
-	return tsc.items
+func (t *TemplateBundle) Items() map[string]string {
+	return t.items
 }
 
-func (tsc *TemplateSetContents) importTemplateFileContents() error {
+func (t *TemplateBundle) importTemplateFileContents() error {
 
 	templateDirectory := filepath.Clean(TemplateFilesPath)
 
@@ -38,7 +38,7 @@ func (tsc *TemplateSetContents) importTemplateFileContents() error {
 		if strings.HasSuffix(path, TemplateFileExtension) {
 			name := strings.TrimSuffix(strings.TrimPrefix(path, templateDirectory+string(os.PathSeparator)), TemplateFileExtension)
 			contents, err := ioutil.ReadFile(path)
-			tsc.items[name] = string(contents)
+			t.items[name] = string(contents)
 
 			if err != nil {
 				fmt.Println("error encountered while walking directory: ", err)

templateset.go

@@ -12,9 +12,9 @@ import (
 )
 
 type TemplateSet struct {
-	members  map[string]*Template
-	Funcs    template.FuncMap
-	contents *TemplateSetContents
+	members map[string]*Template
+	Funcs   template.FuncMap
+	bundle  *TemplateBundle
 }
 
 func NewTemplateSet() *TemplateSet {
@@ -28,8 +28,8 @@ func (t *TemplateSet) Members() map[string]*Template {
 	return t.members
 }
 
-func (t *TemplateSet) Contents() *TemplateSetContents {
-	return t.contents
+func (t *TemplateSet) Bundle() *TemplateBundle {
+	return t.bundle
 }
 
 func (t *TemplateSet) AddTemplateFile(name, filename string, templateType int8) error {
@@ -101,7 +101,7 @@ func (t *TemplateSet) ImportTemplatesFromMap(templateMap map[string]string) erro
 	return nil
 }
 
-func (t *TemplateSet) RenderMember(templateName string, params *RenderParams) {
+func (t *TemplateSet) Render(templateName string, params *RenderParams) {
 
 	t.Members()[templateName].Render(params)
 
@@ -109,9 +109,9 @@ func (t *TemplateSet) RenderMember(templateName string, params *RenderParams) {
 
 func (t *TemplateSet) GatherTemplates() {
 
-	contents := NewTemplateSetContents()
-	contents.importTemplateFileContents()
-	t.ImportTemplatesFromMap(contents.Items())
-	t.contents = contents
+	bundle := NewTemplateBundle()
+	bundle.importTemplateFileContents()
+	t.ImportTemplatesFromMap(bundle.Items())
+	t.bundle = bundle
 
 }