Merge pull request #54 from SasSwart/bugfix/go-dashes-in-names

Remove dashes from function and attribute names

Author: SasSwart

config/config.go

@@ -9,7 +9,7 @@ import (
 )
 
 // SemVer should be updated on any new release!!
-const SemVer = "0.0.7"
+const SemVer = "0.0.9"
 
 var (
 	Debug          bool

render/go/renderer.go

@@ -72,27 +72,26 @@ func (g *Renderer) SanitiseName(s []string) string {
 	caser := cases.Title(language.English)
 	var temp []string
 	for _, w := range s {
+		var delim string
 		switch true {
 		case isHttpStatusCode(w):
 			temp = append(temp, w)
 			continue
 		case strings.Contains(w, "/"):
-			for _, split := range strings.Split(w, "/") {
-				temp = append(temp, caser.String(CreateFunctionString(split)))
-			}
-			continue
+			delim = "/"
 		case strings.Contains(w, " "):
-			for _, split := range strings.Split(w, " ") {
-				temp = append(temp, caser.String(CreateFunctionString(split)))
-			}
-			continue
+			delim = " "
 		case strings.Contains(w, "_"):
-			for _, split := range strings.Split(w, "_") {
-				temp = append(temp, caser.String(CreateFunctionString(split)))
-			}
+			delim = "_"
+		case strings.Contains(w, "-"):
+			delim = "-"
+		default:
+			temp = append(temp, caser.String(CreateFunctionString(w)))
 			continue
 		}
-		temp = append(temp, caser.String(CreateFunctionString(w)))
+		for _, split := range strings.Split(w, delim) {
+			temp = append(temp, caser.String(CreateFunctionString(split)))
+		}
 	}
 	return strings.Join(temp, "")
 }

render/go/renderer_test.go

@@ -25,6 +25,7 @@ func TestGolang_SanitiseName(t *testing.T) {
 
 	specPath := "../../" + test.OpenapiFile
 	apiSpec, _ := openapi.LoadAPISpec(specPath)
+	goPropertiesWithDashes := "go-properties-with-dashes"
 
 	tests := []struct {
 		name     string
@@ -71,6 +72,11 @@ func TestGolang_SanitiseName(t *testing.T) {
 			node:     test.Dig(apiSpec, test.Endpoint, http.MethodPost, request.BodyKey, media.JSONKey, schema.PropertyKey, "name"),
 			expected: "ValidationFixtureEndpointPostRequestBodyModelName",
 		},
+		{
+			name:     "testopenapi property with dashes in name",
+			node:     test.Dig(apiSpec, test.Endpoint, http.MethodPost, request.BodyKey, media.JSONKey, schema.PropertyKey, goPropertiesWithDashes),
+			expected: "ValidationFixtureEndpointPostRequestBodyModelGoPropertiesWithDashes",
+		},
 	}
 	for _, testCase := range tests {
 		t.Run(testCase.name, func(t *testing.T) {

test/fixtures/testRefs/test_ref_post.yaml

@@ -1,5 +1,7 @@
 type: object
 properties:
+  go-properties-with-dashes:
+    type: string
   enabled:
     type: boolean
   name: