Fixed #9

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

README.md

@@ -111,32 +111,32 @@ func main() {
 ```
 
 ### Benchmark
-Based on [julienschmidt/go-http-routing-benchmark] (https://github.com/vishr/go-http-routing-benchmark), March 25, 2015
+Based on [julienschmidt/go-http-routing-benchmark] (https://github.com/vishr/go-http-routing-benchmark), April 1, 2015
 ##### [GitHub API](http://developer.github.com/v3)
 ```
-BenchmarkAce_GithubAll	    	20000	     70318 ns/op	   13792 B/op	     167 allocs/op
-BenchmarkBear_GithubAll	    	10000	    262758 ns/op	   79952 B/op	     943 allocs/op
-BenchmarkBeego_GithubAll	 	 3000	    504264 ns/op	  146272 B/op	    2092 allocs/op
-BenchmarkEcho_GithubAll	    	30000	     45349 ns/op	       0 B/op	       0 allocs/op
-BenchmarkBone_GithubAll	     	 1000	   2058931 ns/op	  648016 B/op	    8119 allocs/op
-BenchmarkDenco_GithubAll		20000	     79656 ns/op	   20224 B/op	     167 allocs/op
-BenchmarkGin_GithubAll	    	20000	     71009 ns/op	   13792 B/op	     167 allocs/op
-BenchmarkGocraftWeb_GithubAll	 5000	    384342 ns/op	  133280 B/op	    1889 allocs/op
-BenchmarkGoji_GithubAll	    	 3000	    565323 ns/op	   56113 B/op	     334 allocs/op
-BenchmarkGoJsonRest_GithubAll	 5000	    461591 ns/op	  135995 B/op	    2940 allocs/op
-BenchmarkGoRestful_GithubAll	  200	   8828847 ns/op	  649139 B/op	    7355 allocs/op
-BenchmarkGorillaMux_GithubAll	  200	   6794821 ns/op	  153137 B/op	    1791 allocs/op
-BenchmarkHttpRouter_GithubAll	30000	     51688 ns/op	   13792 B/op	     167 allocs/op
-BenchmarkHttpTreeMux_GithubAll	10000	    136677 ns/op	   56112 B/op	     334 allocs/op
-BenchmarkKocha_GithubAll	   	10000	    145115 ns/op	   23304 B/op	     843 allocs/op
-BenchmarkMacaron_GithubAll	     2000	    684714 ns/op	  224960 B/op	    2315 allocs/op
-BenchmarkMartini_GithubAll	      100	  10501805 ns/op	  237953 B/op	    2686 allocs/op
-BenchmarkPat_GithubAll	     	  500	   3987941 ns/op	 1504101 B/op	   32222 allocs/op
-BenchmarkRevel_GithubAll	     2000	   1127175 ns/op	  345553 B/op	    5918 allocs/op
-BenchmarkRivet_GithubAll	   	10000	    239793 ns/op	   84272 B/op	    1079 allocs/op
-BenchmarkTango_GithubAll	      500	   3452359 ns/op	 1338664 B/op	   27736 allocs/op
-BenchmarkTigerTonic_GithubAll	 2000	    951609 ns/op	  241088 B/op	    6052 allocs/op
-BenchmarkTraffic_GithubAll	      200	   7496057 ns/op	 2664761 B/op	   22390 allocs/op
-BenchmarkVulcan_GithubAll	     5000	    300807 ns/op	   19894 B/op	     609 allocs/op
-BenchmarkZeus_GithubAll	         2000	    801269 ns/op	  300688 B/op	    2648 allocs/op
+BenchmarkAce_GithubAll	   		20000	     69126 ns/op	   13792 B/op	     167 allocs/op
+BenchmarkBear_GithubAll	   		10000	    252699 ns/op	   79952 B/op	     943 allocs/op
+BenchmarkBeego_GithubAll		 3000	    485692 ns/op	  146272 B/op	    2092 allocs/op
+BenchmarkEcho_GithubAll	   		30000	     43700 ns/op	       0 B/op	       0 allocs/op
+BenchmarkBone_GithubAll	    	 1000	   2158467 ns/op	  648016 B/op	    8119 allocs/op
+BenchmarkDenco_GithubAll   		20000	     83022 ns/op	   20224 B/op	     167 allocs/op
+BenchmarkGin_GithubAll	   		20000	     72317 ns/op	   13792 B/op	     167 allocs/op
+BenchmarkGocraftWeb_GithubAll	 5000	    381554 ns/op	  133280 B/op	    1889 allocs/op
+BenchmarkGoji_GithubAll	    	 3000	    605232 ns/op	   56113 B/op	     334 allocs/op
+BenchmarkGoJsonRest_GithubAll	 5000	    467810 ns/op	  135995 B/op	    2940 allocs/op
+BenchmarkGoRestful_GithubAll	  200	   9345441 ns/op	  707604 B/op	    7558 allocs/op
+BenchmarkGorillaMux_GithubAll	  200	   7043040 ns/op	  153136 B/op	    1791 allocs/op
+BenchmarkHttpRouter_GithubAll	30000	     52251 ns/op	   13792 B/op	     167 allocs/op
+BenchmarkHttpTreeMux_GithubAll	10000	    145114 ns/op	   56112 B/op	     334 allocs/op
+BenchmarkKocha_GithubAll	    10000	    145061 ns/op	   23304 B/op	     843 allocs/op
+BenchmarkMacaron_GithubAll	     2000	    697957 ns/op	  224960 B/op	    2315 allocs/op
+BenchmarkMartini_GithubAll	      100	  11651997 ns/op	  237953 B/op	    2686 allocs/op
+BenchmarkPat_GithubAll	          300	   3951799 ns/op	 1504101 B/op	   32222 allocs/op
+BenchmarkRevel_GithubAll	     2000	   1129370 ns/op	  345553 B/op	    5918 allocs/op
+BenchmarkRivet_GithubAll	    10000	    246564 ns/op	   84272 B/op	    1079 allocs/op
+BenchmarkTango_GithubAll	      500	   3544850 ns/op	 1338664 B/op	   27736 allocs/op
+BenchmarkTigerTonic_GithubAll	 2000	    979370 ns/op	  241088 B/op	    6052 allocs/op
+BenchmarkTraffic_GithubAll	      200	   7508743 ns/op	 2664762 B/op	   22390 allocs/op
+BenchmarkVulcan_GithubAll	     5000	    286727 ns/op	   19894 B/op	     609 allocs/op
+BenchmarkZeus_GithubAll	         2000	    798335 ns/op	  300688 B/op	    2648 allocs/op
 ```

echo.go

@@ -23,6 +23,16 @@ type (
 )
 
 const (
+	MethodCONNECT = "CONNECT"
+	MethodDELETE  = "DELETE"
+	MethodGET     = "GET"
+	MethodHEAD    = "HEAD"
+	MethodOPTIONS = "OPTIONS"
+	MethodPATCH   = "PATCH"
+	MethodPOST    = "POST"
+	MethodPUT     = "PUT"
+	MethodTRACE   = "TRACE"
+
 	MIMEJSON = "application/json"
 	MIMEText = "text/plain"
 
@@ -32,6 +42,20 @@ const (
 	HeaderContentType        = "Content-Type"
 )
 
+var (
+	methods = []string{
+		MethodCONNECT,
+		MethodDELETE,
+		MethodGET,
+		MethodHEAD,
+		MethodOPTIONS,
+		MethodPATCH,
+		MethodPOST,
+		MethodPUT,
+		MethodTRACE,
+	}
+)
+
 // New creates a echo instance.
 func New() (e *Echo) {
 	e = &Echo{
@@ -99,47 +123,47 @@ func (e *Echo) Use(m ...Middleware) {
 
 // Connect adds a CONNECT route > handler to the router.
 func (e *Echo) Connect(path string, h Handler) {
-	e.Router.Add("CONNECT", path, wrapH(h))
+	e.Router.Add(MethodCONNECT, path, wrapH(h))
 }
 
 // Delete adds a DELETE route > handler to the router.
 func (e *Echo) Delete(path string, h Handler) {
-	e.Router.Add("DELETE", path, wrapH(h))
+	e.Router.Add(MethodDELETE, path, wrapH(h))
 }
 
 // Get adds a GET route > handler to the router.
 func (e *Echo) Get(path string, h Handler) {
-	e.Router.Add("GET", path, wrapH(h))
+	e.Router.Add(MethodGET, path, wrapH(h))
 }
 
 // Head adds a HEAD route > handler to the router.
 func (e *Echo) Head(path string, h Handler) {
-	e.Router.Add("HEAD", path, wrapH(h))
+	e.Router.Add(MethodHEAD, path, wrapH(h))
 }
 
 // Options adds an OPTIONS route > handler to the router.
 func (e *Echo) Options(path string, h Handler) {
-	e.Router.Add("OPTIONS", path, wrapH(h))
+	e.Router.Add(MethodOPTIONS, path, wrapH(h))
 }
 
 // Patch adds a PATCH route > handler to the router.
 func (e *Echo) Patch(path string, h Handler) {
-	e.Router.Add("PATCH", path, wrapH(h))
+	e.Router.Add(MethodPATCH, path, wrapH(h))
 }
 
 // Post adds a POST route > handler to the router.
 func (e *Echo) Post(path string, h Handler) {
-	e.Router.Add("POST", path, wrapH(h))
+	e.Router.Add(MethodPOST, path, wrapH(h))
 }
 
 // Put adds a PUT route > handler to the router.
 func (e *Echo) Put(path string, h Handler) {
-	e.Router.Add("PUT", path, wrapH(h))
+	e.Router.Add(MethodPUT, path, wrapH(h))
 }
 
 // Trace adds a TRACE route > handler to the router.
 func (e *Echo) Trace(path string, h Handler) {
-	e.Router.Add("TRACE", path, wrapH(h))
+	e.Router.Add(MethodTRACE, path, wrapH(h))
 }
 
 // Static serves static files.
@@ -163,7 +187,7 @@ func (e *Echo) Index(file string) {
 }
 
 func (e *Echo) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
-	h, c, s := e.Router.Find(r.Method, r.URL.Path)
+	h, c := e.Router.Find(r.Method, r.URL.Path)
 	c.reset(rw, r)
 	if h != nil {
 		// Middleware
@@ -173,11 +197,7 @@ func (e *Echo) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 		// Handler
 		h(c)
 	} else {
-		if s == NotFound {
-			e.notFoundHandler(c)
-		} else if s == NotAllowed {
-			e.methodNotAllowedHandler(c)
-		}
+		e.notFoundHandler(c)
 	}
 	e.pool.Put(c)
 }

echo_test.go

@@ -153,7 +153,6 @@ func TestEchoMethod(t *testing.T) {
 	// if h == nil {
 	// 	t.Error("should find route for GET")
 	// }
-
 }
 
 func TestEchoServeHTTP(t *testing.T) {
@@ -178,12 +177,12 @@ func TestEchoServeHTTP(t *testing.T) {
 	}
 
 	// NotAllowed
-	r, _ = http.NewRequest("POST", "/users", nil)
-	w = httptest.NewRecorder()
-	e.ServeHTTP(w, r)
-	if w.Code != http.StatusMethodNotAllowed {
-		t.Errorf("status code should be 405, found %d", w.Code)
-	}
+	// r, _ = http.NewRequest("POST", "/users", nil)
+	// w = httptest.NewRecorder()
+	// e.ServeHTTP(w, r)
+	// if w.Code != http.StatusMethodNotAllowed {
+	// 	t.Errorf("status code should be 405, found %d", w.Code)
+	// }
 }
 
 func verifyUser(rd io.Reader, t *testing.T) {