Skip to content

Commit

Permalink
Folder produces inconsistent results fixes #12
Browse files Browse the repository at this point in the history
  • Loading branch information
markbates committed Jan 17, 2019
1 parent f1ece79 commit 233e352
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 7 additions & 5 deletions name/folder.go
@@ -1,12 +1,12 @@
package name

import (
"path/filepath"
"regexp"
"strings"

"github.com/gobuffalo/flect"
)

var alphanum = regexp.MustCompile("[^a-zA-Z0-9_\\-\\/]+")

// Folder creates a suitable folder name
// admin/widget = admin/widget
// foo_bar = foo_bar
Expand All @@ -23,8 +23,10 @@ func (i Ident) Folder(exts ...string) Ident {
var parts []string

for _, part := range strings.Split(i.Original, "/") {
part = flect.Underscore(part)
part = strings.Replace(part, "_", string(filepath.Separator), -1)
part = strings.ToLower(part)
part = alphanum.ReplaceAllString(part, "")
// part = flect.Underscore(part)
// part = strings.Replace(part, "_", string(filepath.Separator), -1)
parts = append(parts, part)
}
return New(strings.Join(parts, "/") + strings.Join(exts, ""))
Expand Down
4 changes: 2 additions & 2 deletions name/folder_test.go
Expand Up @@ -9,13 +9,13 @@ import (
func Test_Folder(t *testing.T) {
table := []tt{
{"", ""},
{"foo_bar", "foo/bar"},
{"foo_bar", "foo_bar"},
{"admin/widget", "admin/widget"},
{"admin/widgets", "admin/widgets"},
{"widget", "widget"},
{"widgets", "widgets"},
{"User", "user"},
{"U$er", "u/er"},
{"U$er", "uer"},
}

for _, tt := range table {
Expand Down

0 comments on commit 233e352

Please sign in to comment.