go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2024-12-24 20:14:31 +02:00
Code Issues Releases Activity

router node type removed

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2015-04-12 08:05:29 -07:00
parent eca5d87221
commit 724e92fdca
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
router.go
View File

@ -10,13 +10,11 @@ type (
node struct {
label byte
prefix string
has ntype // Type of node it contains
handler HandlerFunc
edges edges
echo *Echo
}
edges []*node
ntype byte
param struct {
Name string
Value string
@ -24,12 +22,6 @@ type (
Params []param
)
const (
snode ntype = 1 + iota // Static node
pnode // Param node
cnode // Catch-all node
)
func NewRouter(e *Echo) (r *router) {
r = &router{
trees: make(map[string]*node),
@ -47,23 +39,23 @@ func NewRouter(e *Echo) (r *router) {
func (r *router) Add(method, path string, h HandlerFunc, echo *Echo) {
for i, l := 0, len(path); i < l; i++ {
if path[i] == ':' {
r.insert(method, path[:i], nil, pnode, echo)
r.insert(method, path[:i], nil, echo)
for ; i < l && path[i] != '/'; i++ {
}
if i == l {
r.insert(method, path[:i], h, 0, echo)
r.insert(method, path[:i], h, echo)
return
}
r.insert(method, path[:i], nil, 0, echo)
r.insert(method, path[:i], nil, echo)
} else if path[i] == '*' {
r.insert(method, path[:i], nil, cnode, echo)
r.insert(method, path[:l], h, 0, echo)
r.insert(method, path[:i], nil, echo)
r.insert(method, path[:l], h, echo)
}
}
r.insert(method, path, h, snode, echo)
r.insert(method, path, h, echo)
}
func (r *router) insert(method, path string, h HandlerFunc, has ntype, echo *Echo) {
func (r *router) insert(method, path string, h HandlerFunc, echo *Echo) {
cn := r.trees[method] // Current node as root
search := path
@ -76,20 +68,18 @@ func (r *router) insert(method, path string, h HandlerFunc, has ntype, echo *Ech
// At root node
cn.label = search[0]
cn.prefix = search
cn.has = has
if h != nil {
cn.handler = h
cn.echo = echo
}
} else if l < pl {
// Split node
n := newNode(cn.prefix[l:], cn.has, cn.handler, cn.edges, cn.echo)
n := newNode(cn.prefix[l:], cn.handler, cn.edges, cn.echo)
cn.edges = edges{n} // Add to parent
// Reset parent node
cn.label = cn.prefix[0]
cn.prefix = cn.prefix[:l]
cn.has = 0
cn.handler = nil
cn.echo = nil
@ -99,7 +89,7 @@ func (r *router) insert(method, path string, h HandlerFunc, has ntype, echo *Ech
cn.echo = echo
} else {
// Create child node
n = newNode(search[l:], has, h, edges{}, echo)
n = newNode(search[l:], h, edges{}, echo)
cn.edges = append(cn.edges, n)
}
} else if l < sl {
@ -111,7 +101,7 @@ func (r *router) insert(method, path string, h HandlerFunc, has ntype, echo *Ech
continue
}
// Create child node
n := newNode(search, has, h, edges{}, echo)
n := newNode(search, h, edges{}, echo)
cn.edges = append(cn.edges, n)
} else {
// Node already exists
@ -124,11 +114,10 @@ func (r *router) insert(method, path string, h HandlerFunc, has ntype, echo *Ech
}
}
func newNode(pfx string, has ntype, h HandlerFunc, e edges, echo *Echo) (n *node) {
func newNode(pfx string, h HandlerFunc, e edges, echo *Echo) (n *node) {
n = &node{
label: pfx[0],
prefix: pfx,
has: has,
handler: h,
edges: e,
echo: echo,
@ -210,6 +199,7 @@ func (r *router) Find(method, path string, params Params) (h HandlerFunc, echo *
continue
}
// Not found
return
}
}

25
router_test.go
View File

@ -346,12 +346,23 @@ func TestRouterMicroParam(t *testing.T) {
func TestRouterConflict(t *testing.T) {
r := New().Router
r.Add(GET, "/users", func(*Context) {}, nil)
r.Add(GET, "/users/new", func(*Context) {}, nil)
r.Add(GET, "/users/old", func(*Context) {}, nil)
r.Add(GET, "/users/:id", func(*Context) {}, nil)
h, _ := r.Find(GET, "/users/nnn", params)
println(h)
r.Add(GET, "/new", func(*Context) {
println("/new")
}, nil)
r.Add(GET, "/new/:id", func(*Context) {
println("/new/:id")
}, nil)
r.Add(GET, "/new/name", func(*Context) {
println("/new/name")
}, nil)
r.Add(GET, "/new/name/joe", func(*Context) {
println("/new/name/joe")
}, nil)
r.Add(GET, "/new/name/:id", func(*Context) {
println("/new/name/:id")
}, nil)
// h, _ := r.Find(GET, "/users/new", params)
// h(&Context{})
n := r.trees[GET]
n.printTree("", true)
}
@ -392,7 +403,7 @@ func TestRouterServeHTTP(t *testing.T) {
func (n *node) printTree(pfx string, tail bool) {
p := prefix(tail, pfx, "└── ", "├── ")
fmt.Printf("%s%s has=%d, h=%v, echo=%v\n", p, n.prefix, n.has, n.handler, n.echo)
fmt.Printf("%s%s has=%d, echo=%v\n", p, n.prefix, n.handler, n.echo)
nodes := n.edges
l := len(nodes)