Skip to content

Commit

Permalink
Bumped to v1.3
Browse files Browse the repository at this point in the history 
Signed-off-by: Vishal Rana <vr@labstack.com>
  • Loading branch information
@vishr
vishr committed Dec 1, 2015
1 parent f54cdd8 commit 9650c39
Show file tree
Hide file tree
Showing 13 changed files with 86 additions and 68 deletions.
7 changes: 6 additions & 1 deletion context.go
View file
Expand Up @@ -142,7 +142,7 @@ func (c *Context) HTML(code int, html string) (err error) {

// String sends a string response with status code.
func (c *Context) String(code int, s string) (err error) {
c.response.Header().Set(ContentType, TextPlain)
c.response.Header().Set(ContentType, TextPlainCharsetUTF8)
c.response.WriteHeader(code)
c.response.Write([]byte(s))
return
Expand Down Expand Up @@ -255,6 +255,11 @@ func (c *Context) Error(err error) {
c.echo.httpErrorHandler(err, c)
}

// Echo returns the `Echo` instance.
func (c *Context) Echo() *Echo {
return c.echo
}

func (c *Context) reset(r *http.Request, w http.ResponseWriter, e *Echo) {
c.request = r
c.response.reset(w)
Expand Down
39 changes: 20 additions & 19 deletions context_test.go
View file
Expand Up @@ -37,9 +37,10 @@ func TestContext(t *testing.T) {

var nonMarshallableChannel chan bool

e := New()
req, _ := http.NewRequest(POST, "/", strings.NewReader(userJSON))
rec := httptest.NewRecorder()
c := NewContext(req, NewResponse(rec), New())
c := NewContext(req, NewResponse(rec, e), e)

// Request
assert.NotNil(t, c.Request())
Expand Down Expand Up @@ -96,7 +97,7 @@ func TestContext(t *testing.T) {

// JSON
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.JSON(http.StatusOK, user{"1", "Joe"})
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
Expand All @@ -106,14 +107,14 @@ func TestContext(t *testing.T) {

// JSON (error)
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
val := make(chan bool)
err = c.JSON(http.StatusOK, val)
assert.Error(t, err)

// JSONIndent
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.JSONIndent(http.StatusOK, user{"1", "Joe"}, "_", "?")
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
Expand All @@ -123,13 +124,13 @@ func TestContext(t *testing.T) {

// JSONIndent (error)
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.JSONIndent(http.StatusOK, nonMarshallableChannel, "_", "?")
assert.Error(t, err)

// JSONP
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
callback := "callback"
err = c.JSONP(http.StatusOK, callback, user{"1", "Joe"})
if assert.NoError(t, err) {
Expand All @@ -140,7 +141,7 @@ func TestContext(t *testing.T) {

// XML
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.XML(http.StatusOK, user{"1", "Joe"})
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
Expand All @@ -150,13 +151,13 @@ func TestContext(t *testing.T) {

// XML (error)
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.XML(http.StatusOK, nonMarshallableChannel)
assert.Error(t, err)

// XMLIndent
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.XMLIndent(http.StatusOK, user{"1", "Joe"}, "_", "?")
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
Expand All @@ -166,23 +167,23 @@ func TestContext(t *testing.T) {

// XMLIndent (error)
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.XMLIndent(http.StatusOK, nonMarshallableChannel, "_", "?")
assert.Error(t, err)

// String
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.String(http.StatusOK, "Hello, World!")
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
assert.Equal(t, TextPlain, rec.Header().Get(ContentType))
assert.Equal(t, TextPlainCharsetUTF8, rec.Header().Get(ContentType))
assert.Equal(t, "Hello, World!", rec.Body.String())
}

// HTML
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.HTML(http.StatusOK, "Hello, <strong>World!</strong>")
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
Expand All @@ -192,7 +193,7 @@ func TestContext(t *testing.T) {

// File
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.File("test/fixture/walle.png", "", false)
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
Expand All @@ -201,7 +202,7 @@ func TestContext(t *testing.T) {

// File as attachment
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
err = c.File("test/fixture/walle.png", "WALLE.PNG", true)
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
Expand All @@ -211,23 +212,23 @@ func TestContext(t *testing.T) {

// NoContent
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
c.NoContent(http.StatusOK)
assert.Equal(t, http.StatusOK, c.response.status)

// Redirect
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
assert.Equal(t, nil, c.Redirect(http.StatusMovedPermanently, "http://labstack.github.io/echo"))

// Error
rec = httptest.NewRecorder()
c = NewContext(req, NewResponse(rec), New())
c = NewContext(req, NewResponse(rec, e), e)
c.Error(errors.New("error"))
assert.Equal(t, http.StatusInternalServerError, c.response.status)

// reset
c.reset(req, NewResponse(httptest.NewRecorder()), New())
c.reset(req, NewResponse(httptest.NewRecorder(), e), e)
}

func TestContextPath(t *testing.T) {
Expand Down
40 changes: 24 additions & 16 deletions echo.go
View file
Expand Up @@ -36,6 +36,7 @@ type (
debug bool
hook http.HandlerFunc
autoIndex bool
logger *log.Logger
router *Router
}

Expand Down Expand Up @@ -181,8 +182,6 @@ var (
}

unixEpochTime = time.Unix(0, 0)

logger = log.New("echo")
)

// New creates an instance of Echo.
Expand Down Expand Up @@ -211,14 +210,14 @@ func New() (e *Echo) {
if !c.response.committed {
http.Error(c.response, msg, code)
}
log.Error(err)
e.logger.Error(err)
}
e.SetHTTPErrorHandler(e.defaultHTTPErrorHandler)
e.SetBinder(&binder{})

// Logger
log.SetPrefix("echo")
log.SetLevel(log.INFO)
e.logger = log.New("echo")
e.logger.SetLevel(log.INFO)

return
}
Expand All @@ -228,14 +227,24 @@ func (e *Echo) Router() *Router {
return e.router
}

// SetOutput sets the output destination for the logger.
func SetOutput(w io.Writer) {
log.SetOutput(w)
// SetLogPrefix sets the prefix for the logger. Default value is `echo`.
func (e *Echo) SetLogPrefix(prefix string) {
e.logger.SetPrefix(prefix)
}

// SetLogOutput sets the output destination for the logger. Default value is `os.Std*`
func (e *Echo) SetLogOutput(w io.Writer) {
e.logger.SetOutput(w)
}

// SetLogLevel sets the log level for the logger. Default value is `log.INFO`.
func (e *Echo) SetLogLevel(l log.Level) {
e.logger.SetLevel(l)
}

// SetLogLevel sets the log level for global logger. The default value is `log.INFO`.
func SetLogLevel(l log.Level) {
log.SetLevel(l)
// Logger returns the logger instance.
func (e *Echo) Logger() *log.Logger {
return e.logger
}

// HTTP2 enables/disables HTTP2 support.
Expand Down Expand Up @@ -273,8 +282,7 @@ func (e *Echo) Debug() bool {
return e.debug
}

// AutoIndex enables/disables automatically creates a directory listing if the directory
// doesn't contain an index page.
// AutoIndex enables/disables automatically creating an index page for the directory.
func (e *Echo) AutoIndex(on bool) {
e.autoIndex = on
}
Expand Down Expand Up @@ -575,11 +583,11 @@ func (e *Echo) run(s *http.Server, files ...string) {
http2.ConfigureServer(s, nil)
}
if len(files) == 0 {
log.Fatal(s.ListenAndServe())
e.logger.Fatal(s.ListenAndServe())
} else if len(files) == 2 {
log.Fatal(s.ListenAndServeTLS(files[0], files[1]))
e.logger.Fatal(s.ListenAndServeTLS(files[0], files[1]))
} else {
log.Fatal("invalid TLS configuration")
e.logger.Fatal("invalid TLS configuration")
}
}

Expand Down
2 changes: 1 addition & 1 deletion echo_test.go
View file
Expand Up @@ -27,7 +27,7 @@ func TestEcho(t *testing.T) {
e := New()
req, _ := http.NewRequest(GET, "/", nil)
rec := httptest.NewRecorder()
c := NewContext(req, NewResponse(rec), e)
c := NewContext(req, NewResponse(rec, e), e)

// Router
assert.NotNil(t, e.Router())
Expand Down
3 changes: 2 additions & 1 deletion middleware/auth_test.go
View file
Expand Up @@ -11,9 +11,10 @@ import (
)

func TestBasicAuth(t *testing.T) {
e := echo.New()
req, _ := http.NewRequest(echo.GET, "/", nil)
rec := httptest.NewRecorder()
c := echo.NewContext(req, echo.NewResponse(rec), echo.New())
c := echo.NewContext(req, echo.NewResponse(rec, e), e)
fn := func(u, p string) bool {
if u == "joe" && p == "secret" {
return true
Expand Down
9 changes: 5 additions & 4 deletions middleware/compress_test.go
View file
Expand Up @@ -33,9 +33,10 @@ func (c *closeNotifyingRecorder) CloseNotify() <-chan bool {
}

func TestGzip(t *testing.T) {
e := echo.New()
req, _ := http.NewRequest(echo.GET, "/", nil)
rec := httptest.NewRecorder()
c := echo.NewContext(req, echo.NewResponse(rec), echo.New())
c := echo.NewContext(req, echo.NewResponse(rec, e), e)
h := func(c *echo.Context) error {
c.Response().Write([]byte("test")) // For Content-Type sniffing
return nil
Expand All @@ -49,7 +50,7 @@ func TestGzip(t *testing.T) {
req, _ = http.NewRequest(echo.GET, "/", nil)
req.Header.Set(echo.AcceptEncoding, "gzip")
rec = httptest.NewRecorder()
c = echo.NewContext(req, echo.NewResponse(rec), echo.New())
c = echo.NewContext(req, echo.NewResponse(rec, e), e)

// Gzip
Gzip()(h)(c)
Expand Down Expand Up @@ -121,7 +122,6 @@ func TestGzipCloseNotify(t *testing.T) {
}

func BenchmarkGzip(b *testing.B) {

b.StopTimer()
b.ReportAllocs()

Expand All @@ -135,8 +135,9 @@ func BenchmarkGzip(b *testing.B) {
b.StartTimer()

for i := 0; i < b.N; i++ {
e := echo.New()
rec := httptest.NewRecorder()
c := echo.NewContext(req, echo.NewResponse(rec), echo.New())
c := echo.NewContext(req, echo.NewResponse(rec, e), e)
Gzip()(h)(c)
}

Expand Down
4 changes: 2 additions & 2 deletions middleware/logger.go
View file
Expand Up @@ -6,14 +6,14 @@ import (

"github.com/labstack/echo"
"github.com/labstack/gommon/color"
"github.com/labstack/gommon/log"
)

func Logger() echo.MiddlewareFunc {
return func(h echo.HandlerFunc) echo.HandlerFunc {
return func(c *echo.Context) error {
req := c.Request()
res := c.Response()
logger := c.Echo().Logger()

remoteAddr := req.RemoteAddr
if ip := req.Header.Get(echo.XRealIP); ip != "" {
Expand Down Expand Up @@ -47,7 +47,7 @@ func Logger() echo.MiddlewareFunc {
code = color.Cyan(n)
}

log.Info("%s %s %s %s %s %d", remoteAddr, method, path, code, stop.Sub(start), size)
logger.Info("%s %s %s %s %s %d", remoteAddr, method, path, code, stop.Sub(start), size)
return nil
}
}
Expand Down

0 comments on commit 9650c39

Please sign in to comment.