From 1ba07940581bf9bf436f0824fbac4d19d31c4a58 Mon Sep 17 00:00:00 2001 From: lrodham Date: Sun, 12 Nov 2017 20:43:43 +0000 Subject: [PATCH] SAVEPOINT --- default_context.go | 12 ++++++------ default_router_test.go | 2 +- examples/default_router.go | 10 ++++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/default_context.go b/default_context.go index 0a002e0..7fef50c 100644 --- a/default_context.go +++ b/default_context.go @@ -1,7 +1,9 @@ package tuu import ( + "bytes" "context" + "io" "net/http" "net/url" @@ -68,9 +70,7 @@ func (d *DefaultContext) Value(key interface{}) interface{} { } func (d *DefaultContext) Render(status int, rr render.Renderer) error { - //p := plush.NewContext() - - /*if rr != nil { + if rr != nil { data := d.data pp := map[string]string{} for k, v := range d.params { @@ -83,19 +83,19 @@ func (d *DefaultContext) Render(status int, rr render.Renderer) error { err := rr.Render(bb, data) if err != nil { - return HTTPError{Status: 500, Cause: errors.WithStack(err)} + return err } d.Response().Header().Set("Content-Type", rr.ContentType()) d.Response().WriteHeader(status) _, err = io.Copy(d.Response(), bb) if err != nil { - return HTTPError{Status: 500, Cause: errors.WithStack(err)} + return err } return nil } - */ + d.Response().WriteHeader(status) return nil } diff --git a/default_router_test.go b/default_router_test.go index d6c06d1..1606ff3 100644 --- a/default_router_test.go +++ b/default_router_test.go @@ -4,8 +4,8 @@ import ( "net/http" "testing" + "github.com/lukerodham/tuu" "github.com/stretchr/testify/require" - "gitlab.com/lrodham/tuu" ) func Test_Route_Creation(t *testing.T) { diff --git a/examples/default_router.go b/examples/default_router.go index 4767b76..5c0f96e 100644 --- a/examples/default_router.go +++ b/examples/default_router.go @@ -2,7 +2,9 @@ package examples import ( "log" - "gitlab.com/lrodham/tuu" + + "github.com/gin-gonic/gin/render" + "github.com/lukerodham/tuu" ) func main() { @@ -12,8 +14,8 @@ func main() { ctx.Set("template_data", "some value") return ctx.Render(200, render.HTML("template_name.html")) - }) - + }) + router.POST("/login", func(ctx tuu.Context) error { username := ctx.Param("username") password := ctx.Param("password") @@ -27,4 +29,4 @@ func main() { if err := app.Serve(); err != nil { panic(err) } -} \ No newline at end of file +}