Switch to dimfeld/httptreemux to allow for overlapping path definitions

Author: raphael

Makefile

@@ -22,7 +22,7 @@ DEPEND=\
 	github.com/goadesign/goa-cellar \
 	github.com/goadesign/middleware \
 	github.com/golang/lint/golint \
-	github.com/julienschmidt/httprouter \
+	github.com/dimfeld/httptreemux \
 	github.com/manveru/faker \
 	github.com/on99/gocyclo \
 	github.com/onsi/ginkgo \

design/apidsl/action.go

@@ -64,7 +64,7 @@ func Action(name string, dsl func()) {
 
 // Routing lists the action route. Each route is defined with a function named after the HTTP method.
 // The route function takes the path as argument. Route paths may use wildcards as described in the
-// [httprouter](https://godoc.org/github.com/julienschmidt/httprouter) package documentation. These
+// [httptreemux](https://godoc.org/github.com/dimfeld/httptreemux) package documentation. These
 // wildcards define parameters using the `:name` or `*name` syntax where `:name` matches a path
 // segment and `*name` is a catch-all that matches the path until the end.
 func Routing(routes ...*design.RouteDefinition) {

design/apidsl/test/runner_test.go

@@ -28,10 +28,13 @@ var _ = Resource(resourceName, func() {
 
 var _ = Type(typeName, func() {
 	Description(typeDescription)
+	Attribute("bar")
 })
 
 var _ = MediaType(mediaTypeIdentifier, func() {
 	Description(mediaTypeDescription)
+	Attributes(func() { Attribute("foo") })
+	View("default", func() { Attribute("foo") })
 })
 
 func init() {

design/apidsl/test/test_suite_test.go

@@ -0,0 +1,13 @@
+package test_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestTest(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Test Suite")
+}

design/definitions.go

@@ -7,8 +7,8 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/dimfeld/httppath"
 	"github.com/goadesign/goa/dslengine"
-	"github.com/julienschmidt/httprouter"
 )
 
 type (
@@ -631,7 +631,7 @@ func (r *ResourceDefinition) FullPath() string {
 	} else {
 		basePath = Design.BasePath
 	}
-	return httprouter.CleanPath(path.Join(basePath, r.BasePath))
+	return httppath.Clean(path.Join(basePath, r.BasePath))
 }
 
 // Parent returns the parent resource if any, nil otherwise.
@@ -1203,13 +1203,13 @@ func (r *RouteDefinition) Params() []string {
 // with the action specific path.
 func (r *RouteDefinition) FullPath() string {
 	if r.IsAbsolute() {
-		return httprouter.CleanPath(r.Path[1:])
+		return httppath.Clean(r.Path[1:])
 	}
 	var base string
 	if r.Parent != nil && r.Parent.Parent != nil {
 		base = r.Parent.Parent.FullPath()
 	}
-	return httprouter.CleanPath(path.Join(base, r.Path))
+	return httppath.Clean(path.Join(base, r.Path))
 }
 
 // IsAbsolute returns true if the action path should not be concatenated to the resource and API

goagen/gen_app/writers.go

@@ -108,7 +108,7 @@ type (
 
 // IsPathParam returns true if the given parameter name corresponds to a path parameter for all
 // the context action routes. Such parameter is required but does not need to be validated as
-// httprouter takes care of that.
+// httptreemux takes care of that.
 func (c *ContextTemplateData) IsPathParam(param string) bool {
 	params := c.Params
 	pp := false

goagen/gen_js/generator.go

@@ -181,7 +181,7 @@ func (g *Generator) generateExample(api *design.APIDefinition) error {
 	}
 	imports := []*codegen.ImportSpec{
 		codegen.SimpleImport("net/http"),
-		codegen.SimpleImport("github.com/julienschmidt/httprouter"),
+		codegen.SimpleImport("github.com/dimfeld/httptreemux"),
 		codegen.SimpleImport("github.com/goadesign/goa"),
 	}
 	if err := file.WriteHeader(fmt.Sprintf("%s JavaScript Client Example", api.Name), "js", imports); err != nil {

goagen/gen_schema/generator.go

@@ -72,7 +72,7 @@ func (g *Generator) Generate(api *design.APIDefinition) (_ []string, err error)
 		return
 	}
 	imports := []*codegen.ImportSpec{
-		codegen.SimpleImport("github.com/julienschmidt/httprouter"),
+		codegen.SimpleImport("github.com/dimfeld/httptreemux"),
 		codegen.SimpleImport("github.com/goadesign/goa"),
 	}
 	g.genfiles = append(g.genfiles, controllerFile)

mux.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/julienschmidt/httprouter"
+	"github.com/dimfeld/httptreemux"
 )
 
 type (
@@ -30,25 +30,25 @@ type (
 
 	// mux is the default ServeMux implementation.
 	mux struct {
-		router  *httprouter.Router
+		router  *httptreemux.TreeMux
 		handles map[string]MuxHandler
 	}
 )
 
 // NewMux returns a Mux.
 func NewMux() ServeMux {
 	return &mux{
-		router:  httprouter.New(),
+		router:  httptreemux.New(),
 		handles: make(map[string]MuxHandler),
 	}
 }
 
 // Handle sets the handler for the given verb and path.
 func (m *mux) Handle(method, path string, handle MuxHandler) {
-	hthandle := func(rw http.ResponseWriter, req *http.Request, htparams httprouter.Params) {
+	hthandle := func(rw http.ResponseWriter, req *http.Request, htparams map[string]string) {
 		params := req.URL.Query()
-		for _, p := range htparams {
-			params.Set(p.Key, p.Value)
+		for n, p := range htparams {
+			params.Set(n, p)
 		}
 		handle(rw, req, params)
 	}