cleaning things up a little

adding some more coverage

Author: daveshanley

utils/utils.go

@@ -740,17 +740,28 @@ func ConvertComponentIdIntoFriendlyPathSearch(id string) (string, string) {
 			sb.WriteString("']")
 			segs[i] = sb.String()
 
-			if len(cleaned) > 0 {
+			if len(cleaned) > 0 && i < len(segs)-1 {
 				sb.Reset()
 				sb.WriteString(segs[i-1])
 				sb.WriteString(segs[i])
 				cleaned[len(cleaned)-1] = sb.String()
 				continue
 			} else {
-				if i > 0 {
+				if i > 0 && i < len(segs)-1 {
 					cleaned = append(cleaned, segs[i])
 					continue
 				}
+				if i == len(segs)-1 {
+					sb.Reset()
+					l := len(cleaned)
+					if l > 0 {
+						sb.WriteString(cleaned[l-1])
+						sb.WriteString(segs[i])
+						cleaned[l-1] = sb.String()
+					} else {
+						cleaned = append(cleaned, segs[i])
+					}
+				}
 			}
 		} else {
 
@@ -761,21 +772,6 @@ func ConvertComponentIdIntoFriendlyPathSearch(id string) (string, string) {
 				continue
 			}
 
-			// check for brackets in the name, and if found, rewire the path to encapsulate them
-			// correctly. https://github.com/pb33f/libopenapi/issues/112
-			brackets := bracketNameExp.FindStringSubmatch(segs[i])
-
-			if len(brackets) > 0 {
-				segs[i] = bracketNameExp.ReplaceAllString(segs[i], "['$1[$2]']")
-				if len(cleaned) > 0 {
-					sb.Reset()
-					sb.WriteString(segs[i-1])
-					sb.WriteString(segs[i])
-					cleaned[len(cleaned)-1] = sb.String()
-					continue
-				}
-			}
-
 			intVal, err := strconv.Atoi(segs[i])
 			if err == nil {
 				if intVal <= 99 {
@@ -812,10 +808,6 @@ func ConvertComponentIdIntoFriendlyPathSearch(id string) (string, string) {
 		}
 	}
 
-	if len(cleaned) == 0 && len(segs) == 1 {
-		cleaned = append(cleaned, segs[0])
-	}
-
 	var replaced string
 	if len(cleaned) > 1 {
 		replaced = strings.ReplaceAll(strings.Join(cleaned, "."), "#", "$")

utils/utils_test.go

@@ -813,6 +813,12 @@ func TestConvertComponentIdIntoFriendlyPathSearch_Slashes(t *testing.T) {
 	assert.Equal(t, "$.nice.rice.and.spice", path)
 }
 
+// https://github.com/pb33f/libopenapi/issues/112
+func TestConvertComponentIdIntoFriendlyPathSearch_BracketInName(t *testing.T) {
+	_, path := ConvertComponentIdIntoFriendlyPathSearch(`#/oo/missus/hows/your/fa[ther]`)
+	assert.Equal(t, "$.oo.missus['hows']['your']['fa[ther]']", path)
+}
+
 func TestConvertComponentIdIntoFriendlyPathSearch_DashSomething(t *testing.T) {
 	_, path := ConvertComponentIdIntoFriendlyPathSearch(`-rome`)
 	assert.Equal(t, "$.['-rome']", path)