tpl: Update upper to accept interface{} params

Updates #2822
This commit is contained in:
Cameron Moore 2016-12-22 21:54:08 -06:00 committed by Bjørn Erik Pedersen
parent 4e5b4ac504
commit 661d64c46a
2 changed files with 35 additions and 1 deletions

View file

@ -1457,6 +1457,17 @@ func lower(s interface{}) (string, error) {
return strings.ToLower(ss), nil return strings.ToLower(ss), nil
} }
// upper returns a copy of the input s with all Unicode letters mapped to their
// upper case.
func upper(s interface{}) (string, error) {
ss, err := cast.ToStringE(s)
if err != nil {
return "", err
}
return strings.ToUpper(ss), nil
}
// trim leading/trailing characters defined by b from a // trim leading/trailing characters defined by b from a
func trim(a interface{}, b string) (string, error) { func trim(a interface{}, b string) (string, error) {
aStr, err := cast.ToStringE(a) aStr, err := cast.ToStringE(a)
@ -2150,7 +2161,7 @@ func initFuncMap() {
"title": func(a string) string { return strings.Title(a) }, "title": func(a string) string { return strings.Title(a) },
"time": asTime, "time": asTime,
"trim": trim, "trim": trim,
"upper": func(a string) string { return strings.ToUpper(a) }, "upper": upper,
"urlize": helpers.CurrentPathSpec().URLize, "urlize": helpers.CurrentPathSpec().URLize,
"where": where, "where": where,
"i18n": i18nTranslate, "i18n": i18nTranslate,

View file

@ -2022,6 +2022,29 @@ func TestLower(t *testing.T) {
} }
} }
func TestUpper(t *testing.T) {
cases := []struct {
s interface{}
want string
isErr bool
}{
{"test", "TEST", false},
{template.HTML("UpPeR"), "UPPER", false},
{[]byte("bytes"), "BYTES", false},
}
for i, c := range cases {
res, err := upper(c.s)
if (err != nil) != c.isErr {
t.Fatalf("[%d] unexpected isErr state: want %v, got %v, err = %v", i, c.want, (err != nil), err)
}
if res != c.want {
t.Errorf("[%d] upper failed: want %v, got %v", i, c.want, res)
}
}
}
func TestHighlight(t *testing.T) { func TestHighlight(t *testing.T) {
code := "func boo() {}" code := "func boo() {}"
highlighted, err := highlight(code, "go", "") highlighted, err := highlight(code, "go", "")