From e066771207297be12998868874f110c6a4178d99 Mon Sep 17 00:00:00 2001
From: "Gerasimos (Makis) Maropoulos" <kataras2006@hotmail.com>
Date: Mon, 2 Oct 2017 04:01:23 +0300
Subject: [PATCH] Add support for multi http methods route registration at the
 `.HandleMany`

Former-commit-id: 6aa2c3027d64dac31a1cf84d782a3c63ad7b2fb0
---
 core/router/api_builder.go | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/router/api_builder.go b/core/router/api_builder.go
index a67f683c..b287bb10 100644
--- a/core/router/api_builder.go
+++ b/core/router/api_builder.go
@@ -188,20 +188,28 @@ func (api *APIBuilder) Handle(method string, relativePath string, handlers ...co
 //
 // This method is used behind the scenes at the `Controller` function
 // in order to handle more than one paths for the same controller instance.
-func (api *APIBuilder) HandleMany(method string, relativePath string, handlers ...context.Handler) (routes []*Route) {
-	trimmedPath := strings.Trim(relativePath, " ")
+func (api *APIBuilder) HandleMany(methodOrMulti string, relativePathorMulti string, handlers ...context.Handler) (routes []*Route) {
+	trimmedPath := strings.Trim(relativePathorMulti, " ")
+	trimmedMethod := strings.Trim(methodOrMulti, " ")
 	// at least slash
 	// a space
 	// at least one other slash for the next path
 	// app.Controller("/user /user{id}", new(UserController))
 	paths := strings.Split(trimmedPath, " ")
+	methods := strings.Split(trimmedMethod, " ")
 	for _, p := range paths {
 		if p != "" {
-			if method == "ANY" || method == "ALL" {
-				routes = append(routes, api.Any(p, handlers...)...)
-				continue
+			for _, method := range methods {
+				if method == "" {
+					method = "ANY"
+				}
+				if method == "ANY" || method == "ALL" {
+					routes = append(routes, api.Any(p, handlers...)...)
+					continue
+				}
+				routes = append(routes, api.Handle(method, p, handlers...))
 			}
-			routes = append(routes, api.Handle(method, p, handlers...))
+
 		}
 	}
 	return
@@ -699,18 +707,10 @@ func (api *APIBuilder) Favicon(favPath string, requestPath ...string) *Route {
 		return nil
 	}
 
-	// ignore error f.Close()
 	defer f.Close()
 	fi, _ := f.Stat()
 	if fi.IsDir() { // if it's dir the try to get the favicon.ico
-		fav := path.Join(favPath, "favicon.ico")
-		f, err = os.Open(fav)
-		if err != nil {
-			//we try again with .png
-			return api.Favicon(path.Join(favPath, "favicon.png"))
-		}
-		favPath = fav
-		fi, _ = f.Stat()
+		return api.Favicon(path.Join(favPath, "favicon.ico"))
 	}
 
 	cType := TypeByFilename(favPath)
@@ -747,7 +747,7 @@ func (api *APIBuilder) Favicon(favPath string, requestPath ...string) *Route {
 		}
 	}
 
-	reqPath := "/favicon" + path.Ext(fi.Name()) //we could use the filename, but because standards is /favicon.ico/.png.
+	reqPath := "/favicon" + path.Ext(fi.Name()) // we could use the filename, but because standards is /favicon.ico
 	if len(requestPath) > 0 && requestPath[0] != "" {
 		reqPath = requestPath[0]
 	}