github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl: Update hasPrefix to accept interface{} params

Browse source 
Updates #2822
This commit is contained in:
Cameron Moore 2016-12-22 17:29:31 -06:00 committed by Bjørn Erik Pedersen
parent f25f837339
commit 6b8422bb35
2 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tpl/template_funcs.go
View file

@ -239,6 +239,21 @@ func slicestr(a interface{}, startEnd ...interface{}) (string, error) {
}
// hasPrefix tests whether the input s begins with prefix.
func hasPrefix(s, prefix interface{}) (bool, error) {
ss, err := cast.ToStringE(s)
if err != nil {
return false, err
}
sp, err := cast.ToStringE(prefix)
if err != nil {
return false, err
}
return strings.HasPrefix(ss, sp), nil
}
// substr extracts parts of a string, beginning at the character at the specified
// position, and returns the specified number of characters.
//
@ -2060,7 +2075,7 @@ func initFuncMap() {
"getJSON": getJSON,
"getenv": func(varName string) string { return os.Getenv(varName) },
"gt": gt,
"hasPrefix": func(a, b string) bool { return strings.HasPrefix(a, b) },
"hasPrefix": hasPrefix,
"highlight": highlight,
"htmlEscape": htmlEscape,
"htmlUnescape": htmlUnescape,

27
tpl/template_funcs_test.go
View file

@ -804,6 +804,33 @@ func TestSlicestr(t *testing.T) {
}
}
func TestHasPrefix(t *testing.T) {
cases := []struct {
s interface{}
prefix interface{}
want interface{}
isErr bool
}{
{"abcd", "ab", true, false},
{"abcd", "cd", false, false},
{template.HTML("abcd"), "ab", true, false},
{template.HTML("abcd"), "cd", false, false},
{template.HTML("1234"), 12, true, false},
{template.HTML("1234"), 34, false, false},
{[]byte("abcd"), "ab", true, false},
}
for i, c := range cases {
res, err := hasPrefix(c.s, c.prefix)
if (err != nil) != c.isErr {
t.Fatalf("[%d] unexpected isErr state: want %v, got %v, err = %v", i, c.isErr, err != nil, err)
}
if res != c.want {
t.Errorf("[%d] want %v, got %v", i, c.want, res)
}
}
}
func TestSubstr(t *testing.T) {
var err error
var n int