minor code cleanup + auto handle OPTION requests set to false by default.

Author: joeybloggs

README.md

@@ -1,6 +1,6 @@
 ##LARS
 <img align="right" src="https://raw.githubusercontent.com/go-playground/lars/master/examples/README/test.gif">
-![Project status](https://img.shields.io/badge/version-3.1-green.svg)
+![Project status](https://img.shields.io/badge/version-3.2.0-green.svg)
 [![Build Status](https://semaphoreci.com/api/v1/projects/4351aa2d-2f94-40be-a6ef-85c248490378/679708/badge.svg)](https://semaphoreci.com/joeybloggs/lars)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/lars/badge.svg?branch=master)](https://coveralls.io/github/go-playground/lars?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/go-playground/lars)](https://goreportcard.com/report/go-playground/lars)

context.go

@@ -74,7 +74,6 @@ type Ctx struct {
 	index               int
 	formParsed          bool
 	multipartFormParsed bool
-	l                   *LARS
 }
 
 var _ context.Context = &Ctx{}
@@ -84,7 +83,6 @@ func NewContext(l *LARS) *Ctx {
 
 	c := &Ctx{
 		params: make(Params, l.mostParams),
-		l:      l,
 	}
 
 	c.response = newResponse(nil, c)
@@ -421,7 +419,7 @@ func (c *Ctx) Inline(r io.Reader, filename string) (err error) {
 // json.NewDecoder(io.LimitReader(c.request.Body, maxMemory)).Decode(v).
 func (c *Ctx) Decode(includeFormQueryParams bool, maxMemory int64, v interface{}) (err error) {
 
-	c.l.initFormDecoder()
+	initFormDecoder()
 
 	typ := c.request.Header.Get(ContentType)
 
@@ -441,19 +439,19 @@ func (c *Ctx) Decode(includeFormQueryParams bool, maxMemory int64, v interface{}
 
 		if err = c.ParseForm(); err == nil {
 			if includeFormQueryParams {
-				err = c.l.formDecoder.Decode(v, c.request.Form)
+				err = formDecoder.Decode(v, c.request.Form)
 			} else {
-				err = c.l.formDecoder.Decode(v, c.request.PostForm)
+				err = formDecoder.Decode(v, c.request.PostForm)
 			}
 		}
 
 	case MultipartForm:
 
 		if err = c.ParseMultipartForm(maxMemory); err == nil {
 			if includeFormQueryParams {
-				err = c.l.formDecoder.Decode(v, c.request.Form)
+				err = formDecoder.Decode(v, c.request.Form)
 			} else {
-				err = c.l.formDecoder.Decode(v, c.request.MultipartForm.Value)
+				err = formDecoder.Decode(v, c.request.MultipartForm.Value)
 			}
 		}
 	}

lars.go

@@ -152,10 +152,6 @@ type LARS struct {
 	// if enabled automatically handles OPTION requests; manually configured OPTION
 	// handlers take precidence. default true
 	automaticallyHandleOPTIONS bool
-
-	// form decoder + once initialization
-	formDecoder     *form.Decoder
-	formDecoderInit sync.Once
 }
 
 // RouteMap contains a single routes full path
@@ -179,6 +175,9 @@ var (
 	automaticOPTIONSHandler = func(c Context) {
 		c.Response().WriteHeader(http.StatusOK)
 	}
+
+	formDecoder     *form.Decoder
+	formDecoderInit sync.Once
 )
 
 // New Creates and returns a new lars instance
@@ -197,7 +196,7 @@ func New() *LARS {
 		http405:                    []HandlerFunc{methodNotAllowedHandler},
 		redirectTrailingSlash:      true,
 		handleMethodNotAllowed:     false,
-		automaticallyHandleOPTIONS: true,
+		automaticallyHandleOPTIONS: false,
 	}
 
 	l.routeGroup.lars = l
@@ -213,19 +212,19 @@ func New() *LARS {
 	return l
 }
 
+func initFormDecoder() {
+	formDecoderInit.Do(func() {
+		formDecoder = form.NewDecoder()
+	})
+}
+
 // BuiltInFormDecoder returns the built in form decoder github.com/go-playground/form
 // in order for custom type to be registered.
 func (l *LARS) BuiltInFormDecoder() *form.Decoder {
 
-	l.initFormDecoder()
-
-	return l.formDecoder
-}
+	initFormDecoder()
 
-func (l *LARS) initFormDecoder() {
-	l.formDecoderInit.Do(func() {
-		l.formDecoder = form.NewDecoder()
-	})
+	return formDecoder
 }
 
 // RegisterCustomHandler registers a custom handler that gets wrapped by HandlerFunc
@@ -305,6 +304,7 @@ func (l *LARS) Serve() http.Handler {
 
 // Conforms to the http.Handler interface.
 func (l *LARS) serveHTTP(w http.ResponseWriter, r *http.Request) {
+
 	c := l.pool.Get().(*Ctx)
 
 	c.parent.RequestStart(w, r)

node.go

@@ -377,9 +377,6 @@ walk: // Outer loop for walking the tree
 					if n.handler != nil {
 						handler = n.handler.chain
 						handlerName = n.handler.handlerName
-					}
-
-					if handler != nil {
 						return
 					} else if len(n.children) == 1 {
 						// No handle found. Check if a handle for this path