Version 1.0.3 - Merger loggers

Author: phillwiggins

example/lib/main.dart

@@ -111,7 +111,7 @@ class _MyAppState extends State<MyApp> {
     user = await user.verificationEmailRequest();
     user = await user.all();
     user = await user.save();
-    await user.destroy();
+    //await user.destroy();
   }
 
   function() {

lib/src/objects/parse_object.dart

@@ -28,22 +28,22 @@ class ParseObject extends ParseBase {
   /// Gets an object from the server using it's [String] objectId
   getObject(String objectId) async {
     try {
-      var uri = _getBasePath(_path);
+      var uri = "${ParseCoreData().serverUrl}$_path";
       if (objectId != null) uri += "/$objectId";
       var result = await _client.get(uri);
       return handleResponse(result, ParseApiRQ.get);
     } on Exception catch (e) {
-      return handleException(e, ParseApiRQ.delete);
+      return handleException(e, ParseApiRQ.get);
     }
   }
 
   /// Gets all objects from this table - Limited response at the moment
   getAll() async {
     try {
-      var result = await _client.get(_getBasePath(_path));
+      var result = await _client.get("${ParseCoreData().serverUrl}$_path");
       return handleResponse(result, ParseApiRQ.getAll);
     } on Exception catch (e) {
-      return handleException(e, ParseApiRQ.delete);
+      return handleException(e, ParseApiRQ.getAll);
     }
   }
 
@@ -54,7 +54,7 @@ class ParseObject extends ParseBase {
       var result = await _client.post(uri, body: JsonEncoder().convert(getObjectData()));
       return handleResponse(result, ParseApiRQ.create);
     } on Exception catch (e) {
-      return handleException(e, ParseApiRQ.delete);
+      return handleException(e, ParseApiRQ.create);
     }
   }
 
@@ -64,40 +64,37 @@ class ParseObject extends ParseBase {
       return create();
     } else {
       try {
-        var uri = "${_getBasePath(_path)}/$objectId";
+        var uri = "${ParseCoreData().serverUrl}$_path/$objectId";
         var result = await _client.put(uri, body: JsonEncoder().convert(getObjectData()));
         return handleResponse(result, ParseApiRQ.save);
       } on Exception catch (e) {
-        return handleException(e, ParseApiRQ.delete);
+        return handleException(e, ParseApiRQ.save);
       }
     }
   }
 
   /// Can be used to create custom queries
   query(String query) async {
     try {
-      var uri = "${_getBasePath(_path)}?$query";
+      var uri = "${ParseCoreData().serverUrl}$_path?$query";
       var result = await _client.get(uri);
       return handleResponse(result, ParseApiRQ.query);
     } on Exception catch (e) {
-      return handleException(e, ParseApiRQ.delete);
+      return handleException(e, ParseApiRQ.query);
     }
   }
 
   /// Deletes the current object locally and online
   delete(String path, String objectId) async {
     try {
-      var uri = "${_getBasePath(path)}/$objectId";
+      var uri = "${ParseCoreData().serverUrl}$_path/$objectId";
       var result = await _client.delete(uri);
       return handleResponse(result, ParseApiRQ.delete);
     } on Exception catch (e) {
       return handleException(e, ParseApiRQ.delete);
     }
   }
 
-  /// Generates the path for the object
-  _getBasePath(String path) => "${_client.data.serverUrl}$path";
-
   /// Handles an API response and logs data if [bool] debug is enabled
   @protected
   ParseResponse handleResponse(Response response, ParseApiRQ type) {

lib/src/objects/parse_response.dart

@@ -12,22 +12,22 @@ class ParseResponse {
   /// 1. Fail - [ParseResponse] will be returned with further details
   /// 2. Success but no results. [ParseResponse] is returned.
   /// 3. Success with results. Again [ParseResponse] is returned
-  static handleResponse(ParseBase object, Response value) {
-    var response = ParseResponse();
+  static handleResponse(ParseBase object, Response apiResponse) {
+    var parseResponse = ParseResponse();
 
-    if (value != null) {
-      response.statusCode = value.statusCode;
+    if (apiResponse != null) {
+      parseResponse.statusCode = apiResponse.statusCode;
 
-      if (value.statusCode != 200) {
-        return _handleError(response, value);
-      } else if (value.body == "{\"results\":[]}"){
-        return _handleSuccessWithNoResults(response, "Successful request, but no results found");
+      if (apiResponse.statusCode != 200) {
+        return _handleError(parseResponse, apiResponse);
+      } else if (apiResponse.body == "{\"results\":[]}"){
+        return _handleSuccessWithNoResults(parseResponse, "Successful request, but no results found");
       } else {
-        return _handleSuccess(response, object, value.body);
+        return _handleSuccess(parseResponse, object, apiResponse.body);
       }
     } else {
-      response.error = ParseError(message: "Error reaching server, or server response was null");
-      return response;
+      parseResponse.error = ParseError(message: "Error reaching server, or server response was null");
+      return apiResponse;
     }
   }
 
@@ -39,8 +39,9 @@ class ParseResponse {
   }
 
   /// Handles any errors returned in response
-  static ParseResponse _handleError(ParseResponse response, Response value) {
-    response.error = ParseError(code: value.statusCode, message: value.reasonPhrase);
+  static ParseResponse _handleError(ParseResponse response, Response apiResponse) {
+    Map<String, dynamic> responseData = JsonDecoder().convert(apiResponse.body);
+    response.error = ParseError(code: responseData['code'], message: responseData['error']);
     return response;
   }
 
@@ -52,7 +53,7 @@ class ParseResponse {
   }
 
   /// Handles successful response with results
-  static ParseResponse _handleSuccess(ParseResponse response, ParseObject object, String responseBody) {
+  static ParseResponse _handleSuccess(ParseResponse response, ParseBase object, String responseBody) {
     response.success = true;
 
     var map = JsonDecoder().convert(responseBody) as Map;
@@ -67,7 +68,7 @@ class ParseResponse {
   }
 
   /// Handles a response with a multiple result object
-  static _handleMultipleResults(ParseObject object, dynamic map) {
+  static _handleMultipleResults(ParseBase object, dynamic map) {
     var resultsList = List();
 
     for (var value in map) {
@@ -78,7 +79,7 @@ class ParseResponse {
   }
 
   /// Handles a response with a single result object
-  static _handleSingleResult(ParseObject object, map) {
+  static _handleSingleResult(ParseBase object, map) {
     populateObjectBaseData(object, map);
     return object.fromJson(map);
   }