Merge pull request #23 from ferry-go/feature/core/exposed-group-struct

exposing group struct
go-slide · Jul 18, 2020 · c26490c · c26490c
2 parents 14277cd + af32e8d
commit c26490c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/middleware.go b/middleware.go
@@ -31,7 +31,7 @@ func appLevelMiddleware(ctx *Ctx, ferry *Ferry) {
 
 func groupLevelMiddleware(ctx *Ctx, ferry *Ferry, routers []router) {
 	path := string(ctx.RequestCtx.Path())
-	// check if path is available in group middleware
+	// check if path is available in Group middleware
 	if len(ferry.groupMiddlewareMap) == 0 {
 		handleRouter(ctx, ferry, routers)
 		return

diff --git a/router.go b/router.go
@@ -18,14 +18,14 @@ type router struct {
 	handlers   []handler
 }
 
-type group struct {
+type Group struct {
 	path                   string
 	ferry                  *Ferry
 	middleware             []handler
 	middlewareCurrentIndex int
 }
 
-func (g *group) addRoute(method, path string, h ...handler) {
+func (g *Group) addRoute(method, path string, h ...handler) {
 	groupPath := fmt.Sprintf("%s%s", g.path, path)
 	pathWithRegex := findAndReplace(groupPath)
 	g.ferry.routerMap[method] = append(g.ferry.routerMap[method], router{
@@ -36,32 +36,32 @@ func (g *group) addRoute(method, path string, h ...handler) {
 }
 
 // Get method of ferry
-func (g *group) Get(path string, h handler) {
+func (g *Group) Get(path string, h handler) {
 	g.addRoute(GET, path, h)
 }
 
 // Post method of ferry
-func (g *group) Post(path string, h handler) {
+func (g *Group) Post(path string, h handler) {
 	g.addRoute(POST, path, h)
 }
 
 // Put method of ferry
-func (g *group) Put(path string, h handler) {
+func (g *Group) Put(path string, h handler) {
 	g.addRoute(PUT, path, h)
 }
 
 // Delete method of ferry
-func (g *group) Delete(path string, h handler) {
+func (g *Group) Delete(path string, h handler) {
 	g.addRoute(DELETE, path, h)
 }
 
-func (g *group) Use(h handler) {
+func (g *Group) Use(h handler) {
 	g.ferry.groupMiddlewareMap[g.path] = append(g.ferry.groupMiddlewareMap[g.path], h)
 }
 
 // Group method
-func (g *group) Group(path string) *group {
-	return &group{
+func (g *Group) Group(path string) *Group {
+	return &Group{
 		path:       fmt.Sprintf("%s%s", g.path, path),
 		ferry:      g.ferry,
 		middleware: []handler{},

diff --git a/server.go b/server.go
@@ -44,8 +44,14 @@ func (ferry *Ferry) Listen(host string) error {
 		NoDefaultServerHeader: true,
 		Handler:               handler,
 		ErrorHandler: func(r *fasthttp.RequestCtx, err error) {
-			ctx := getRouterContext(r, ferry)
-			_ = ferry.errorHandler(ctx, err)
+			if ferry.errorHandler != nil {
+				ctx := getRouterContext(r, ferry)
+				_ = ferry.errorHandler(ctx, err)
+			} else {
+				// TODO replace it with logger
+				fmt.Println(err.Error())
+			}
+
 		},
 	}
 	return server.ListenAndServe(host)
@@ -86,8 +92,8 @@ func (ferry *Ferry) Delete(path string, h ...handler) {
 }
 
 // Group method
-func (ferry *Ferry) Group(path string) *group {
-	return &group{
+func (ferry *Ferry) Group(path string) *Group {
+	return &Group{
 		path:  path,
 		ferry: ferry,
 	}