Merge pull request #1 from go-playground/group-logic-update

Group function update

Author: Dean Karn

README.md

@@ -1,6 +1,6 @@
 ##Pure
 <img align="right" src="https://raw.githubusercontent.com/go-playground/pure/master/logo.png">
-![Project status](https://img.shields.io/badge/version-3.1.1-green.svg)
+![Project status](https://img.shields.io/badge/version-4.0.0-green.svg)
 [![Build Status](https://semaphoreci.com/api/v1/joeybloggs/pure/branches/master/badge.svg)](https://semaphoreci.com/joeybloggs/pure)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/pure/badge.svg?branch=master)](https://coveralls.io/github/go-playground/pure?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/pure)](https://goreportcard.com/report/github.com/go-playground/pure)

group.go

@@ -9,7 +9,9 @@ import (
 // IRouteGroup interface for router group
 type IRouteGroup interface {
 	IRoutes
-	Group(prefix string, middleware ...Middleware) IRouteGroup
+	GroupWithNone(prefix string) IRouteGroup
+	GroupWithMore(prefix string, middleware ...Middleware) IRouteGroup
+	Group(prefix string) IRouteGroup
 }
 
 // IRoutes interface for routes
@@ -140,31 +142,41 @@ func (g *routeGroup) Match(methods []string, path string, h http.HandlerFunc) {
 	}
 }
 
-// Group creates a new sub router with prefix. It inherits all properties from
-// the parent. Passing middleware overrides parent middleware but still keeps
-// the root level middleware intact.
-func (g *routeGroup) Group(prefix string, middleware ...Middleware) IRouteGroup {
+// GroupWithNone creates a new sub router with specified prefix and no middleware attached.
+func (g *routeGroup) GroupWithNone(prefix string) IRouteGroup {
 
-	rg := &routeGroup{
-		prefix: g.prefix + prefix,
-		pure:   g.pure,
+	return &routeGroup{
+		prefix:     g.prefix + prefix,
+		pure:       g.pure,
+		middleware: make([]Middleware, 0),
 	}
+}
 
-	if len(middleware) == 0 {
-		rg.middleware = make([]Middleware, len(g.middleware)+len(middleware))
-		copy(rg.middleware, g.middleware)
-
-		return rg
-	}
+// GroupWithMore creates a new sub router with specified prefix, retains existing middleware and adds new middleware.
+func (g *routeGroup) GroupWithMore(prefix string, middleware ...Middleware) IRouteGroup {
 
-	if middleware[0] == nil {
-		rg.middleware = make([]Middleware, 0)
-		return rg
+	rg := &routeGroup{
+		prefix:     g.prefix + prefix,
+		pure:       g.pure,
+		middleware: make([]Middleware, len(middleware)),
 	}
 
-	rg.middleware = make([]Middleware, len(middleware))
 	copy(rg.middleware, g.pure.middleware)
 	rg.Use(middleware...)
 
 	return rg
 }
+
+// Group creates a new sub router with specified prefix and retains existing middleware.
+func (g *routeGroup) Group(prefix string) IRouteGroup {
+
+	rg := &routeGroup{
+		prefix:     g.prefix + prefix,
+		pure:       g.pure,
+		middleware: make([]Middleware, len(g.middleware)),
+	}
+
+	copy(rg.middleware, g.middleware)
+
+	return rg
+}

group_test.go

@@ -67,7 +67,7 @@ func TestUseAndGroup(t *testing.T) {
 		}
 	}
 
-	sh := p.Group("/superheros", logger2)
+	sh := p.GroupWithMore("/superheros", logger2)
 	sh.Get("/", fn)
 	sh.Get("/list/", fn)
 
@@ -97,7 +97,7 @@ func TestUseAndGroup(t *testing.T) {
 
 	log = ""
 
-	g2 := p.Group("/admins", nil)
+	g2 := p.GroupWithNone("/admins")
 	g2.Get("/", fn)
 	g2.Get("/list/", fn)