ref: 1684579127630853bef5637e116c68dffe33f59c
parent: 5dd3eaabee80cbf92913522364ef52f26f3269cd
author: Jakub Turski <yacoob@gmail.com>
date: Wed Sep 3 16:05:44 EDT 2014
Go back to lowercase slugs. Also, use MakePathToLower in TestMakeToLower. go fmt
--- a/helpers/helpers_test.go
+++ b/helpers/helpers_test.go
@@ -1,8 +1,9 @@
package helpers
import (
- "github.com/stretchr/testify/assert"
"testing"
+
+ "github.com/stretchr/testify/assert"
)
func TestPretty(t *testing.T) {
@@ -45,8 +46,8 @@
{"fOO,bar:foo%bAR", "fOObarfoobAR"},
{"FOo/BaR.html", "FOo/BaR.html"},
{"трям/трям", "трям/трям"},
- {"은행","은행"},
- {"Банковский кассир","Банковский-кассир"},
+ {"은행", "은행"},
+ {"Банковский кассир", "Банковский-кассир"},
}
for _, test := range tests {
@@ -63,15 +64,16 @@
expected string
}{
{" foo bar ", "foo-bar"},
+ {" Foo Bar ", "foo-bar"},
{"foo.bar/foo_bar-foo", "foo.bar/foo_bar-foo"},
{"foo,bar:foo%bar", "foobarfoobar"},
{"foo/bar.html", "foo/bar.html"},
{"трям/трям", "трям/трям"},
- {"은행","은행"},
+ {"은행", "은행"},
}
for _, test := range tests {
- output := MakePath(test.input)
+ output := MakePathToLower(test.input)
if output != test.expected {
t.Errorf("Expected %#v, got %#v\n", test.expected, output)
}
@@ -84,6 +86,7 @@
expected string
}{
{" foo bar ", "foo-bar"},
+ {"Foo And BAR", "foo-and-bar"},
{"foo.bar/foo_bar-foo", "foo.bar/foo_bar-foo"},
{"foo,bar:foo%bar", "foobarfoobar"},
{"foo/bar.html", "foo/bar.html"},
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -40,7 +40,7 @@
// and transformed to lower case.
// E.g. Social Media -> social-media
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 {
--- a/helpers/url.go
+++ b/helpers/url.go
@@ -35,7 +35,7 @@
// uri: Vim (text editor)
// urlize: vim-text-editor
func Urlize(uri string) string {
- sanitized := MakePath(uri)
+ sanitized := MakePathToLower(uri)
// escape unicode letters
parsedUri, err := url.Parse(sanitized)
--
⑨