Merge pull request #12 from go-rs/develop

Develop

Author: roshangade

api.go

@@ -134,15 +134,26 @@ func (api *API) OnError(code string, handle Handler) {
 	api.exceptions = append(api.exceptions, exp)
 }
 
+// OnErrors method is used to handle a custom errors thrown by users
+func (api *API) OnErrors(codes []string, handle Handler) {
+	for _, code := range codes {
+		exp := exception{
+			code:   code,
+			handle: handle,
+		}
+		api.exceptions = append(api.exceptions, exp)
+	}
+}
+
 // UnhandledException method is used to handle all unhandled exceptions
 func (api *API) UnhandledException(handle Handler) {
 	api.unhandled = handle
 }
 
 // error variables to handle expected errors
 var (
-	codeNotFound          = "URL_NOT_FOUND"
-	codeUncaughtException = "UNCAUGHT_EXCEPTION"
+	ErrCodeNotFound          = "URL_NOT_FOUND"
+	ErrCodeUncaughtException = "UNCAUGHT_EXCEPTION"
 )
 
 // It's required handle for http module.
@@ -163,7 +174,7 @@ func (api *API) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 		err := recover()
 		if err != nil {
 			if !ctx.end {
-				ctx.code = codeUncaughtException
+				ctx.code = ErrCodeUncaughtException
 				ctx.err = fmt.Errorf("%v", err)
 				ctx.unhandledException()
 			}
@@ -173,7 +184,7 @@ func (api *API) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 
 	// STEP 2: execute all interceptors
 	for _, task := range api.interceptors {
-		if ctx.end || ctx.err != nil {
+		if ctx.end || ctx.code != "" {
 			break
 		}
 
@@ -183,7 +194,7 @@ func (api *API) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	// STEP 3: check routes
 	urlPath := []byte(req.URL.Path)
 	for _, route := range api.routes {
-		if ctx.end || ctx.err != nil {
+		if ctx.end || ctx.code != "" {
 			break
 		}
 
@@ -208,7 +219,7 @@ func (api *API) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	// STEP 5: unhandled exceptions
 	if !ctx.end {
 		if ctx.code == "" && !ctx.found {
-			ctx.Throw(codeNotFound)
+			ctx.Throw(ErrCodeNotFound)
 		}
 
 		if api.unhandled != nil {

context.go

@@ -23,7 +23,7 @@ type Context struct {
 	Request  *http.Request
 	Response http.ResponseWriter
 	Query    url.Values
-	Body     interface{}
+	Body     map[string]interface{}
 	Params   map[string]string
 
 	// for internal use
@@ -215,18 +215,20 @@ func (ctx *Context) unhandledException() {
 	}
 
 	// NOT FOUND handler
-	if ctx.code == codeNotFound {
+	if ctx.code == ErrCodeNotFound {
 		http.NotFound(ctx.Response, ctx.Request)
 		return
 	}
 
 	if ctx.code != "" || ctx.err != nil {
 		msg := ctx.code
 		if ctx.err != nil {
-			msg = ctx.err.Error()
+			msg += "\nError: " + ctx.err.Error()
 		}
 		ctx.SetHeader("Content-Type", "text/plain;charset=UTF-8")
-		ctx.Status(http.StatusInternalServerError)
+		if ctx.status > 400 {
+			ctx.Status(http.StatusInternalServerError)
+		}
 		ctx.Write([]byte(msg))
 	}
 }