fix dashes in path params (go-openapi#35)

* allow for dashes in path param * fix for updated docker/go-units
seanprince · Jan 30, 2017 · 4affd1e · 4affd1e
1 parent 196f817
commit 4affd1e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/flagext/byte_size_test.go b/flagext/byte_size_test.go
@@ -6,13 +6,13 @@ import "github.com/stretchr/testify/assert"
 func TestMarshalBytesize(t *testing.T) {
 	v, err := ByteSize(1024).MarshalFlag()
 	if assert.NoError(t, err) {
-		assert.Equal(t, "1.024 kB", v)
+		assert.Equal(t, "1.024kB", v)
 	}
 }
 
 func TestStringBytesize(t *testing.T) {
 	v := ByteSize(2048).String()
-	assert.Equal(t, "2.048 kB", v)
+	assert.Equal(t, "2.048kB", v)
 }
 
 func TestUnmarshalBytesize(t *testing.T) {

diff --git a/middleware/denco/router_test.go b/middleware/denco/router_test.go
@@ -230,11 +230,13 @@ func TestRouter_Lookup(t *testing.T) {
 		{"/networks/:owner/:repo/events", "testroute0"},
 		{"/orgs/:org/events", "testroute1"},
 		{"/notifications/threads/:id", "testroute2"},
+		{"/mypathisgreat/:thing-id", "testroute3"},
 	}
 	testcases = []testcase{
 		{"/networks/:owner/:repo/events", "testroute0", []denco.Param{{"owner", ":owner"}, {"repo", ":repo"}}, true},
 		{"/orgs/:org/events", "testroute1", []denco.Param{{"org", ":org"}}, true},
 		{"/notifications/threads/:id", "testroute2", []denco.Param{{"id", ":id"}}, true},
+		{"/mypathisgreat/:thing-id", "testroute3", []denco.Param{{"thing-id", ":thing-id"}}, true},
 	}
 	runLookupTest(t, records, testcases)
 

diff --git a/middleware/router.go b/middleware/router.go
@@ -210,7 +210,7 @@ func (d *defaultRouter) OtherMethods(method, path string) []string {
 	return methods
 }
 
-var pathConverter = regexp.MustCompile(`{(\w+)}`)
+var pathConverter = regexp.MustCompile(`{(.+)}`)
 
 func (d *defaultRouteBuilder) AddRoute(method, path string, operation *spec.Operation) {
 	mn := strings.ToUpper(method)

diff --git a/middleware/router_test.go b/middleware/router_test.go
@@ -204,3 +204,23 @@ func petAPIRouterBuilder(spec *loads.Document, api *untyped.API, analyzed *analy
 
 	return builder
 }
+
+func TestPathConverter(t *testing.T) {
+	cases := []struct {
+		swagger string
+		denco   string
+	}{
+		{"/", "/"},
+		{"/something", "/something"},
+		{"/{id}", "/:id"},
+		{"/{petid}", "/:petid"},
+		{"/{pet_id}", "/:pet_id"},
+		{"/{petId}", "/:petId"},
+		{"/{pet-id}", "/:pet-id"},
+	}
+
+	for _, tc := range cases {
+		actual := pathConverter.ReplaceAllString(tc.swagger, ":$1")
+		assert.Equal(t, tc.denco, actual, "expected swagger path %s to match %s but got %s", tc.swagger, tc.denco, actual)
+	}
+}