Added ResponseErrorWriter interface to allow for custom error json ma…

…rshalling
rcrowley · Jul 27, 2015 · c0f87c7 · c0f87c7
1 parent 80565de
commit c0f87c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/method_not_allowed.go b/method_not_allowed.go
@@ -47,16 +47,14 @@ func (h MethodNotAllowedHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 			fmt.Fprint(w, strings.Join(methods, ", "))
 		}
 	} else {
-		description := fmt.Sprintf(
+		methodNotAllowedErr := MethodNotAllowed{Err: errors.New(fmt.Sprintf(
 			"only %s are allowed",
 			strings.Join(methods, ", "),
-		)
+		))}
 		if acceptJSON(r) {
-			ResponseErrorWriter.WriteJSONError(w, MethodNotAllowed{Err: errors.New(description)})
+			ResponseErrorWriter.WriteJSONError(w, methodNotAllowedErr)
 		} else {
-			w.Header().Set("Content-Type", "text/plain")
-			w.WriteHeader(http.StatusMethodNotAllowed)
-			fmt.Fprint(w, description)
+			ResponseErrorWriter.WritePlaintextError(w, methodNotAllowedErr)
 		}
 	}
 }
diff --git a/not_found.go b/not_found.go
@@ -10,12 +10,10 @@ import (
 type NotFoundHandler struct{}
 
 func (NotFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	description := fmt.Sprintf("%s %s not found", r.Method, r.URL.Path)
+	notFoundErr := NotFound{Err: errors.New(fmt.Sprintf("%s %s not found", r.Method, r.URL.Path))}
 	if acceptJSON(r) {
-		ResponseErrorWriter.WriteJSONError(w, NotFound{Err: errors.New(description)})
+		ResponseErrorWriter.WriteJSONError(w, notFoundErr)
 	} else {
-		w.Header().Set("Content-Type", "text/plain")
-		w.WriteHeader(http.StatusNotFound)
-		fmt.Fprint(w, description)
+		ResponseErrorWriter.WritePlaintextError(w, notFoundErr)
 	}
 }