Merge pull request #41 from leancloud/feature/v0.4.6

Feature/v0.4.6

Author: wangxiao

lib/av.js

@@ -1,6 +1,6 @@
 /*!
  * AVOSCloud JavaScript SDK
- * Version: 0.4.5
+ * Version: 0.4.6
  * 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.5";
+  root.AV.VERSION = "js0.4.6";
 }(this));
 //     Underscore.js 1.4.4
 //     http://underscorejs.org
@@ -1364,7 +1364,6 @@
    * This method is for AV's own private use.
    * @param {String} applicationId Your AV Application ID.
    * @param {String} applicationKey Your AV Application Key
-
    */
    AV._initialize = function(applicationId, applicationKey, masterKey) {
     AV.applicationId = applicationId;
@@ -1373,6 +1372,21 @@
     AV._useMasterKey = false;
   };
 
+
+  /**
+   * Call this method to set production environment variable.
+   * @param {Boolean} production, true is production environment,and
+   *  it's true by default.
+   */
+  AV.setProduction = function(production){
+    if(!AV._isNullOrUndefined(production)) {
+      //make sure it's a number
+      production = production ? 1 : 0;
+    }
+    //default is 1
+    AV.applicationProduction = AV._isNullOrUndefined(production) ? 1: production;
+  }
+
   // If we're running in node.js, allow using the master key.
   if (AV._isNode) {
     AV.initialize = AV._initialize;
@@ -1626,6 +1640,9 @@
 
     dataObject._ApplicationId = AV.applicationId;
     dataObject._ApplicationKey = AV.applicationKey;
+    if(!AV._isNullOrUndefined(AV.applicationProduction)) {
+      dataObject._ApplicationProduction = AV.applicationProduction;
+    }
     if(AV._useMasterKey)
         dataObject._MasterKey = AV.masterKey;
     dataObject._ClientVersion = AV.VERSION;
@@ -1717,7 +1734,7 @@
       return value.toJSON();
     }
     if (value instanceof AV.File) {
-      if (!value.url()) {
+      if (!value.url() && !value.id) {
         throw "Tried to save an object containing an unsaved file.";
       }
       return {
@@ -4128,6 +4145,7 @@
    * @param {String} Optional Content-Type header to use for the file. If
    *     this is omitted, the content type will be inferred from the name's
    *     extension.
+   * @return {AV.File} the file object
    */
   AV.File.withURL = function(name, url, metaData, type){
     if(!name || !url){
@@ -4147,8 +4165,39 @@
     return file;
   };
 
+  /**
+   * Creates a file object with exists objectId.
+   * @param {String} The objectId string
+   * @return {AV.File} the file object
+   */
+  AV.File.createWithoutData = function(objectId){
+    var file = new AV.File();
+    file.id = objectId;
+    return file;
+  };
+
   AV.File.prototype = {
 
+    /**
+     * Returns the ACL for this file.
+     * @returns {AV.ACL} An instance of AV.ACL.
+     */
+    getACL: function() {
+      return this._acl;
+    },
+
+    /**
+     * Sets the ACL to be used for this file.
+     * @param {AV.ACL} acl An instance of AV.ACL.
+     */
+    setACL: function(acl) {
+        if(!(acl instanceof AV.ACL)) {
+          return new AV.Error(AV.Error.OTHER_CAUSE,
+                               "ACL must be a AV.ACL.");
+        }
+        this._acl = acl;
+    },
+
     /**
      * Gets the name of the file. Before save is called, this is the filename
      * given by the user. After save is called, that name gets prefixed with a
@@ -4264,6 +4313,7 @@
               var key = hexOctet() + hexOctet() + hexOctet() + hexOctet();
               var data = {
                 key: key,
+                ACL: self._acl,
                 name:self._name,
                 mime_type: type,
                 metaData: self._metaData,
@@ -4303,6 +4353,7 @@
               var data = {
                 base64: base64,
                 _ContentType: type,
+                ACL: self._acl,
                 mime_type: type,
                 metaData: self._metaData,
               };
@@ -4317,8 +4368,10 @@
             });
           }
         } else if(self._url && self._metaData['__source'] == 'external') {
+          //external link file.
           var data = {
             name: self._name,
+            ACL: self._acl,
             metaData: self._metaData,
             mime_type: self._guessedType,
             url: self._url
@@ -5680,7 +5733,7 @@
       }
 
       if (object instanceof AV.File) {
-        if (!object.url()) {
+        if (!object.url() && !object.id) {
           files.push(object);
         }
         return;
@@ -7524,6 +7577,33 @@
     return query;
   };
 
+  /**
+   * Constructs a AV.Query that is the AND of the passed in queries.  For
+   * example:
+   * <pre>var compoundQuery = AV.Query.and(query1, query2, query3);</pre>
+   *
+   * will create a compoundQuery that is an 'and' of the query1, query2, and
+   * query3.
+   * @param {...AV.Query} var_args The list of queries to AND.
+   * @return {AV.Query} The query that is the AND of the passed in queries.
+   */
+  AV.Query.and = function() {
+    var queries = _.toArray(arguments);
+    var className = null;
+    AV._arrayEach(queries, function(q) {
+      if (_.isNull(className)) {
+        className = q.className;
+      }
+
+      if (className !== q.className) {
+        throw "All queries must be for the same class";
+      }
+    });
+    var query = new AV.Query(className);
+    query._andQuery(queries);
+    return query;
+  };
+
   /**
    * Retrieves a list of AVObjects that satisfy the CQL.
    * CQL syntax please see <a href='https://cn.avoscloud.com/docs/cql_guide.html'>CQL Guide.</a>
@@ -8001,6 +8081,21 @@
       return this;
     },
 
+    /**
+     * Add constraint that both of the passed in queries matches.
+     * @param {Array} queries
+     * @return {AV.Query} Returns the query, so you can chain this call.
+     */
+    _andQuery: function(queries) {
+      var queryJSON = _.map(queries, function(q) {
+        return q.toJSON().where;
+      });
+
+      this._where.$and = queryJSON;
+      return this;
+    },
+
+
     /**
      * Converts a string into a regex that matches it.
      * Surrounding with \Q .. \E does this, we just need to escape \E's in
@@ -8925,11 +9020,19 @@
      * @return {AV.Promise} A promise that will be resolved with the result
      * of the function.
      */
-    verifySmsCode: function(code, options){
+    verifySmsCode: function(code, phone, options){
       if(!code)
         throw "Missing sms code.";
+      var params = {};
+      if(AV._.isString(phone)) {
+         params['mobilePhoneNumber'] = phone;
+      } else {
+        // To be compatible with old versions.
+         options = phone;
+      }
+
       var request = AV._request("verifySmsCode", code, null, 'POST',
-                                    null);
+                                   params);
       return request._thenRunCallbacks(options);
     }
   });

tests/file.js

@@ -6,6 +6,7 @@ describe("files", function() {
 			var base64 = "d29ya2luZyBhdCBhdm9zY2xvdWQgaXMgZ3JlYXQh";
 			var file = new AV.File("myfile.txt", { base64: base64 });
 			file.metaData('format', 'txt file');
+			file.setACL(new AV.ACL());
 			file.save().then(function(){
 				console.log(file.url());
 				console.log(file.id);

tests/query.js

@@ -288,7 +288,7 @@ describe("Counts",function(){
 })
 
 describe("Compound Query",function(){
-	it("satisfy on of the conditions",function(done){
+	it("satisfy on 'or' conditions",function(done){
 		var lotsOfWins = new AV.Query("GameScore");
 		lotsOfWins.greaterThan("score",150);
 
@@ -298,7 +298,31 @@ describe("Compound Query",function(){
 		var mainQuery = AV.Query.or(lotsOfWins, fewWins);
 		mainQuery.find({
 		  success: function(results) {
-		  	done();
+            results.forEach(function(gs){
+				expect(gs.get('score') > 150 || gs.get('cheatMode')).to.be.ok();
+			});
+			done();
+		     // results contains a list of players that either have won a lot of games or won only a few games.
+		  },
+		  error: function(error) {
+		    // There was an error.
+		  }
+		});
+	});
+	it("satisfy on 'and' conditions",function(done){
+		var lotsOfWins = new AV.Query("GameScore");
+		lotsOfWins.greaterThan("score",150);
+
+		var fewWins = new AV.Query("GameScore");
+		fewWins.equalTo("cheatMode",true);
+
+		var mainQuery = AV.Query.and(lotsOfWins, fewWins);
+		mainQuery.find({
+		  success: function(results) {
+            results.forEach(function(gs){
+				expect(gs.get('score') > 150 && gs.get('cheatMode')).to.be.ok();
+			});
+			done();
 		     // results contains a list of players that either have won a lot of games or won only a few games.
 		  },
 		  error: function(error) {

tests/test.html

@@ -20,7 +20,7 @@
 		<script src="http://www.parsecdn.com/js/parse-1.2.8.min.js"></script>
 		<script type="text/javascript">
 		  var AV=Parse;
-		  AV.initialize("9WK4a3Ju5r6pm67VcOOKfesKKfLm8XPw7vZbFwJX","fmzd7y5KRsp8LV0fx6s9YGGmsi8RuAJ3gUZcHfYf")
+		  AV.initialize("9WK4a3Ju5r6pm67VcOOKfesKKfLm8XPw7vZbFwJX","fmzd7y5KRsp8LV0fx6s9YGGmsi8RuAJ3gUZcHfYf");
 		</script>
 		-->
 

tests/test.js

@@ -5,6 +5,7 @@ if(typeof require !="undefined"){
 }
 AV.serverURL="https://cn-stg1.avoscloud.com";
 AV._initialize('mxrb5nn3qz7drek0etojy5lh4yrwjnk485lqajnsgjwfxrb5', 'd7sbus0d81mrum4tko4t8gl74b27vl0rh762ff7ngrb6ymmq', 'l0n9wu3kwnrtf2cg1b6w2l87nphzpypgff6240d0lxui2mm4');
+AV.setProduction(true);
 //AV._initialize('blxzylt2g5e8l09zt875hl82nb8clydmvdjotv7ouudltkhj', 'ny0cwned258af60y6epsic72ge368zbnal4rmk7p0knu079o', 'ceotnbt1o1hpvjrr4oh8f8ykrxin973acc0b2hxi62e4f0bi');
 //AV._initialize("a6jku4sqdxbgidzrxsy8u30evp8nltry2af4atncwg5br0qi","85gi8j21v7l5li9kquh3oy900macawjs4leyx8n788k7z4qy","5cy3lnf97bkznd9su76t05qi6zuzoygxbgtik4egsd9wtl2j");
 AV._useMasterKey = true;