s/util/mutil/

"util" is a really bad name for a package since it isn't very
descriptive and so often collides with other names.

Unfortunately, this is a breaking change, but it's both very easy to fix
and perhaps more importantly also better to do now than later.

web/middleware/logger.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/zenazn/goji/web"
-	"github.com/zenazn/goji/web/util"
+	"github.com/zenazn/goji/web/mutil"
 )
 
 // Logger is a middleware that logs the start and end of each request, along
@@ -29,7 +29,7 @@ func Logger(c *web.C, h http.Handler) http.Handler {
 
 		printStart(reqID, r)
 
-		lw := util.WrapWriter(w)
+		lw := mutil.WrapWriter(w)
 
 		t1 := time.Now()
 		h.ServeHTTP(lw, r)
@@ -60,7 +60,7 @@ func printStart(reqID string, r *http.Request) {
 	log.Print(buf.String())
 }
 
-func printEnd(reqID string, w util.WriterProxy, dt time.Duration) {
+func printEnd(reqID string, w mutil.WriterProxy, dt time.Duration) {
 	var buf bytes.Buffer
 
 	if reqID != "" {

web/mutil/mutil.go

@@ -0,0 +1,3 @@
+// Package mutil contains various functions that are helpful when writing http
+// middleware.
+package mutil

web/util/writer_proxy.go → web/mutil/writer_proxy.go

@@ -1,4 +1,4 @@
-package util
+package mutil
 
 import (
 	"bufio"
@@ -27,8 +27,8 @@ type WriterProxy interface {
 	Unwrap() http.ResponseWriter
 }
 
-// WrapWriter wraps an http.ResponseWriter into a proxy that allows you to hook
-// into various parts of the response process.
+// WrapWriter wraps an http.ResponseWriter, returning a proxy that allows you to
+// hook into various parts of the response process.
 func WrapWriter(w http.ResponseWriter) WriterProxy {
 	_, cn := w.(http.CloseNotifier)
 	_, fl := w.(http.Flusher)