Merge pull request #4 from lukesneeringer/fix-camel

fix: Convert upper to lower camel case correctly.
stoewer · Nov 1, 2019 · 56c6d9c · 56c6d9c
2 parents 9f4628d + bf17a8c
commit 56c6d9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/camel.go b/camel.go
@@ -18,7 +18,7 @@ func LowerCamelCase(s string) string {
 }
 
 func camelCase(s string, upper bool) string {
-	s = strings.TrimSpace(s)
+	s = strings.TrimSpace(SnakeCase(s))
 	buffer := make([]rune, 0, len(s))
 
 	var prev rune

diff --git a/camel_test.go b/camel_test.go
@@ -14,6 +14,7 @@ func TestUpperCamelCase(t *testing.T) {
 		"":                      "",
 		"f":                     "F",
 		"foo":                   "Foo",
+		"fooBar":                "FooBar",
 		" foo_bar\n":            "FooBar",
 		" foo-bar\t":            "FooBar",
 		" foo bar\r":            "FooBar",
@@ -34,6 +35,7 @@ func TestLowerCamelCase(t *testing.T) {
 		"":                      "",
 		"F":                     "f",
 		"foo":                   "foo",
+		"FooBar":                "fooBar",
 		" foo_bar\n":            "fooBar",
 		" foo-bar\t":            "fooBar",
 		" foo bar\r":            "fooBar",