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

#462 fix, remove leading and trailing dashes from urlized slug. includes test changes

Browse source
This commit is contained in:
Joel Scoble 2014-10-02 17:25:52 -05:00 committed by spf13
parent f52e662890
commit 4b9e4c90d9
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hugolib/page_test.go
View file

@ -46,7 +46,7 @@ Leading
"Development", "Development",
"VIM" "VIM"
], ],
"slug": "spf13-vim-3-0-release-and-new-website" "slug": "-spf13-vim-3-0-release-and-new-website-"
} }
Content of the file goes Here Content of the file goes Here
@ -566,13 +566,13 @@ func TestLayoutOverride(t *testing.T) {
} }
func TestSliceToLower(t *testing.T) { func TestSliceToLower(t *testing.T) {
tests := []struct{ tests := []struct {
value []string value []string
expected []string expected []string
}{ }{
{[]string{"a","b","c"}, []string{"a", "b", "c"}}, {[]string{"a", "b", "c"}, []string{"a", "b", "c"}},
{[]string{"a","B","c"}, []string{"a", "b", "c"}}, {[]string{"a", "B", "c"}, []string{"a", "b", "c"}},
{[]string{"A","B","C"}, []string{"a", "b", "c"}}, {[]string{"A", "B", "C"}, []string{"a", "b", "c"}},
} }
for _, test := range tests { for _, test := range tests {

8
hugolib/permalinks.go
View file

@ -128,6 +128,14 @@ func pageToPermalinkFilename(p *Page, _ string) (string, error) {
// if the page has a slug, return the slug, else return the title // if the page has a slug, return the slug, else return the title
func pageToPermalinkSlugElseTitle(p *Page, a string) (string, error) { func pageToPermalinkSlugElseTitle(p *Page, a string) (string, error) {
if p.Slug != "" { if p.Slug != "" {
// Don't start or end with a -
if strings.HasPrefix(p.Slug, "-") {
p.Slug = p.Slug[1:len(p.Slug)]
}
if strings.HasSuffix(p.Slug, "-") {
p.Slug = p.Slug[0 : len(p.Slug)-1]
}
return p.Slug, nil return p.Slug, nil
} }
return pageToPermalinkTitle(p, a) return pageToPermalinkTitle(p, a)