Make multiplexer regular handlers

Multiplexer functions used to return closures which are able to handle
HTTP requests for historc reasons. Now the multiplexers can be regular
HTTP handlers which is simpler.

2 files changed, 55 insertions, 69 deletions

diff --git a/mux.go b/mux.go
index 2b37286..ddb1d0f 100644
--- a/mux.go
+++ b/mux.go
@@ -5,85 +5,71 @@ import (
 	"net/http"
 )
 
-func indexMux() func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		switch r.Method {
-		case "GET":
-			indexGet(w, r)
-		default:
-			http.Error(w, "Bad Request", 400)
-		}
+func indexMux(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		indexGet(w, r)
+	default:
+		http.Error(w, "Bad Request", 400)
 	}
 }
 
-func recipeMux() func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		switch r.Method {
-		case "GET":
-			recipeGet(w, r)
-		case "POST":
-			recipePost(w, r)
-		default:
-			http.Error(w, "Bad Request", 400)
-		}
+func recipeMux(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		recipeGet(w, r)
+	case "POST":
+		recipePost(w, r)
+	default:
+		http.Error(w, "Bad Request", 400)
 	}
 }
 
-func recipeEditMux() func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		switch r.Method {
-		case "GET":
-			recipeEditGet(w, r)
-		case "POST":
-			recipeEditPost(w, r)
-		default:
-			http.Error(w, "Bad Request", 400)
-		}
+func recipeEditMux(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		recipeEditGet(w, r)
+	case "POST":
+		recipeEditPost(w, r)
+	default:
+		http.Error(w, "Bad Request", 400)
 	}
 }
 
-func recipeImageMux() func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		switch r.Method {
-		case "GET":
-			recipeImageGet(w, r)
-		default:
-			http.Error(w, "Bad Request", 400)
-		}
+func recipeImageMux(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		recipeImageGet(w, r)
+	default:
+		http.Error(w, "Bad Request", 400)
 	}
 }
 
-func addRecipesMux() func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		switch r.Method {
-		case "GET":
-			addRecipesGet(w, r)
-		case "POST":
-			addRecipesPost(w, r)
-		default:
-			http.Error(w, "Bad Request", 400)
-		}
+func addRecipesMux(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		addRecipesGet(w, r)
+	case "POST":
+		addRecipesPost(w, r)
+	default:
+		http.Error(w, "Bad Request", 400)
 	}
 }
 
-func staticStyleMux() func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		switch r.Method {
-		case "GET":
-			staticGet(w, r, "style.css")
-		default:
-			http.Error(w, "Bad Request", 400)
-		}
+func staticStyleMux(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		staticGet(w, r, "style.css")
+	default:
+		http.Error(w, "Bad Request", 400)
 	}
 }
 
-func faviconMux() func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		switch r.Method {
-		case "GET":
-			staticGet(w, r, "favicon.ico")
-		default:
-			http.Error(w, "Bad Request", 400)
-		}
+func faviconMux(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		staticGet(w, r, "favicon.ico")
+	default:
+		http.Error(w, "Bad Request", 400)
 	}
 }
diff --git a/server.go b/server.go
index d70373b..f565636 100644
--- a/server.go
+++ b/server.go
@@ -8,13 +8,13 @@ import (
 
 func setupRoutes() {
 
-	http.HandleFunc("/", indexMux())
-	http.HandleFunc("/recipe", recipeMux())
-	http.HandleFunc("/recipe/edit", recipeEditMux())
-	http.HandleFunc("/recipe/image", recipeImageMux())
-	http.HandleFunc("/add_recipes", addRecipesMux())
-	http.HandleFunc("/static/style.css", staticStyleMux())
-	http.HandleFunc("/favicon.ico", faviconMux())
+	http.HandleFunc("/", indexMux)
+	http.HandleFunc("/recipe", recipeMux)
+	http.HandleFunc("/recipe/edit", recipeEditMux)
+	http.HandleFunc("/recipe/image", recipeImageMux)
+	http.HandleFunc("/add_recipes", addRecipesMux)
+	http.HandleFunc("/static/style.css", staticStyleMux)
+	http.HandleFunc("/favicon.ico", faviconMux)
 }
 
 func runServer() {