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

Go back to lowercase slugs. Also, use MakePathToLower in TestMakeToLower.

Browse source 
go fmt
This commit is contained in:
Jakub Turski 2014-09-03 20:05:44 +01:00 committed by spf13
parent 5dd3eaabee
commit 1684579127
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
helpers/helpers_test.go
View file

@ -1,8 +1,9 @@
package helpers package helpers
import ( import (
"github.com/stretchr/testify/assert"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func TestPretty(t *testing.T) { func TestPretty(t *testing.T) {
@ -45,8 +46,8 @@ func TestMakePath(t *testing.T) {
{"fOO,bar:foo%bAR", "fOObarfoobAR"}, {"fOO,bar:foo%bAR", "fOObarfoobAR"},
{"FOo/BaR.html", "FOo/BaR.html"}, {"FOo/BaR.html", "FOo/BaR.html"},
{"трям/трям", "трям/трям"}, {"трям/трям", "трям/трям"},
{"은행","은행"}, {"은행", "은행"},
{"Банковский кассир","Банковский-кассир"}, {"Банковский кассир", "Банковский-кассир"},
} }
for _, test := range tests { for _, test := range tests {
@ -63,15 +64,16 @@ func TestMakeToLower(t *testing.T) {
expected string expected string
}{ }{
{" foo bar ", "foo-bar"}, {" foo bar ", "foo-bar"},
{" Foo Bar ", "foo-bar"},
{"foo.bar/foo_bar-foo", "foo.bar/foo_bar-foo"}, {"foo.bar/foo_bar-foo", "foo.bar/foo_bar-foo"},
{"foo,bar:foo%bar", "foobarfoobar"}, {"foo,bar:foo%bar", "foobarfoobar"},
{"foo/bar.html", "foo/bar.html"}, {"foo/bar.html", "foo/bar.html"},
{"трям/трям", "трям/трям"}, {"трям/трям", "трям/трям"},
{"은행","은행"}, {"은행", "은행"},
} }
for _, test := range tests { for _, test := range tests {
output := MakePath(test.input) output := MakePathToLower(test.input)
if output != test.expected { if output != test.expected {
t.Errorf("Expected %#v, got %#v\n", test.expected, output) t.Errorf("Expected %#v, got %#v\n", test.expected, output)
} }
@ -84,6 +86,7 @@ func TestUrlize(t *testing.T) {
expected string expected string
}{ }{
{" foo bar ", "foo-bar"}, {" foo bar ", "foo-bar"},
{"Foo And BAR", "foo-and-bar"},
{"foo.bar/foo_bar-foo", "foo.bar/foo_bar-foo"}, {"foo.bar/foo_bar-foo", "foo.bar/foo_bar-foo"},
{"foo,bar:foo%bar", "foobarfoobar"}, {"foo,bar:foo%bar", "foobarfoobar"},
{"foo/bar.html", "foo/bar.html"}, {"foo/bar.html", "foo/bar.html"},

2
helpers/path.go
View file

@ -40,7 +40,7 @@ func MakePath(s string) string {
// and transformed to lower case. // and transformed to lower case.
// E.g. Social Media -> social-media // E.g. Social Media -> social-media
func MakePathToLower(s string) string { func MakePathToLower(s string) string {
return UnicodeSanitize(strings.ToLower(strings.Replace(strings.TrimSpace(s), " ", "-", -1))) return UnicodeSanitize(strings.ToLower(strings.Replace(strings.TrimSpace(s), " ", "-", -1)))
} }
func MakeTitle(inpath string) string { func MakeTitle(inpath string) string {

2
helpers/url.go
View file

@ -35,7 +35,7 @@ func SanitizeUrl(in string) string {
// uri: Vim (text editor) // uri: Vim (text editor)
// urlize: vim-text-editor // urlize: vim-text-editor
func Urlize(uri string) string { func Urlize(uri string) string {
sanitized := MakePath(uri) sanitized := MakePathToLower(uri)
// escape unicode letters // escape unicode letters
parsedUri, err := url.Parse(sanitized) parsedUri, err := url.Parse(sanitized)