From b39e75bb17eebb0f3f573d8788e4937c30e74c8f Mon Sep 17 00:00:00 2001 From: Ma_124 Date: Tue, 3 Jul 2018 20:24:52 +0200 Subject: [PATCH] Added ToDelimited --- others.go | 27 +++++++++++++++++++++++++++ snake.go | 17 +++++++++++------ snake_test.go | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 others.go diff --git a/others.go b/others.go new file mode 100644 index 0000000..6cae65f --- /dev/null +++ b/others.go @@ -0,0 +1,27 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2018 Ma_124, + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, Subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or Substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package strcase + + diff --git a/snake.go b/snake.go index 32ba961..5bd5ef4 100644 --- a/snake.go +++ b/snake.go @@ -2,6 +2,7 @@ * The MIT License (MIT) * * Copyright (c) 2015 Ian Coleman + * Copyright (c) 2018 Ma_124, * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -31,6 +32,10 @@ import ( // Converts a string to snake_case func ToSnake(s string) string { + return ToDelimited(s, '_') +} + +func ToDelimited(s string, del uint8) string { s = addWordBoundariesToNumbers(s) s = strings.Trim(s, " ") n := "" @@ -44,16 +49,16 @@ func ToSnake(s string) string { } } - if i > 0 && n[len(n)-1] != '_' && nextCaseIsChanged { + if i > 0 && n[len(n)-1] != del && nextCaseIsChanged { // add underscore if next letter case type is changed if v >= 'A' && v <= 'Z' { - n += "_" + string(v) + n += string(del) + string(v) } else if v >= 'a' && v <= 'z' { - n += string(v) + "_" + n += string(v) + string(del) } - } else if v == ' ' { - // replace spaces with underscores - n += "_" + } else if v == ' ' || v == '_' || v == '-' { + // replace spaces/underscores with delimiters + n += string(del) } else { n = n + string(v) } diff --git a/snake_test.go b/snake_test.go index b1d8184..8a9930e 100644 --- a/snake_test.go +++ b/snake_test.go @@ -2,6 +2,7 @@ * The MIT License (MIT) * * Copyright (c) 2015 Ian Coleman + * Copyright (c) 2018 Ma_124, * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -53,7 +54,38 @@ func TestToSnake(t *testing.T) { out := i[1] result := ToSnake(in) if result != out { - t.Error("'" + result + "' != '" + out + "'") + t.Error("'" + in + "'('" + result + "' != '" + out + "')") + } + } +} + +func TestToDelimited(t *testing.T) { + cases := [][]string{ + []string{"testCase", "test@case"}, + []string{"TestCase", "test@case"}, + []string{"Test Case", "test@case"}, + []string{" Test Case", "test@case"}, + []string{"Test Case ", "test@case"}, + []string{" Test Case ", "test@case"}, + []string{"test", "test"}, + []string{"test_case", "test@case"}, + []string{"Test", "test"}, + []string{"", ""}, + []string{"ManyManyWords", "many@many@words"}, + []string{"manyManyWords", "many@many@words"}, + []string{"AnyKind of_string", "any@kind@of@string"}, + []string{"numbers2and55with000", "numbers@2@and@55@with@000"}, + []string{"JSONData", "json@data"}, + []string{"userID", "user@id"}, + []string{"AAAbbb", "aa@abbb"}, + []string{"test-case", "test@case"}, + } + for _, i := range cases { + in := i[0] + out := i[1] + result := ToDelimited(in, '@') + if result != out { + t.Error("'" + in + "' ('" + result + "' != '" + out + "')") } } }