struct field renaming so fields are not exported where not necessary

3 files changed, 58 insertions, 50 deletions

diff --git a/management/editor/dom.go b/management/editor/dom.go
index cf36ad9..7fa2b54 100644
--- a/management/editor/dom.go
+++ b/management/editor/dom.go
@@ -7,9 +7,9 @@ import (
 )
 
 type element struct {
-	TagName string
-	Attrs   map[string]string
-	Name    string
+	tagName string
+	attrs   map[string]string
+	name    string
 	label   string
 	data    string
 	viewBuf *bytes.Buffer
@@ -17,9 +17,9 @@ type element struct {
 
 func newElement(tagName, label, fieldName string, p interface{}, attrs map[string]string) *element {
 	return &element{
-		TagName: tagName,
-		Attrs:   attrs,
-		Name:    tagNameFromStructField(fieldName, p),
+		tagName: tagName,
+		attrs:   attrs,
+		name:    tagNameFromStructField(fieldName, p),
 		label:   label,
 		data:    valueFromStructField(fieldName, p),
 		viewBuf: &bytes.Buffer{},
@@ -33,13 +33,13 @@ func domElementSelfClose(e *element) []byte {
 	if e.label != "" {
 		e.viewBuf.Write([]byte(`<label class="active" for="` + strings.Join(strings.Split(e.label, " "), "-") + `">` + e.label + `</label>`))
 	}
-	e.viewBuf.Write([]byte(`<` + e.TagName + ` value="`))
+	e.viewBuf.Write([]byte(`<` + e.tagName + ` value="`))
 	e.viewBuf.Write([]byte(html.EscapeString(e.data) + `" `))
 
-	for attr, value := range e.Attrs {
+	for attr, value := range e.attrs {
 		e.viewBuf.Write([]byte(attr + `="` + value + `" `))
 	}
-	e.viewBuf.Write([]byte(` name="` + e.Name + `"`))
+	e.viewBuf.Write([]byte(` name="` + e.name + `"`))
 	e.viewBuf.Write([]byte(` />`))
 
 	e.viewBuf.Write([]byte(`</div>`))
@@ -50,12 +50,12 @@ func domElementSelfClose(e *element) []byte {
 // checkbox input tag and thus needs to be created differently
 func domElementCheckbox(e *element) []byte {
 	e.viewBuf.Write([]byte(`<p class="col s6">`))
-	e.viewBuf.Write([]byte(`<` + e.TagName + ` `))
+	e.viewBuf.Write([]byte(`<` + e.tagName + ` `))
 
-	for attr, value := range e.Attrs {
+	for attr, value := range e.attrs {
 		e.viewBuf.Write([]byte(attr + `="` + value + `" `))
 	}
-	e.viewBuf.Write([]byte(` name="` + e.Name + `"`))
+	e.viewBuf.Write([]byte(` name="` + e.name + `"`))
 	e.viewBuf.Write([]byte(` /> `))
 	if e.label != "" {
 		e.viewBuf.Write([]byte(`<label for="` + strings.Join(strings.Split(e.label, " "), "-") + `">` + e.label + `</label>`))
@@ -71,16 +71,16 @@ func domElement(e *element) []byte {
 	if e.label != "" {
 		e.viewBuf.Write([]byte(`<label class="active" for="` + strings.Join(strings.Split(e.label, " "), "-") + `">` + e.label + `</label>`))
 	}
-	e.viewBuf.Write([]byte(`<` + e.TagName + ` `))
+	e.viewBuf.Write([]byte(`<` + e.tagName + ` `))
 
-	for attr, value := range e.Attrs {
+	for attr, value := range e.attrs {
 		e.viewBuf.Write([]byte(attr + `="` + string(value) + `" `))
 	}
-	e.viewBuf.Write([]byte(` name="` + e.Name + `"`))
+	e.viewBuf.Write([]byte(` name="` + e.name + `"`))
 	e.viewBuf.Write([]byte(` >`))
 
 	e.viewBuf.Write([]byte(html.EscapeString(e.data)))
-	e.viewBuf.Write([]byte(`</` + e.TagName + `>`))
+	e.viewBuf.Write([]byte(`</` + e.tagName + `>`))
 
 	e.viewBuf.Write([]byte(`</div>`))
 	return e.viewBuf.Bytes()
@@ -89,12 +89,12 @@ func domElement(e *element) []byte {
 func domElementWithChildrenSelect(e *element, children []*element) []byte {
 	e.viewBuf.Write([]byte(`<div class="input-field col s6">`))
 
-	e.viewBuf.Write([]byte(`<` + e.TagName + ` `))
+	e.viewBuf.Write([]byte(`<` + e.tagName + ` `))
 
-	for attr, value := range e.Attrs {
+	for attr, value := range e.attrs {
 		e.viewBuf.Write([]byte(attr + `="` + string(value) + `" `))
 	}
-	e.viewBuf.Write([]byte(` name="` + e.Name + `"`))
+	e.viewBuf.Write([]byte(` name="` + e.name + `"`))
 	e.viewBuf.Write([]byte(` >`))
 
 	// loop over children and create domElement for each child
@@ -102,7 +102,7 @@ func domElementWithChildrenSelect(e *element, children []*element) []byte {
 		e.viewBuf.Write(domElement(child))
 	}
 
-	e.viewBuf.Write([]byte(`</` + e.TagName + `>`))
+	e.viewBuf.Write([]byte(`</` + e.tagName + `>`))
 
 	if e.label != "" {
 		e.viewBuf.Write([]byte(`<label class="active">` + e.label + `</label>`))
@@ -113,9 +113,9 @@ func domElementWithChildrenSelect(e *element, children []*element) []byte {
 }
 
 func domElementWithChildrenCheckbox(e *element, children []*element) []byte {
-	e.viewBuf.Write([]byte(`<` + e.TagName + ` `))
+	e.viewBuf.Write([]byte(`<` + e.tagName + ` `))
 
-	for attr, value := range e.Attrs {
+	for attr, value := range e.attrs {
 		e.viewBuf.Write([]byte(attr + `="` + value + `" `))
 	}
 
@@ -130,7 +130,7 @@ func domElementWithChildrenCheckbox(e *element, children []*element) []byte {
 		e.viewBuf.Write(domElementCheckbox(child))
 	}
 
-	e.viewBuf.Write([]byte(`</` + e.TagName + `><div class="clear padding">&nbsp;</div>`))
+	e.viewBuf.Write([]byte(`</` + e.tagName + `><div class="clear padding">&nbsp;</div>`))
 
 	return e.viewBuf.Bytes()
 }
diff --git a/management/editor/elements.go b/management/editor/elements.go
index 873e81c..b82b220 100644
--- a/management/editor/elements.go
+++ b/management/editor/elements.go
@@ -11,7 +11,11 @@ import (
 // The `fieldName` argument will cause a panic if it is not exactly the string
 // form of the struct field that this editor input is representing
 // 	type Person struct {
+//		item.Item
+// 		editor editor.Editor
+//
 // 		Name string `json:"name"`
+//		//...
 // 	}
 //
 // 	func (p *Person) MarshalEditor() ([]byte, error) {
@@ -64,9 +68,9 @@ func Timestamp(fieldName string, p interface{}, attrs map[string]string) []byte
 	}
 
 	e := &element{
-		TagName: "input",
-		Attrs:   attrs,
-		Name:    tagNameFromStructField(fieldName, p),
+		tagName: "input",
+		attrs:   attrs,
+		name:    tagNameFromStructField(fieldName, p),
 		label:   attrs["label"],
 		data:    data,
 		viewBuf: &bytes.Buffer{},
@@ -161,9 +165,9 @@ func Richtext(fieldName string, p interface{}, attrs map[string]string) []byte {
 	attrs["class"] = "richtext " + fieldName
 	attrs["id"] = "richtext-" + fieldName
 	div := &element{
-		TagName: "div",
-		Attrs:   attrs,
-		Name:    "",
+		tagName: "div",
+		attrs:   attrs,
+		name:    "",
 		label:   "",
 		data:    "",
 		viewBuf: &bytes.Buffer{},
@@ -261,16 +265,16 @@ func Select(fieldName string, p interface{}, attrs, options map[string]string) [
 
 	// provide a call to action for the select element
 	cta := &element{
-		TagName: "option",
-		Attrs:   map[string]string{"disabled": "true", "selected": "true"},
+		tagName: "option",
+		attrs:   map[string]string{"disabled": "true", "selected": "true"},
 		data:    "Select an option...",
 		viewBuf: &bytes.Buffer{},
 	}
 
 	// provide a selection reset (will store empty string in db)
 	reset := &element{
-		TagName: "option",
-		Attrs:   map[string]string{"value": ""},
+		tagName: "option",
+		attrs:   map[string]string{"value": ""},
 		data:    "None",
 		viewBuf: &bytes.Buffer{},
 	}
@@ -283,8 +287,8 @@ func Select(fieldName string, p interface{}, attrs, options map[string]string) [
 			optAttrs["selected"] = "true"
 		}
 		opt := &element{
-			TagName: "option",
-			Attrs:   optAttrs,
+			tagName: "option",
+			attrs:   optAttrs,
 			data:    v,
 			viewBuf: &bytes.Buffer{},
 		}
@@ -328,9 +332,9 @@ func Checkbox(fieldName string, p interface{}, attrs, options map[string]string)
 		// create a *element manually using the modified tagNameFromStructFieldMulti
 		// func since this is for a multi-value name
 		input := &element{
-			TagName: "input",
-			Attrs:   inputAttrs,
-			Name:    tagNameFromStructFieldMulti(fieldName, i, p),
+			tagName: "input",
+			attrs:   inputAttrs,
+			name:    tagNameFromStructFieldMulti(fieldName, i, p),
 			label:   v,
 			data:    "",
 			viewBuf: &bytes.Buffer{},
diff --git a/management/editor/repeaters.go b/management/editor/repeaters.go
index 37fb982..f9a289c 100644
--- a/management/editor/repeaters.go
+++ b/management/editor/repeaters.go
@@ -13,7 +13,11 @@ import (
 // The `fieldName` argument will cause a panic if it is not exactly the string
 // form of the struct field that this editor input is representing
 // 	type Person struct {
+//		item.Item
+//		editor editor.Editor
+//
 // 		Names []string `json:"names"`
+//		//...
 // 	}
 //
 // 	func (p *Person) MarshalEditor() ([]byte, error) {
@@ -38,9 +42,9 @@ func InputRepeater(fieldName string, p interface{}, attrs map[string]string) []b
 	html.WriteString(`<span class="__ponzu-repeat ` + scope + `">`)
 	for i, val := range vals {
 		el := &element{
-			TagName: "input",
-			Attrs:   attrs,
-			Name:    tagNameFromStructFieldMulti(fieldName, i, p),
+			tagName: "input",
+			attrs:   attrs,
+			name:    tagNameFromStructFieldMulti(fieldName, i, p),
 			data:    val,
 			viewBuf: &bytes.Buffer{},
 		}
@@ -80,9 +84,9 @@ func SelectRepeater(fieldName string, p interface{}, attrs, options map[string]s
 	if len(vals) > 0 {
 		for i, val := range vals {
 			sel := &element{
-				TagName: "select",
-				Attrs:   attrs,
-				Name:    tagNameFromStructFieldMulti(fieldName, i, p),
+				tagName: "select",
+				attrs:   attrs,
+				name:    tagNameFromStructFieldMulti(fieldName, i, p),
 				viewBuf: &bytes.Buffer{},
 			}
 
@@ -96,16 +100,16 @@ func SelectRepeater(fieldName string, p interface{}, attrs, options map[string]s
 
 			// provide a call to action for the select element
 			cta := &element{
-				TagName: "option",
-				Attrs:   map[string]string{"disabled": "true", "selected": "true"},
+				tagName: "option",
+				attrs:   map[string]string{"disabled": "true", "selected": "true"},
 				data:    "Select an option...",
 				viewBuf: &bytes.Buffer{},
 			}
 
 			// provide a selection reset (will store empty string in db)
 			reset := &element{
-				TagName: "option",
-				Attrs:   map[string]string{"value": ""},
+				tagName: "option",
+				attrs:   map[string]string{"value": ""},
 				data:    "None",
 				viewBuf: &bytes.Buffer{},
 			}
@@ -118,8 +122,8 @@ func SelectRepeater(fieldName string, p interface{}, attrs, options map[string]s
 					optAttrs["selected"] = "true"
 				}
 				opt := &element{
-					TagName: "option",
-					Attrs:   optAttrs,
+					tagName: "option",
+					attrs:   optAttrs,
 					data:    v,
 					viewBuf: &bytes.Buffer{},
 				}