Code cleanup and refactoring

Author: leeqvip

README.md

@@ -52,33 +52,33 @@ go get -u github.com/thinkoner/thinkgo
 package main
 
 import (
-	"github.com/thinkoner/thinkgo"
-	"fmt"
-	"github.com/thinkoner/thinkgo/router"
-	"github.com/thinkoner/thinkgo/context"
+    "fmt"
+
+	"github.com/thinkoner/thinkgo"	
+	"github.com/thinkoner/thinkgo/think"
 )
 
 func main() {
-	think := thinkgo.BootStrap()
-	think.RegisterRoute(func(route *router.Route) {
+	th := thinkgo.New()
+	th.RegisterRoute(func(route *think.Route) {
 
-		route.Get("/", func(req *context.Request) *context.Response {
+		route.Get("/", func(req *think.Req) *think.Res {
 			return thinkgo.Text("Hello ThinkGo !")
 		})
 
-		route.Get("/ping", func(req *context.Request) *context.Response {
+		route.Get("/ping", func(req *think.Req) *think.Res {
 			return thinkgo.Json(map[string]string{
 				"message": "pong",
 		    })
 		})
 
 		// Dependency injection
-		route.Get("/user/{name}", func(req *context.Request, name string) *context.Response {
+		route.Get("/user/{name}", func(req *think.Req, name string) *think.Res {
 			return thinkgo.Text(fmt.Sprintf("Hello %s !", name))
 		})
 	})
 	// listen and serve on 0.0.0.0:9011
-	think.Run()
+	th.Run()
 }
 ```
 

context/request.go

@@ -1,7 +1,9 @@
 package context
 
 import (
+	"bytes"
 	"errors"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
@@ -232,6 +234,21 @@ func (r *Request) Method() string {
 	return r.method
 }
 
+// GetContent Returns the request body content.
+func (r *Request) GetContent() ([]byte, error) {
+	var body []byte
+
+	if body == nil {
+		body, err := ioutil.ReadAll(r.Request.Body)
+		if err != nil {
+			return nil, err
+		}
+		r.Request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
+	}
+
+	return body, nil
+}
+
 // Session get the session associated with the request.
 func (r *Request) Session() Session {
 	return r.session

context/response.go

@@ -94,33 +94,26 @@ func NewResponse() *Response {
 	r := &Response{
 		Header: &http.Header{},
 	}
+	r.SetCode(http.StatusOK)
 	r.SetContentType("text/html")
 	r.SetCharset("utf-8")
-	r.SetCode(http.StatusOK)
 	r.CookieHandler = ParseCookieHandler()
 	return r
 }
 
 // NotFoundResponse Create a new HTTP NotFoundResponse
 func NotFoundResponse() *Response {
-	r := NewResponse()
-	r.SetContent("Not Found")
-	r.SetCode(http.StatusNotFound)
-	return r
+	return NewResponse().SetCode(http.StatusNotFound).SetContent("Not Found")
 }
 
 // NotFoundResponse Create a new HTTP Error Response
 func ErrorResponse() *Response {
-	r := NewResponse()
-	r.SetContent("Server Error")
-	r.SetCode(http.StatusInternalServerError)
-	return r
+	return NewResponse().SetCode(http.StatusInternalServerError).SetContent("Server Error")
 }
 
 // Redirect Create a new HTTP Redirect Response
 func Redirect(to string) *Response {
-	r := NewResponse()
+	r := NewResponse().SetCode(http.StatusMovedPermanently)
 	r.Header.Set("Location", to)
-	r.SetCode(http.StatusMovedPermanently)
 	return r
 }

coverage.txt

@@ -1,5 +1,7 @@
 module github.com/thinkoner/thinkgo
 
+go 1.11
+
 require (
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/stretchr/testify v1.3.0

go.mod

@@ -5,5 +5,4 @@ github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=

go.sum

@@ -2,15 +2,16 @@ package thinkgo
 
 import (
 	"container/list"
+	"html/template"
 	"net/http"
 
-	"github.com/thinkoner/thinkgo/app"
 	"github.com/thinkoner/thinkgo/context"
 	"github.com/thinkoner/thinkgo/router"
+	"github.com/thinkoner/thinkgo/think"
 )
 
 type Pipeline struct {
-	handlers []app.Handler
+	handlers []think.Handler
 	pipeline *list.List
 	passable *context.Request
 }
@@ -24,13 +25,13 @@ func NewPipeline() *Pipeline {
 }
 
 // Pipe Push a Middleware Handler to the pipeline
-func (p *Pipeline) Pipe(m app.Handler) *Pipeline {
+func (p *Pipeline) Pipe(m think.Handler) *Pipeline {
 	p.pipeline.PushBack(m)
 	return p
 }
 
 // Pipe Batch push Middleware Handlers to the pipeline
-func (p *Pipeline) Through(hls []app.Handler) *Pipeline {
+func (p *Pipeline) Through(hls []think.Handler) *Pipeline {
 	for _, hl := range hls {
 		p.Pipe(hl)
 	}
@@ -64,23 +65,29 @@ func (p *Pipeline) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	switch result.(type) {
 	case router.Response:
 		result.(router.Response).Send(w)
-		return
+		break
+	case template.HTML:
+		think.Html(string(result.(template.HTML))).Send(w)
+		break
 	case http.Handler:
 		result.(http.Handler).ServeHTTP(w, r)
-		return
+		break
+	default:
+		think.Response(result).Send(w)
+		break
 	}
 }
 
 func (p *Pipeline) handler(passable *context.Request, e *list.Element) interface{} {
 	if e == nil {
 		return nil
 	}
-	hl := e.Value.(app.Handler)
+	hl := e.Value.(think.Handler)
 	result := hl.Process(passable, p.closure(e))
 	return result
 }
 
-func (p *Pipeline) closure(e *list.Element) app.Closure {
+func (p *Pipeline) closure(e *list.Element) think.Closure {
 	return func(req *context.Request) interface{} {
 		e = e.Next()
 		return p.handler(req, e)

pipeline.go

@@ -0,0 +1,6 @@
+package router
+
+type parameter struct {
+	name  string
+	value string
+}