Merge pull request #28 from wmentor/i26

I26

context.go

@@ -14,11 +14,13 @@ import (
 )
 
 type Context struct {
-	rw         http.ResponseWriter
-	req        *http.Request
-	params     Params
-	qw         Query
-	statusCode int
+	rw           http.ResponseWriter
+	req          *http.Request
+	params       Params
+	qw           Query
+	statusCode   int
+	errorHandler ErrorHandler
+	tt           *tt.TT
 }
 
 func (c *Context) StandardError(code int) {
@@ -221,34 +223,34 @@ func (c *Context) SetCookie(cookie *http.Cookie) {
 
 func (c *Context) Render(tmpl string, vars map[string]interface{}) {
 
-	v := tt.MakeVars()
+	v := c.tt.MakeVars()
 
 	for k, val := range vars {
 		v.Set(k, val)
 	}
 
-	if res, err := tt.Render(tmpl, v); err == nil {
+	if res, err := c.tt.Render(tmpl, v); err == nil {
 		c.Write(res)
 	} else {
-		if rt.errorHandler != nil {
-			rt.errorHandler(err)
+		if c.errorHandler != nil {
+			c.errorHandler(err)
 		}
 	}
 }
 
 func (c *Context) RenderStr(tmpl string, vars map[string]interface{}) {
 
-	v := tt.MakeVars()
+	v := c.tt.MakeVars()
 
 	for k, val := range vars {
 		v.Set(k, val)
 	}
 
-	if res, err := tt.RenderString(tmpl, v); err == nil {
+	if res, err := c.tt.RenderString(tmpl, v); err == nil {
 		c.Write(res)
 	} else {
-		if rt.errorHandler != nil {
-			rt.errorHandler(err)
+		if c.errorHandler != nil {
+			c.errorHandler(err)
 		}
 	}
 }

errors.go

@@ -8,6 +8,8 @@ var (
 	errorCodes map[int][]byte
 
 	errorInvalidRequestMethod error = errors.New("invalid request method")
+
+	ErrServerAlreadyStarted error = errors.New("routerer already started")
 )
 
 func init() {

global.go

@@ -0,0 +1,69 @@
+package serv
+
+import (
+	"time"
+)
+
+var (
+	server *Server
+)
+
+func init() {
+	server = New()
+}
+
+func Start(addr string) error {
+	return server.Start(addr)
+}
+
+func Shutdown() {
+	server.Shutdown()
+}
+
+func SetLongQueryHandler(delta time.Duration, fn LongQueryHandler) {
+	server.SetLongQueryHandler(delta, fn)
+}
+
+func SetErrorHandler(fn ErrorHandler) {
+	server.SetErrorHandler(fn)
+}
+
+func SetAuthCheck(fn AuthCheck) {
+	server.SetAuthCheck(fn)
+}
+
+func SetUID(enable bool) {
+	server.SetUID(enable)
+}
+
+func SetLogger(l Logger) {
+	server.SetLogger(l)
+}
+
+func Static(prefix string, dir string) {
+	server.Static(prefix, dir)
+}
+
+func File(path string, filename string) {
+	server.File(path, filename)
+}
+
+func Register(method string, path string, fn Handler) {
+	server.Register(method, path, fn)
+}
+
+func RegisterAuth(method string, path string, fn Handler) {
+	server.RegisterAuth(method, path, fn)
+}
+
+func RegMethod(method string, fn interface{}) {
+	server.RegMethod(method, fn)
+}
+
+func RegisterJsonRPC(url string) {
+	server.RegisterJsonRPC(url)
+}
+
+func LoadTemplates(dir string) {
+	server.LoadTemplates(dir)
+}

go.mod

@@ -5,6 +5,6 @@ go 1.14
 require (
 	github.com/wmentor/jrpc v1.0.3
 	github.com/wmentor/latency v1.0.0
-	github.com/wmentor/tt v1.0.0
+	github.com/wmentor/tt v1.0.1
 	github.com/wmentor/uniq v1.0.0
 )

go.sum

@@ -10,5 +10,7 @@ github.com/wmentor/latency v1.0.0 h1:G+JZVaRG6qW2Lzgv5Y9T1aiFETEqiQEYXuTSWvh2hZ8
 github.com/wmentor/latency v1.0.0/go.mod h1:WLQCiWrolPQZPot5HRFE5kMaanoOlOfbJraUyHePPCg=
 github.com/wmentor/tt v1.0.0 h1:TaVIwklNHxCJf6ZGdGFBMMed2VCMp33D3tlm3TzSB5k=
 github.com/wmentor/tt v1.0.0/go.mod h1:UInfmaL3BqW7CqBKvLHVwinfsM2HuII9iCaiwakkCPU=
+github.com/wmentor/tt v1.0.1 h1:1dnRAA9Ru0t+qbcSqKZ3Dv/01PPsJhfvFOzwrhYklkE=
+github.com/wmentor/tt v1.0.1/go.mod h1:UInfmaL3BqW7CqBKvLHVwinfsM2HuII9iCaiwakkCPU=
 github.com/wmentor/uniq v1.0.0 h1:h4//Rt/C6+SOQn5HhURRvJFeBUPzglip996sG8ln6y8=
 github.com/wmentor/uniq v1.0.0/go.mod h1:v7DrXGBZ/eKhNMvgKOOB93NIVaJnIy8ESYYg3+4/Qgg=

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", "*"})
+}