Merge pull request #26 from avoscloud/feature/cloud_query

Added AV.Cloud.doCloudQuery

Author: killme2008

changelog.txt

@@ -0,0 +1,6 @@
+# 0.4.3
+
+* 添加 CQL 查询支持。
+
+# 老版本的 changelog
+https://download.avoscloud.com/sdk/javascript/changelog.txt

lib/av.js

@@ -1,6 +1,6 @@
 /*!
  * AVOSCloud JavaScript SDK
- * Version: 0.4.0
+ * Version: 0.4.3
  * Built: Mon Jun 03 2013 13:45:00
  * http://avoscloud.com
  *
@@ -13,7 +13,7 @@
  */
 (function(root) {
   root.AV = root.AV || {};
-  root.AV.VERSION = "js0.4.0";
+  root.AV.VERSION = "js0.4.3";
 }(this));
 //     Underscore.js 1.4.4
 //     http://underscorejs.org
@@ -1593,6 +1593,7 @@
         route !== "requestSmsCode" &&
         route !== "verifySmsCode" &&
         route !== "users" &&
+        route !== "cloudQuery" &&
         route !== "qiniu" &&
         route !== "statuses" &&
         route !== 'subscribe/statuses/count' &&
@@ -8838,6 +8839,35 @@
       })._thenRunCallbacks(options);
     },
 
+    /**
+     * Retrieves a list of AVObjects that satisfy the CQL.
+     * CQL syntax please see https://cn.avoscloud.com/docs/cql_guide.html
+     * Either options.success or options.error is called when the find
+     * completes.
+     *
+     * @param {String} cql,  A CQL string, see https://cn.avoscloud.com/docs/cql_guide.html
+     * @return {AV.Promise} A promise that is resolved with the results when
+     * the query completes.
+     */
+    doCloudQuery: function(cql, options) {
+      var params = { cql: cql };
+      var request = AV._request("cloudQuery", null, null, 'GET', params)
+      return request.then(function(response) {
+        //query to process results.
+        var query = new AV.Query(response.className);
+        var results = _.map(response.results, function(json) {
+          var obj = query._newObject(response);
+          obj._finishFetch(query._processResult(json), true);
+            return obj;
+        });
+        return {
+          results: results,
+          count:  response.count,
+          className: response.className
+        };
+      })._thenRunCallbacks(options);
+    },
+
     /**
      * 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.

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "avoscloud-sdk",
-	"version": "0.4.2",
+	"version": "0.4.3",
 	"main": "./lib/av.js",
 	"description": "AVOSCloud JavaScript SDK.",
 	"repository": {

tests/object.js

@@ -59,6 +59,26 @@ describe('Objects', function(){
 			}
 		})
     });
+
+   it('should validate failed.', function(done){
+	   var TestObject = AV.Object.extend('TestObject', {
+		   validate: function (attrs, options){
+			   return new AV.Error(1, "test");
+           }
+       });
+	   var testObject =new TestObject();
+	   testObject.set('a',1, {
+		   success: function(){
+			   throw "should not be here.";
+		   },
+		   error: function(obj, err){
+			   console.dir(err);
+			   expect(obj.get('a')).to.be(undefined);
+			   expect(err.message).to.be('test');
+			   done();
+		   }
+       });
+   });
   })
 
 

tests/query.js

@@ -25,6 +25,52 @@ describe("Queries",function(){
 
   	});
 
+    describe("#cloudQuery", function(){
+		it("should return results.", function(done){
+			AV.Cloud.doCloudQuery('select * from GameScore').then(function(result){
+				console.dir(result);
+				var results = result.results;
+				expect(results.length).to.be(100);
+				expect(results[0].className).to.be("GameScore");
+				expect(result.count).to.be(undefined);
+				expect(result.className).to.be('GameScore');
+				done();
+			});
+		});
+		it("should return limited results.", function(done){
+			AV.Cloud.doCloudQuery('select * from GameScore limit 10').then(function(result){
+				console.dir(result);
+				var results = result.results;
+				expect(results.length).to.be(10);
+				expect(results[0].className).to.be("GameScore");
+				expect(result.count).to.be(undefined);
+				expect(result.className).to.be('GameScore');
+				done();
+			});
+		});
+		it("should return count value.", function(done){
+			AV.Cloud.doCloudQuery('select *,count(objectId) from GameScore limit 10').then(function(result){
+				console.dir(result);
+				var results = result.results;
+				expect(results.length).to.be(10);
+				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.Cloud.doCloudQuery('select * GameScore limit 10').then(function(){
+				throw "Shoud not be successfully.";
+				},
+		  function(error){
+               console.dir(error);
+			  expect(error).to.be.an(AV.Error);
+			  done();
+		  });
+		});
+    });
+
   	describe("#save&query()",function(){
 	  	it("should length + 1",function(done){
 			query = new AV.Query(GameScore);