Merge pull request #204 from flimzy/chiGzip

use chi's compression middleware

glide.yaml

@@ -3,12 +3,10 @@ ignore:
 - github.com/gopherjs/gopherjs
 - github.com/gopherjs/jsbuiltin
 import:
-- package: github.com/NYTimes/gziphandler
-  version: d8206bba2a6097c0d75f4ac204a4814e47125cdd
 - package: github.com/ajg/form
   version: ~1.5.0
-- package: github.com/pressly/chi
-  version: ~2.1.0
+- package: github.com/go-chi/chi
+  version: ~3.1.0
 - package: github.com/flimzy/diff
   version: ^0.1.2
 - package: github.com/justinas/alice

serve/couchserver/context.go

@@ -3,7 +3,7 @@ package couchserver
 import (
 	"net/http"
 
-	"github.com/pressly/chi"
+	"github.com/go-chi/chi"
 )
 
 // DB returns the db name in this request, or "" if none.

serve/couchserver/context_test.go

@@ -5,19 +5,20 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/pressly/chi"
+	"github.com/go-chi/chi"
 )
 
 func TestDB(t *testing.T) {
 	router := chi.NewRouter()
 	var result string
-	router.Get("/:db", func(_ http.ResponseWriter, r *http.Request) {
+	router.Get("/{db}", func(_ http.ResponseWriter, r *http.Request) {
 		result = DB(r)
 	})
 	req := httptest.NewRequest("GET", "/foo", nil)
 	w := httptest.NewRecorder()
 	router.ServeHTTP(w, req)
-	if result != "foo" {
-		t.Errorf("Expected '%s', Got '%s'", "foo", result)
+	expected := "foo"
+	if result != expected {
+		t.Errorf("Expected '%s', Got '%s'", expected, result)
 	}
 }

serve/couchserver/couchserver.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/pressly/chi"
+	"github.com/go-chi/chi"
 
 	"github.com/flimzy/kivik"
 )
@@ -90,10 +90,10 @@ func (h *Handler) Main() http.Handler {
 	r.Get("/", h.GetRoot())
 	r.Get("/favicon.ico", h.GetFavicon())
 	r.Get("/_all_dbs", h.GetAllDBs())
-	r.Get("/:db", h.GetDB())
-	r.Put("/:db", h.PutDB())
-	r.Head("/:db", h.HeadDB())
-	r.Post("/:db/_ensure_full_commit", h.Flush())
+	r.Get("/{db}", h.GetDB())
+	r.Put("/{db}", h.PutDB())
+	r.Head("/{db}", h.HeadDB())
+	r.Post("/{db}/_ensure_full_commit", h.Flush())
 	r.Get("/_session", h.GetSession())
 	return r
 }

serve/routes.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/NYTimes/gziphandler"
+	"github.com/go-chi/chi/middleware"
 	"github.com/justinas/alice"
 
 	"github.com/flimzy/kivik/serve/couchserver"
@@ -38,13 +38,6 @@ func gzipHandler(s *Service) func(http.Handler) http.Handler {
 	if level == 0 {
 		level = 8
 	}
-	gzipHandler, err := gziphandler.NewGzipLevelHandler(int(level))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "invalid httpd.compression_level %d\n", level)
-		return func(h http.Handler) http.Handler {
-			return h
-		}
-	}
 	fmt.Fprintf(os.Stderr, "Enabling gzip compression, level %d\n", level)
-	return gzipHandler
+	return middleware.Compress(level, "text/plain", "text/html", "application/json")
 }