Merge branch 'master' into release/v1.0.16

Author: phillwiggins

lib/src/network/parse_query.dart

@@ -283,25 +283,19 @@ class QueryBuilder<T extends ParseObject> {
   /// Creates a query param using the column, the value and the queryOperator
   /// that the column and value are being queried against
   MapEntry<String, dynamic> _buildQueryWithColumnValueAndOperator(
-      MapEntry<String, dynamic> columnAndValue, String queryOperator) {
+      MapEntry columnAndValue, String queryOperator) {
     final String key = columnAndValue.key;
-    final dynamic value =
-        convertValueToCorrectType(parseEncode(columnAndValue.value));
+    final dynamic value = convertValueToCorrectType(parseEncode(columnAndValue.value));
 
     if (queryOperator == _NO_OPERATOR_NEEDED) {
       return MapEntry<String, dynamic>(
-          _NO_OPERATOR_NEEDED, '\"${columnAndValue.key}\": $value"');
+        _NO_OPERATOR_NEEDED, "\"${key}\": $value");
     } else {
       String queryString = '\"$key\":';
-
-      final Map<String, dynamic> queryOperatorAndValueMap =
-          Map<String, dynamic>();
-      queryOperatorAndValueMap[queryOperator] =
-          parseEncode(columnAndValue.value);
-      final String formattedQueryOperatorAndValue =
-          jsonEncode(queryOperatorAndValueMap);
+      final Map<String, dynamic> queryOperatorAndValueMap = Map<String, dynamic>();
+      queryOperatorAndValueMap[queryOperator] = parseEncode(value);
+      final String formattedQueryOperatorAndValue = jsonEncode(queryOperatorAndValueMap);
       queryString += '$formattedQueryOperatorAndValue';
-
       return MapEntry<String, dynamic>(key, queryString);
     }
   }
@@ -340,10 +334,9 @@ class QueryBuilder<T extends ParseObject> {
 
         // Compact all the queries in the correct format
         for (MapEntry<String, dynamic> queryToCompact in listOfQueriesCompact) {
-          String queryToCompactValue = queryToCompact.value.toString();
-          queryToCompactValue = queryToCompactValue.replaceFirst('{', '');
-          queryToCompactValue = queryToCompactValue.replaceAll('}', '');
-
+          var queryToCompactValue = queryToCompact.value.toString();
+          queryToCompactValue = queryToCompactValue.replaceFirst("{", "");
+          queryToCompactValue = queryToCompactValue.replaceRange(queryToCompactValue.length - 1, queryToCompactValue.length, "");
           if (listOfQueriesCompact.first == queryToCompact) {
             queryEnd += queryToCompactValue.replaceAll(queryStart, ' ');
           } else {

lib/src/objects/parse_file.dart

@@ -73,9 +73,8 @@ class ParseFile extends ParseObject {
     final Directory tempPath = await getTemporaryDirectory();
     file = File('${tempPath.path}/$name');
     await file.create();
-
     final Response response = await _client.get(url);
-    file.writeAsBytes(response.bodyBytes);
+    await file.writeAsBytes(response.bodyBytes);
 
     return this;
   }

lib/src/objects/parse_installation.dart

@@ -209,7 +209,6 @@ class ParseInstallation extends ParseObject {
 
     if (apiResponse.success) {
       final ParseObject installation = apiResponse.result;
-      print('achou installation');
       return Future.value(installation.get<List<dynamic>>('channels'));
     } else {
       return null;

lib/src/objects/parse_object.dart

@@ -253,7 +253,6 @@ class ParseObject extends ParseBase implements ParseCloneable {
           port: tempUri.port,
           path: '${tempUri.path}$_path',
           query: query);
-
       final Response result = await _client.get(url);
       return handleResponse<ParseObject>(this, result, ParseApiRQ.query, _debug, className);
     } on Exception catch (e) {

lib/src/utils/parse_encoder.dart

@@ -23,7 +23,7 @@ dynamic parseEncode(dynamic value, {bool full}) {
   if (value is ParseGeoPoint) {
     return value;
   }
-
+  
   if (value is ParseFile) {
     return value;
   }

lib/src/utils/parse_utils.dart

@@ -14,6 +14,10 @@ bool isDebugEnabled({bool objectLevelDebug}) {
 dynamic convertValueToCorrectType(dynamic value) {
   if (value is String && !value.contains('__type')) {
     return '\"$value\"';
+  } 
+  
+  if (value is DateTime || value is ParseObject) {
+    return parseEncode(value);
   } else {
     return value;
   }