issue #26 separate path2list and logger

Author: wmentor

logger.go

@@ -0,0 +1,21 @@
+package serv
+
+import (
+	"time"
+)
+
+type LogData struct {
+	Method     string
+	Addr       string
+	Auth       string
+	RequestURL string
+	StatusCode int
+	Seconds    float64
+	Referer    string
+	UserAgent  string
+	UID        string
+}
+
+type Logger func(*LogData)
+
+type LongQueryHandler func(delta time.Duration, c *Context)

path2list.go

@@ -0,0 +1,33 @@
+package serv
+
+import (
+	"net/url"
+	"strings"
+)
+
+func path2list(path string) []string {
+
+	if len(path) < 1 || path[0] != '/' {
+		return nil
+	}
+
+	list := make([]string, 1, 32)
+
+	list[0] = "/"
+
+	for _, v := range strings.Split(path[1:], "/") {
+		if v != "" {
+			if uri, e := url.PathUnescape(v); e == nil {
+				list = append(list, uri)
+				if uri == "*" {
+					return list
+				}
+			} else {
+				return nil
+			}
+
+		}
+	}
+
+	return list
+}

path2list_test.go

@@ -0,0 +1,28 @@
+package serv
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestPath(t *testing.T) {
+
+	tF := func(path string, wait []string) {
+		res := path2list(path)
+		if strings.Join(res, "#") != strings.Join(wait, "#") {
+			t.Fatalf("path2list faild for: %s", path)
+		}
+	}
+
+	tF("", nil)
+	tF("123", nil)
+	tF("/", []string{"/"})
+	tF("//", []string{"/"})
+	tF("/test", []string{"/", "test"})
+	tF("/test/", []string{"/", "test"})
+	tF("/test//", []string{"/", "test"})
+	tF("/test+test/", []string{"/", "test+test"})
+	tF("/hello/world", []string{"/", "hello", "world"})
+	tF("/hello/:login/", []string{"/", "hello", ":login"})
+	tF("/posts/*", []string{"/", "posts", "*"})
+}

serv.go renamed to router.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"net/url"
 	"strings"
 	"time"
 
@@ -17,24 +16,9 @@ import (
 )
 
 type Handler func(c *Context)
-type LongQueryHandler func(delta time.Duration, c *Context)
 type ErrorHandler func(error)
 type AuthCheck func(user string, passwd string) bool
 
-type LogData struct {
-	Method     string
-	Addr       string
-	Auth       string
-	RequestURL string
-	StatusCode int
-	Seconds    float64
-	Referer    string
-	UserAgent  string
-	UID        string
-}
-
-type Logger func(*LogData)
-
 type fileHandler struct {
 	Filename string
 }
@@ -203,33 +187,6 @@ func RegisterJsonRPC(url string) {
 
 }
 
-func path2list(path string) []string {
-
-	if len(path) < 1 || path[0] != '/' {
-		return nil
-	}
-
-	list := make([]string, 1, 32)
-
-	list[0] = "/"
-
-	for _, v := range strings.Split(path[1:], "/") {
-		if v != "" {
-			if uri, e := url.PathUnescape(v); e == nil {
-				list = append(list, uri)
-				if uri == "*" {
-					return list
-				}
-			} else {
-				return nil
-			}
-
-		}
-	}
-
-	return list
-}
-
 func (r *router) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 
 	if handler, has := r.fileHandlers[req.URL.Path]; has {

serv_test.go renamed to router_test.go

@@ -11,27 +11,6 @@ import (
 	"github.com/wmentor/jrpc"
 )
 
-func TestPath(t *testing.T) {
-
-	tF := func(path string, wait []string) {
-		res := path2list(path)
-		if strings.Join(res, "#") != strings.Join(wait, "#") {
-			t.Fatalf("path2list faild for: %s", path)
-		}
-	}
-
-	tF("", nil)
-	tF("123", nil)
-	tF("/", []string{"/"})
-	tF("//", []string{"/"})
-	tF("/test", []string{"/", "test"})
-	tF("/test/", []string{"/", "test"})
-	tF("/test+test/", []string{"/", "test+test"})
-	tF("/hello/world", []string{"/", "hello", "world"})
-	tF("/hello/:login/", []string{"/", "hello", ":login"})
-	tF("/posts/*", []string{"/", "posts", "*"})
-}
-
 func TestServ(t *testing.T) {
 
 	Register("GET", "/", func(c *Context) {