Added limit, skip etc, Fixed current user

Author: phillwiggins

example/lib/main.dart

@@ -50,8 +50,8 @@ class _MyAppState extends State<MyApp> {
     //getAllItems();
     //getAllItemsByName();
     //getSingleItem();
-    query();
-    //initUser();
+    //query();
+    initUser();
   }
 
   void getAllItemsByName() async {
@@ -80,9 +80,7 @@ class _MyAppState extends State<MyApp> {
     var response = await DietPlan().get('R5EonpUDWy');
 
     if (response.success) {
-      print(ApplicationConstants.APP_NAME +
-          ": " +
-          (response.result as DietPlan).toString());
+      print(ApplicationConstants.APP_NAME + ": " + (response.result as DietPlan).toString());
     } else {
       print(ApplicationConstants.APP_NAME + ": " + response.exception.message);
     }
@@ -91,10 +89,9 @@ class _MyAppState extends State<MyApp> {
   void query() async {
     // Query for an object by name
     var queryBuilder = QueryBuilder<DietPlan>(DietPlan())
-      ..startsWith(DietPlan.NAME, "Keto")
-      ..greaterThan(DietPlan.FAT, 64)
-      ..lessThan(DietPlan.FAT, 66)
-      ..equals(DietPlan.CARBS, 5);
+      ..greaterThan(DietPlan.FAT, 20)
+      ..limit(1)
+      ..skip(1);
 
     var response = await queryBuilder.query();
 
@@ -106,11 +103,12 @@ class _MyAppState extends State<MyApp> {
   }
 
   initUser() async {
-    ParseUser()
-        .create("TestFlutter", "TestPassword123", "[email protected]");
-    var user = await ParseUser().signUp();
+    var user = ParseUser().create("TestFlutter", "TestPassword123", "[email protected]");
+    user = await ParseUser().signUp();
     user = await ParseUser().login();
+
     user = await ParseUser().currentUser(fromServer: true);
+
     user = await ParseUser().requestPasswordReset();
     user = await ParseUser().verificationEmailRequest();
     user = await ParseUser().all();

lib/network/parse_query.dart

@@ -24,11 +24,39 @@ class QueryBuilder<T extends ParseObject> {
   List<MapEntry> _allQueries = List();
   List<MapEntry> _regExQueries = List();
   List<MapEntry> _textQueries = List();
-  int limit = 0;
-  int skip = 0;
+  int _limit = 0;
+  int _skip = 0;
+  dynamic _where;
+  dynamic _order;
+  dynamic _keys;
+  dynamic _include;
 
   QueryBuilder(this.object) : super();
 
+  void limit(int limit){
+    _limit = limit;
+  }
+
+  void skip(int skip){
+    _skip = skip;
+  }
+
+  void where(int where){
+    _where = where;
+  }
+
+  void order(int order){
+    _order = order;
+  }
+
+  void keys(int keys){
+    _keys = keys;
+  }
+
+  void include(int include){
+    _include = include;
+  }
+
   void startsWith(String key, dynamic value) {
     _regExQueries.add(MapEntry(key, "^$value"));
   }
@@ -143,16 +171,22 @@ class QueryBuilder<T extends ParseObject> {
       }
     }
 
-    // -- ADD LIMITER
-    if (limit != 0) query += '?limit=$limit';
-    if (skip != 0) query += '?skip=$skip';
-
     query += QUERY_END;
 
+    // ADD PARAMS
+    Map limiters = Map();
+    if (_where != null) limiters['where'] = where;
+    if (_order != null) limiters["order"] = order;
+    if (_limit != 0) limiters["limit"] = limit;
+    if (_skip != 0) limiters["skip"] = skip;
+    if (_keys != null) limiters["keys"] = keys;
+    if (_include != null) limiters["include"] = include;
+    query += getLimiters(limiters);
+
     // -- TEST
     print("QUERY: $query");
 
-    return query;
+    return "$query";
   }
 
   _getAllQueries(List<MapEntry> queries, String queryOperator){
@@ -229,6 +263,14 @@ class QueryBuilder<T extends ParseObject> {
     return sanitisedQueries;
   }
 
+  getLimiters(Map map) {
+    String result;
+    map.forEach((key, value) {
+      result = (result != null) ? result + "&$key=$value" : "&$key=$value";
+    });
+    return result;
+  }
+
   convertValueToCorrectType(dynamic value) {
     if (value is int) return (value as num);
     if (value is String) return "\"$value\"";

lib/objects/parse_user.dart

@@ -16,7 +16,7 @@ class ParseUser {
     client != null ? _client = client : _client = ParseHTTPClient();
 
     if (_debug == null) {
-      _debug = client.data.debug;
+      _client.data.debug != null ? _debug = _client.data.debug : false;
     } else {
       _debug = _debug;
     }
@@ -39,7 +39,7 @@ class ParseUser {
       Uri uri= Uri(
           scheme: tempUri.scheme,
           host: tempUri.host,
-          path: "${tempUri.path}$path/me");
+          path: "${tempUri.path}/users/me");
 
       final response = await _client.get(uri, headers: {
         ParseConstants.HEADER_SESSION_TOKEN: _client.data.sessionId