Fixed handling of some errors in paginator

Andersmholmgren · Andersmholmgren · commit 0d2a199b1692 · 2015-03-14T16:42:07.000+11:00
diff --git a/lib/src/common/github.dart b/lib/src/common/github.dart
@@ -205,13 +205,9 @@ class GitHub {
 
     headers.putIfAbsent("Accept", () => "application/vnd.github.v3+json");
 
-    return request("GET", path, headers: headers, params: params).then(
+    return request("GET", path, headers: headers, params: params,
+        statusCode: statusCode, fail: fail).then(
         (response) {
-      if (statusCode != null && statusCode != response.statusCode) {
-        fail != null ? fail(response) : null;
-        handleStatusCode(response);
-        return new Future.value(null);
-      }
       return convert(JSON.decode(response.body));
     });
   }
@@ -249,13 +245,9 @@ class GitHub {
 
     headers.putIfAbsent("Accept", () => "application/vnd.github.v3+json");
 
-    return request("POST", path, headers: headers, params: params, body: body)
+    return request("POST", path, headers: headers, params: params, body: body,
+        statusCode: statusCode, fail: fail)
         .then((response) {
-      if (statusCode != null && statusCode != response.statusCode) {
-        fail != null ? fail(response) : null;
-        handleStatusCode(response);
-        return new Future.value(null);
-      }
       return convert(JSON.decode(response.body));
     });
   }
@@ -278,6 +270,7 @@ class GitHub {
         } else if (msg == "Body should be a JSON Hash") {
           throw new InvalidJSON(this, msg);
         }
+        else throw new BadRequest(this);
         break;
       case 422:
         var json = response.asJSON();
@@ -315,7 +308,9 @@ class GitHub {
    * [body] is the body content of requests that take content.
    */
   Future<http.Response> request(String method, String path,
-      {Map<String, String> headers, Map<String, dynamic> params, String body}) {
+      {Map<String, String> headers, Map<String, dynamic> params, String body,
+        int statusCode,
+        void fail(http.Response response)}) {
     if (headers == null) headers = {};
 
     if (auth.isToken) {
@@ -347,7 +342,14 @@ class GitHub {
     }
 
     return client.request(new http.Request(url.toString(),
-        method: method, headers: headers, body: body));
+        method: method, headers: headers, body: body)).then((response) {
+      if (statusCode != null && statusCode != response.statusCode) {
+        fail != null ? fail(response) : null;
+        handleStatusCode(response);
+        return null;
+      }
+      else return response;
+    });
   }
 
   /**
diff --git a/lib/src/common/util/errors.dart b/lib/src/common/util/errors.dart
@@ -1,7 +1,7 @@
 part of github.common;
 
 /// Error Generated by [GitHub]
-class GitHubError {
+class GitHubError implements Exception {
   final String message;
   final String apiUrl;
   final GitHub github;
@@ -18,6 +18,10 @@ class NotFound extends GitHubError {
   NotFound(GitHub github, String msg) : super(github, msg);
 }
 
+class BadRequest extends GitHubError {
+  BadRequest(GitHub github, [String msg = 'Not Found']) : super(github, msg);
+}
+
 /// GitHub Repository was not found
 class RepositoryNotFound extends NotFound {
   RepositoryNotFound(GitHub github, String repo)
@@ -61,7 +65,7 @@ class NotAuthenticated extends GitHubError {
   NotAuthenticated(GitHub github) : super(github, "Client not Authenticated");
 }
 
-class InvalidJSON extends GitHubError {
+class InvalidJSON extends BadRequest {
   InvalidJSON(GitHub github, [String message = "Invalid JSON"])
       : super(github, message);
 }
diff --git a/lib/src/common/util/pagination.dart b/lib/src/common/util/pagination.dart
@@ -7,13 +7,14 @@ class PaginationHelper<T> {
   PaginationHelper(this.github);
 
   Future<List<http.Response>> fetch(String method, String path, {int pages,
-      Map<String, String> headers, Map<String, dynamic> params, String body}) {
+      Map<String, String> headers, Map<String, dynamic> params, String body,
+      int statusCode: 200}) {
     var completer = new Completer();
     var responses = [];
     if (headers == null) headers = {};
     Future<http.Response> actualFetch(String realPath) {
       return github.request(method, realPath,
-          headers: headers, params: params, body: body);
+          headers: headers, params: params, body: body, statusCode: statusCode);
     }
 
     void done() => completer.complete(responses);
@@ -54,7 +55,7 @@ class PaginationHelper<T> {
 
   Stream<http.Response> fetchStreamed(String method, String path, {int pages,
       bool reverse: false, int start, Map<String, String> headers,
-      Map<String, dynamic> params, String body}) {
+      Map<String, dynamic> params, String body, int statusCode: 200}) {
     if (headers == null) headers = {};
     var controller = new StreamController.broadcast();
 
@@ -70,13 +71,12 @@ class PaginationHelper<T> {
 
 
       return github.request(method, realPath,
-          headers: headers, params: p, body: body);
+          headers: headers, params: p, body: body, statusCode: statusCode);
     }
 
     var count = 0;
 
-    var handleResponse;
-    handleResponse = (http.Response response) {
+    handleResponse(http.Response response) {
       count++;
       controller.add(response);
 
@@ -113,29 +113,29 @@ class PaginationHelper<T> {
       } else {
         handleResponse(response);
       }
+    }).catchError((e, s) {
+      controller.addError(e, s);
+      controller.close();
     });
 
     return controller.stream;
   }
 
   Stream<T> objects(String method, String path, JSONConverter converter,
       {int pages, bool reverse: false, int start, Map<String, String> headers,
-      Map<String, dynamic> params, String body}) {
+      Map<String, dynamic> params, String body, int statusCode: 200}) {
     if (headers == null) headers = {};
     headers.putIfAbsent("Accept", () => "application/vnd.github.v3+json");
-    var controller = new StreamController();
-    fetchStreamed(method, path,
+    return fetchStreamed(method, path,
         pages: pages,
         start: start,
         reverse: reverse,
         headers: headers,
         params: params,
-        body: body).listen((response) {
-      var json = response.asJSON();
-      for (var item in json) {
-        controller.add(converter(item));
-      }
-    }).onDone(() => controller.close());
-    return controller.stream;
+        body: body,
+        statusCode: statusCode).expand((response) {
+          var json = response.asJSON();
+          return (json as List).map(converter).toList(growable:false);
+        });
   }
 }
