Merge branch 'master' into feature/achronyms-underscore

gobuffalo · Nov 4, 2018 · d036eae · d036eae
2 parents bd71682 + 1f6e977
commit d036eae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ident.go b/ident.go
@@ -80,6 +80,12 @@ func toParts(s string) []string {
 			prev = c
 			continue
 		}
+		if unicode.IsUpper(c) && baseAcronyms[strings.ToUpper(x)] {
+			parts = xappend(parts, x)
+			x = cs
+			prev = c
+			continue
+		}
 		if unicode.IsLetter(c) || unicode.IsDigit(c) || unicode.IsPunct(c) || c == '`' {
 			prev = c
 			x += cs

diff --git a/ident_test.go b/ident_test.go
@@ -17,6 +17,9 @@ func Test_New(t *testing.T) {
 		{"widget/ID", []string{"widget", "ID"}},
 		{"widgetID", []string{"widget", "ID"}},
 		{"widgetName", []string{"widget", "Name"}},
+		{"JWTName", []string{"JWT", "Name"}},
+		{"JWTname", []string{"JWTname"}},
+		{"jwtname", []string{"jwtname"}},
 		{"sql", []string{"SQL"}},
 		{"sQl", []string{"SQL"}},
 		{"id", []string{"ID"}},