some code cleanup

Author: joeybloggs

context.go

@@ -62,11 +62,11 @@ type Ctx struct {
 	websocket           *websocket.Conn
 	params              Params
 	handlers            HandlersChain
+	parent              Context
 	handlerName         string
 	index               int
 	formParsed          bool
 	multipartFormParsed bool
-	parent              Context
 }
 
 var _ context.Context = &Ctx{}

lars.go

@@ -112,12 +112,6 @@ type customHandlers map[reflect.Type]CustomHandlerFunc
 type LARS struct {
 	routeGroup
 	trees map[string]*node
-	// router *Router
-
-	// mostParams used to keep track of the most amount of
-	// params in any URL and this will set the default capacity
-	// of eachContext Params
-	mostParams uint8
 
 	// function that gets called to create the context object... is total overridable using RegisterContext
 	contextFunc ContextFunc
@@ -132,6 +126,11 @@ type LARS struct {
 
 	customHandlersFuncs customHandlers
 
+	// mostParams used to keep track of the most amount of
+	// params in any URL and this will set the default capacity
+	// of eachContext Params
+	mostParams uint8
+
 	// Enables automatic redirection if the current route can't be matched but a
 	// handler for the path with (without) the trailing slash exists.
 	// For example if /foo/ is requested but a route only exists for /foo, the
@@ -351,8 +350,6 @@ END:
 
 func (l *LARS) getOptions(c *Ctx) {
 
-	res := c.Response()
-
 	if c.request.URL.Path == "*" { // check server-wide OPTIONS
 
 		for m := range l.trees {
@@ -361,7 +358,7 @@ func (l *LARS) getOptions(c *Ctx) {
 				continue
 			}
 
-			res.Header().Add(Allow, m)
+			c.response.Header().Add(Allow, m)
 		}
 
 	} else {
@@ -372,28 +369,26 @@ func (l *LARS) getOptions(c *Ctx) {
 			}
 
 			if c.handlers, _, _ = tree.find(c.request.URL.Path, c.params); c.handlers != nil {
-				res.Header().Add(Allow, m)
+				c.response.Header().Add(Allow, m)
 			}
 		}
 
 	}
 
-	res.Header().Add(Allow, OPTIONS)
+	c.response.Header().Add(Allow, OPTIONS)
 	c.handlers = l.automaticOPTIONS
 
 	return
 }
 
 func (l *LARS) checkMethodNotAllowed(c *Ctx) (found bool) {
 
-	res := c.Response()
-
 	for m, tree := range l.trees {
 
 		if m != c.request.Method {
 			if c.handlers, _, _ = tree.find(c.request.URL.Path, c.params); c.handlers != nil {
 				// add methods
-				res.Header().Add(Allow, m)
+				c.response.Header().Add(Allow, m)
 				found = true
 			}
 		}

lars_test.go

@@ -969,7 +969,10 @@ func requestMultiPart(method string, url string, l *LARS) (int, string) {
 		fmt.Println("ERR COPY:", err)
 	}
 
-	writer.WriteField("username", "joeybloggs")
+	err = writer.WriteField("username", "joeybloggs")
+	if err != nil {
+		fmt.Println("ERR:", err)
+	}
 
 	err = writer.Close()
 	if err != nil {

node.go

@@ -11,8 +11,8 @@ import "net/url"
 type nodeType uint8
 
 const (
-	isStatic nodeType = iota // default
-	isRoot
+	// isStatic nodeType = iota // default
+	isRoot nodeType = iota + 1
 	hasParams
 	matchesAny
 )
@@ -26,12 +26,12 @@ type existingParams map[string]struct{}
 
 type node struct {
 	path      string
-	wildChild bool
-	nType     nodeType
 	indices   string
 	children  []*node
 	handler   *methodChain
 	priority  uint32
+	nType     nodeType
+	wildChild bool
 }
 
 func (e existingParams) Check(param string, path string) {
@@ -76,8 +76,8 @@ func (n *node) add(path string, handlerName string, handler HandlersChain) (lp u
 
 	var err error
 
-	if path == "" {
-		path = "/"
+	if path == blank {
+		path = basePath
 	}
 
 	existing := make(existingParams)
@@ -140,7 +140,7 @@ func (n *node) add(path string, handlerName string, handler HandlersChain) (lp u
 					if len(path) >= len(n.path) && n.path == path[:len(n.path)] {
 
 						// check for longer wildcard, e.g. :name and :names
-						if len(n.path) >= len(path) || path[len(n.path)] == '/' {
+						if len(n.path) >= len(path) || path[len(n.path)] == slashByte {
 							continue walk
 						}
 					}
@@ -153,7 +153,7 @@ func (n *node) add(path string, handlerName string, handler HandlersChain) (lp u
 				c := path[0]
 
 				// slash after param
-				if n.nType == hasParams && c == '/' && len(n.children) == 1 {
+				if n.nType == hasParams && c == slashByte && len(n.children) == 1 {
 					n = n.children[0]
 					n.priority++
 					continue walk
@@ -214,7 +214,7 @@ func (n *node) insertChild(numParams uint8, existing existingParams, path string
 
 		// find wildcard end (either '/' or path end)
 		end := i + 1
-		for end < max && path[end] != '/' {
+		for end < max && path[end] != slashByte {
 			switch path[end] {
 			// the wildcard name must not contain ':' and '*'
 			case paramByte, wildByte:
@@ -281,7 +281,7 @@ func (n *node) insertChild(numParams uint8, existing existingParams, path string
 
 			// currently fixed width 1 for '/'
 			i--
-			if path[i] != '/' {
+			if path[i] != slashByte {
 				panic("no / before catch-all in path '" + fullPath + "'")
 			}
 
@@ -353,7 +353,7 @@ walk: // Outer loop for walking the tree
 
 					// find param end (either '/' or path end)
 					end := 0
-					for end < len(path) && path[end] != '/' {
+					for end < len(path) && path[end] != slashByte {
 						end++
 					}