Merge pull request #29 from leancloud/feature/v0.4.5

Feature/v0.4.5

Author: aisk

lib/av.js

@@ -4469,7 +4469,7 @@
      * @param {boolean} enable  true to enable fetchWhenSave option.
      */
     fetchWhenSave: function(enable){
-      if (typeof enable !== 'boolean'){
+      if (!_.isBoolean(enable)) {
         throw "Expect boolean value for fetchWhenSave";
       }
       this._fetchWhenSave = enable;
@@ -6908,7 +6908,7 @@
       if(!target){
           throw "Invalid target user.";
       }
-      var userObjectId = (typeof target === 'string') ? target: target.id;
+      var userObjectId = _.isString(target) ? target: target.id;
       if(!userObjectId){
           throw "Invalid target user.";
       }
@@ -6932,7 +6932,7 @@
       if(!target){
           throw "Invalid target user.";
       }
-      var userObjectId = (typeof target === 'string') ? target: target.id;
+      var userObjectId = _.isString(target) ? target: target.id;
       if(!userObjectId){
           throw "Invalid target user.";
       }
@@ -7188,7 +7188,7 @@
      * @since 0.3.0
      */
     followerQuery: function(userObjectId) {
-        if(!userObjectId || typeof userObjectId !='string'){
+        if(!userObjectId || !_.isString(userObjectId)) {
           throw "Invalid user object id.";
         }
         var query = new AV.FriendShipQuery('_Follower');
@@ -7203,7 +7203,7 @@
      * @since 0.3.0
      */
     followeeQuery: function(userObjectId) {
-        if(!userObjectId || typeof userObjectId !='string'){
+        if(!userObjectId || !_.isString(userObjectId)) {
           throw "Invalid user object id.";
         }
         var query = new AV.FriendShipQuery('_Followee');
@@ -7531,11 +7531,19 @@
    * completes.
    *
    * @param {String} cql,  A CQL string, see <a href='https://cn.avoscloud.com/docs/cql_guide.html'>CQL Guide.</a>
+   * @param {Array} pvalues, An array contains placeholder values.
+   * @param {Object} options A Backbone-style options object,it's optional.
    * @return {AV.Promise} A promise that is resolved with the results when
-   * the query completes.
+   * the query completes,it's optional.
    */
-  AV.Query.doCloudQuery = function(cql, options) {
+  AV.Query.doCloudQuery = function(cql, pvalues, options) {
     var params = { cql: cql };
+    if(_.isArray(pvalues)){
+      params.pvalues = pvalues;
+    } else {
+      options = pvalues;
+    }
+
     var request = AV._request("cloudQuery", null, null, 'GET', params)
     return request.then(function(response) {
       //query to process results.
@@ -8892,16 +8900,19 @@
 
     /**
      * Makes a call to request a sms code for operation verification.
-     * @param {Object} data The mobile phone number string or a JSON object contains mobilePhoneNumber,op,ttl,name etc.
+     * @param {Object} data The mobile phone number string or a JSON
+     *    object that contains mobilePhoneNumber,template,op,ttl,name etc.
      * @param {Object} options A Backbone-style options object
      * @return {AV.Promise} A promise that will be resolved with the result
      * of the function.
      */
     requestSmsCode: function(data, options){
-      if(typeof data === 'string')
+      if(_.isString(data)) {
         data = { mobilePhoneNumber: data };
-      if(!data.mobilePhoneNumber)
+      }
+      if(!data.mobilePhoneNumber) {
         throw "Missing mobilePhoneNumber.";
+      }
       var request = AV._request("requestSmsCode", null, null, 'POST',
                                     data);
       return request._thenRunCallbacks(options);
@@ -8949,6 +8960,8 @@
    *     <li>expiration_interval - The seconds from now to expire the push.</li>
    *     <li>where - A AV.Query over AV.Installation that is used to match
    *         a set of installations to push to.</li>
+   *     <li>cql - A CQL statement over AV.Installation that is used to match
+   *         a set of installations to push to.</li>
    *     <li>data - The data to send as part of the push</li>
    *   <ol>
    * @param {Object} options An object that has an optional success function,
@@ -8961,6 +8974,10 @@
       data.where = data.where.toJSON().where;
     }
 
+    if(data.where && data.cql){
+      throw "Both where and cql can't be set";
+    }
+
     if (data.push_time) {
       data.push_time = data.push_time.toJSON();
     }
@@ -8993,7 +9010,7 @@
     this.data = {};
     this.inboxType = 'default';
     this.query = null;
-    if(imageUrl && typeof imageUrl == 'object') {
+    if(imageUrl && typeof imageUrl === 'object') {
         this.data = imageUrl;
     } else {
       if(imageUrl){
@@ -9177,7 +9194,7 @@
     if(!target){
           throw "Invalid target user.";
     }
-    var userObjectId = (typeof target === 'string') ? target: target.id;
+    var userObjectId = _.isString(target) ? target: target.id;
     if(!userObjectId){
         throw "Invalid target user.";
     }
@@ -9221,8 +9238,8 @@
       throw 'Please signin an user or pass the owner objectId.';
     }
     owner = owner || AV.User.current();
-    var options = (typeof arguments[1] !== 'string') ? arguments[1] : arguments[2];
-    var inboxType =  (typeof arguments[1] !== 'string') ? 'default' : arguments[1];
+    var options = !_.isString(arguments[1]) ? arguments[1] : arguments[2];
+    var inboxType =  !_.isString(arguments[1]) ? 'default' : arguments[1];
     var params = {};
     params.inboxType = AV._encode(inboxType);
     params.owner = AV._encode(owner);

tests/query.js

@@ -59,6 +59,17 @@ describe("Queries",function(){
 				done();
 			});
 		});
+		it("should return count value too.", function(done){
+			AV.Query.doCloudQuery('select *,count(objectId) from GameScore limit ?', [5]).then(function(result){
+				console.dir(result);
+				var results = result.results;
+				expect(results.length).to.be(5);
+				expect(results[0].className).to.be("GameScore");
+				expect(result.count).to.be.an('number');
+				expect(result.className).to.be('GameScore');
+				done();
+			});
+		});
 		it("should return syntax error.", function(done){
 			AV.Query.doCloudQuery('select * GameScore limit 10').then(function(){
 				throw "Shoud not be successfully.";