Merge branch 'release/1.0.2'

upgraded Alice

middleware/Makefile

@@ -0,0 +1,16 @@
+.PHONY: all test build cover
+
+GO ?= go
+
+all: build test
+
+build:
+	${GO} build
+
+test:
+	${GO} test -v
+
+cover:
+	${GO} test -cover && \
+	${GO} test -coverprofile=coverage.out  && \
+	${GO} tool cover -html=coverage.out

middleware/middleware.go

@@ -61,18 +61,15 @@ func New(constructors ...Constructor) Chain {
 //     m1(m2(m3(h)))
 // Then() treats nil as http.DefaultServeMux.
 func (c Chain) Then(h http.Handler) http.Handler {
-	var final http.Handler
-	if h != nil {
-		final = h
-	} else {
-		final = http.DefaultServeMux
+	if h == nil {
+		h = http.DefaultServeMux
 	}
 
 	for i := len(c.constructors) - 1; i >= 0; i-- {
-		final = c.constructors[i](final)
+		h = c.constructors[i](h)
 	}
 
-	return final
+	return h
 }
 
 // ThenFunc works identically to Then, but takes

middleware/middleware_test.go

@@ -69,6 +69,16 @@ func TestThenFuncTreatsNilAsDefaultServeMux(t *testing.T) {
 	assert.Equal(t, chained, http.DefaultServeMux)
 }
 
+func TestThenFuncConstructsHandlerFunc(t *testing.T) {
+	fn := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(200)
+	})
+	chained := New().ThenFunc(fn)
+	rec := httptest.NewRecorder()
+	chained.ServeHTTP(rec, (*http.Request)(nil))
+	assert.Equal(t, 200, rec.Code)
+}
+
 func TestThenOrdersHandlersRight(t *testing.T) {
 	t1 := tagMiddleware("t1\n")
 	t2 := tagMiddleware("t2\n")