Merge pull request #113 from bacongobbler/fix-404-app-not-found

fix(errors): display the error on a 404

Author: Matthew Fisher

errors.go

@@ -35,8 +35,6 @@ const (
 )
 
 var (
-	// ErrNotFound is returned when the server returns a 404.
-	ErrNotFound = errors.New("Not Found")
 	// ErrServerError is returned when the server returns a 500.
 	ErrServerError = errors.New("Internal Server Error")
 	// ErrMethodNotAllowed is thrown when using a unsupposrted method.
@@ -93,10 +91,19 @@ type ErrUnprocessable struct {
 	errorMsg string
 }
 
+// ErrNotFound is returned when the controller throws a 404.
+type ErrNotFound struct {
+	errorMsg string
+}
+
 func (e ErrUnprocessable) Error() string {
 	return fmt.Sprintf("Unable to process your request: %s", e.errorMsg)
 }
 
+func (e ErrNotFound) Error() string {
+	return e.errorMsg
+}
+
 // checkForErrors tries to match up an API error with an predefined error in the SDK.
 func checkForErrors(res *http.Response) error {
 	if res.StatusCode >= 200 && res.StatusCode < 400 {
@@ -197,7 +204,10 @@ func checkForErrors(res *http.Response) error {
 	case 403:
 		return ErrForbidden
 	case 404:
-		return ErrNotFound
+		if string(out) != "" {
+			return ErrNotFound{string(out)}
+		}
+		return ErrNotFound{"Not Found"}
 	case 405:
 		return ErrMethodNotAllowed
 	case 409:

errors_test.go

@@ -241,7 +241,14 @@ func TestErrors(t *testing.T) {
 				StatusCode: 404,
 				Body:       readCloser(""),
 			},
-			expected: ErrNotFound,
+			expected: ErrNotFound{"Not Found"},
+		},
+		{
+			res: &http.Response{
+				StatusCode: 404,
+				Body:       readCloser("App not found"),
+			},
+			expected: ErrNotFound{"App not found"},
 		},
 		{
 			res: &http.Response{