Automated update

Author: adam-singer

.gitignore

@@ -1,2 +1,2 @@
-packages/
+packages
 pubspec.lock

VERSION

@@ -1 +1 @@
-"0kaFfN0xfjZjASExv-gUnrWhdto/VtjIAIh0AiKwRphMJPlW5YhrfBw"
+"En7cEMgwoRpiAhsdND8UOnBCEDA/q0x5UIlvJhwvPelXs4QfKENX5fA"

lib/books_v1_api_browser.dart

@@ -10,6 +10,5 @@ import "dart:json" as JSON;
 import "package:js/js.dart" as js;
 import "package:google_oauth2_client/google_oauth2_browser.dart" as oauth;
 
-part "src/browser/browserclient.dart";
+part "src/browser/browser_client.dart";
 part "src/browser/books.dart";
-

lib/books_v1_api_client.dart

@@ -4,7 +4,6 @@ import "dart:core" as core;
 import "dart:async" as async;
 import "dart:json" as JSON;
 
-part "src/common/client.dart";
-part "src/common/schemas.dart";
-part "src/common/resources.dart";
-
+part "src/client/client.dart";
+part "src/client/schemas.dart";
+part "src/client/resources.dart";

lib/books_v1_api_console.dart

@@ -10,6 +10,5 @@ import "dart:json" as JSON;
 import "package:http/http.dart" as http;
 import "package:google_oauth2_client/google_oauth2_console.dart" as oauth2;
 
-part "src/console/consoleclient.dart";
+part "src/console/console_client.dart";
 part "src/console/books.dart";
-

lib/src/browser/browserclient.dart renamed to lib/src/browser/browser_client.dart

@@ -22,7 +22,7 @@ abstract class BrowserClient extends Client {
     }
 
     js.scoped((){
-      js.context.handleClientLoad =  new js.Callback.once(() {
+      js.context["handleClientLoad"] =  new js.Callback.once(() {
         _jsClientLoaded = true;
         completer.complete(true);
       });
@@ -59,7 +59,7 @@ abstract class BrowserClient extends Client {
     }
 
     js.scoped(() {
-      var request = js.context.gapi.client.request(js.map(requestData));
+      var request = js.context["gapi"]["client"]["request"](js.map(requestData));
       var callback = new js.Callback.once((jsonResp, rawResp) {
         if (jsonResp == null || (jsonResp is core.bool && jsonResp == false)) {
           var raw = JSON.parse(rawResp);
@@ -69,7 +69,7 @@ abstract class BrowserClient extends Client {
             completer.complete({});
           }
         } else {
-          completer.complete(js.context.JSON.stringify(jsonResp));
+          completer.complete(js.context["JSON"]["stringify"](jsonResp));
         }
       });
       request.execute(callback);
@@ -102,53 +102,59 @@ abstract class BrowserClient extends Client {
     }
     var url = new oauth.UrlPattern(path).generate(urlParams, queryParams);
 
-    request.onLoadEnd.listen((_) {
+    void handleError() {
+      if (request.status == 0) {
+        _loadJsClient().then((v) {
+          if (requestUrl.substring(0,1) == "/") {
+            path = requestUrl;
+          } else {
+            path ="$basePath$requestUrl";
+          }
+          url = new oauth.UrlPattern(path).generate(urlParams, {});
+          _makeJsClientRequest(url, method, body: body, contentType: contentType, queryParams: queryParams)
+            .then((response) {
+              var data = JSON.parse(response);
+              completer.complete(data);
+            })
+            .catchError((e) {
+              completer.completeError(e);
+              return true;
+            });
+        });
+      } else {
+        var error = "";
+        if (request.responseText != null) {
+          var errorJson;
+          try {
+            errorJson = JSON.parse(request.responseText);
+          } on core.FormatException {
+            errorJson = null;
+          }
+          if (errorJson != null && errorJson.containsKey("error")) {
+            error = "${errorJson["error"]["code"]} ${errorJson["error"]["message"]}";
+          }
+        }
+        if (error == "") {
+          error = "${request.status} ${request.statusText}";
+        }
+        completer.completeError(new APIRequestException(error));
+      }
+    }
+
+    request.onLoad.listen((_) {
       if (request.status > 0 && request.status < 400) {
         var data = {};
         if (!request.responseText.isEmpty) {
           data = JSON.parse(request.responseText);
         }
         completer.complete(data);
       } else {
-        if (request.status == 0) {
-          _loadJsClient().then((v) {
-            if (requestUrl.substring(0,1) == "/") {
-              path = requestUrl;
-            } else {
-              path ="$basePath$requestUrl";
-            }
-            url = new oauth.UrlPattern(path).generate(urlParams, {});
-            _makeJsClientRequest(url, method, body: body, contentType: contentType, queryParams: queryParams)
-              .then((response) {
-                var data = JSON.parse(response);
-                completer.complete(data);
-              })
-              .catchError((e) {
-                completer.completeError(e);
-                return true;
-              });
-          });
-        } else {
-          var error = "";
-          if (request.responseText != null) {
-            var errorJson;
-            try {
-              errorJson = JSON.parse(request.responseText);
-            } on core.FormatException {
-              errorJson = null;
-            }
-            if (errorJson != null && errorJson.containsKey("error")) {
-              error = "${errorJson["error"]["code"]} ${errorJson["error"]["message"]}";
-            }
-          }
-          if (error == "") {
-            error = "${request.status} ${request.statusText}";
-          }
-          completer.completeError(new APIRequestException(error));
-        }
+        handleError();
       }
     });
 
+    request.onError.listen((_) => handleError());
+
     request.open(method, url);
     request.setRequestHeader("Content-Type", contentType);
     if (makeAuthRequests && _auth != null) {

lib/src/common/client.dart renamed to lib/src/client/client.dart

@@ -51,7 +51,7 @@ abstract class Client {
 /// Base-class for all API Resources
 abstract class Resource {
   /// The [Client] to be used for all requests
-  Client _client;
+  final Client _client;
 
   /// Create a new Resource, using the specified [Client] for requests
   Resource(Client this._client);