structure changes

tools/templates/templates.go

@@ -1,15 +1,12 @@
 package templates
 
 import (
-	"errors"
-	"html/template"
 	"log"
 	"net/http"
-	"reflect"
 	"strings"
-	"unicode"
+	"text/template"
 
-	"github.com/hacdias/caddy-hugo/assets"
+	"github.com/hacdias/caddy-hugo/routes/assets"
 )
 
 // CanBeEdited checks if the extension of a file is supported by the editor
@@ -34,36 +31,6 @@ func CanBeEdited(filename string) bool {
 	return false
 }
 
-// Defined checks if variable is defined in a struct
-func Defined(data interface{}, field string) bool {
-	t := reflect.Indirect(reflect.ValueOf(data)).Type()
-
-	if t.Kind() != reflect.Struct {
-		log.Print("Non-struct type not allowed.")
-		return false
-	}
-
-	_, b := t.FieldByName(field)
-	return b
-}
-
-// Dict allows to send more than one variable into a template
-func Dict(values ...interface{}) (map[string]interface{}, error) {
-	if len(values)%2 != 0 {
-		return nil, errors.New("invalid dict call")
-	}
-	dict := make(map[string]interface{}, len(values)/2)
-	for i := 0; i < len(values); i += 2 {
-		key, ok := values[i].(string)
-		if !ok {
-			return nil, errors.New("dict keys must be strings")
-		}
-		dict[key] = values[i+1]
-	}
-
-	return dict, nil
-}
-
 // Get is used to get a ready to use template based on the url and on
 // other sent templates
 func Get(r *http.Request, functions template.FuncMap, templates ...string) (*template.Template, error) {
@@ -104,39 +71,3 @@ func Get(r *http.Request, functions template.FuncMap, templates ...string) (*tem
 
 	return tpl, nil
 }
-
-var splitCapitalizeExceptions = map[string]string{
-	"youtube":    "YouTube",
-	"github":     "GitHub",
-	"googleplus": "Google Plus",
-	"linkedin":   "LinkedIn",
-}
-
-// SplitCapitalize splits a string by its uppercase letters and capitalize the
-// first letter of the string
-func SplitCapitalize(name string) string {
-	if val, ok := splitCapitalizeExceptions[strings.ToLower(name)]; ok {
-		return val
-	}
-
-	var words []string
-	l := 0
-	for s := name; s != ""; s = s[l:] {
-		l = strings.IndexFunc(s[1:], unicode.IsUpper) + 1
-		if l <= 0 {
-			l = len(s)
-		}
-		words = append(words, s[:l])
-	}
-
-	name = ""
-
-	for _, element := range words {
-		name += element + " "
-	}
-
-	name = strings.ToLower(name[:len(name)-1])
-	name = strings.ToUpper(string(name[0])) + name[1:]
-
-	return name
-}

tools/templates/templates_test.go

@@ -75,31 +75,3 @@ func TestDefined(t *testing.T) {
 		}
 	}
 }
-
-type testSplitCapitalize struct {
-	name   string
-	result string
-}
-
-var testSplitCapitalizeCases = []testSplitCapitalize{
-	{"loremIpsum", "Lorem ipsum"},
-	{"LoremIpsum", "Lorem ipsum"},
-	{"loremipsum", "Loremipsum"},
-	{"YouTube", "YouTube"},
-	{"GitHub", "GitHub"},
-	{"GooglePlus", "Google Plus"},
-	{"Facebook", "Facebook"},
-}
-
-func TestSplitCapitalize(t *testing.T) {
-	for _, pair := range testSplitCapitalizeCases {
-		v := SplitCapitalize(pair.name)
-		if v != pair.result {
-			t.Error(
-				"For", pair.name,
-				"expected", pair.result,
-				"got", v,
-			)
-		}
-	}
-}