Merge pull request #258 from wangxiao/all-get

优化 AV.File，统一 API。

Author: leeyeh

demo/test-es5.js

@@ -31,4 +31,11 @@ file.save().then(function (data) {
   console.log(data);
 }).catch(function (error) {
   console.log(error);
+});
+
+// 查找文件
+var query = new AV.Query(TestClass);
+query.equalTo('name', 'hjiang');
+query.find().then(function (list) {
+  console.log(list);
 });

demo/test-es6.js

@@ -31,3 +31,11 @@ file.save().then((data) => {
   console.log(error);
 });
 
+// 查找文件
+const query = new AV.Query(TestClass);
+query.equalTo('name', 'hjiang');
+query.find().then((list) => {
+  console.log(list);
+});
+
+

src/browserify-wrapper/ajax-browser.js

@@ -59,19 +59,6 @@ const ajax = (method, url, data, success, error) => {
     }
   };
 
-  if (method.toLowerCase() === 'get') {
-    let i = 0;
-    for (let k in data) {
-      if (i === 0) {
-        url = url + '?';
-      } else {
-        url = url + '&';
-      }
-      url = url + k + '=' + encodeURIComponent(JSON.stringify(data[k]));
-      i ++;
-    }
-  }
-
   let headers = {
     'X-LC-Id': appId,
     'X-LC-UA': 'LC-Web-' + AV.version,
@@ -93,6 +80,24 @@ const ajax = (method, url, data, success, error) => {
     }
   }
 
+  if (method.toLowerCase() === 'get') {
+    let i = 0;
+    for (let k in data) {
+      if (i === 0) {
+        url = url + '?';
+      } else {
+        url = url + '&';
+      }
+
+      if (typeof data[k] === 'object') {
+        data[k] = JSON.stringify(data[k]);
+      }
+
+      url = url + k + '=' + encodeURIComponent(data[k]);
+      i ++;
+    }
+  }
+
   if (masterKey && AV._useMasterKey) {
     headers['X-LC-Sign'] = sign(masterKey, true);
   } else {

src/browserify-wrapper/upload-browser.js

@@ -7,23 +7,22 @@
 
 module.exports = function upload(file, AV, saveOptions) {
   //use /files endpoint.
-  var self = file;
   var dataFormat;
-  self._previousSave = self._source.then(function(data, type) {
+  file._previousSave = file._source.then(function(data, type) {
     dataFormat = data;
-    return self._qiniuToken(type);
+    return file._qiniuToken(type);
   }).then(function(response) {
-    self._url = response.url;
-    self._bucket = response.bucket;
-    self.id = response.objectId;
+    file.attributes.url = response.url;
+    file._bucket = response.bucket;
+    file.id = response.objectId;
     //Get the uptoken to upload files to qiniu.
     var uptoken = response.token;
 
     var data = new FormData();
-    data.append("file", dataFormat);
-    data.append('name', self._name);
-    data.append("key", self._qiniu_key);
-    data.append("token", uptoken);
+    data.append('file', dataFormat);
+    data.append('name', file.attributes.name);
+    data.append('key', file._qiniu_key);
+    data.append('token', uptoken);
 
     var promise = new AV.Promise();
     var handled = false;
@@ -41,23 +40,23 @@ module.exports = function upload(file, AV, saveOptions) {
         }
         handled = true;
 
-        delete self._qiniu_key;
+        delete file._qiniu_key;
         if (xhr.status >= 200 && xhr.status < 300) {
           var response;
           try {
             response = JSON.parse(xhr.responseText);
           } catch (e) {
             promise.reject(e);
-            self.destroy();
+            file.destroy();
           }
           if (response) {
-            promise.resolve(self);
+            promise.resolve(file);
           } else {
             promise.reject(response);
           }
         } else {
           promise.reject(xhr);
-          self.destroy();
+          file.destroy();
         }
       }
     };

src/browserify-wrapper/upload.js

@@ -11,22 +11,22 @@ var Promise = require('../promise');
 
 module.exports =function upload(file) {
   file._previousSave = file._source.then(function(base64, type) {
-    file._base64 = base64;
+    file.attributes.base64 = base64;
     return file._qiniuToken(type);
   }).then(function(response) {
-    file._url = response.url;
+    file.attributes.url = response.url;
     file._bucket = response.bucket;
     file.id = response.objectId;
     //Get the uptoken to upload files to qiniu.
     var uptoken = response.token;
     var promise = new Promise();
     var extra = new qiniu.io.PutExtra();
-    if(file._metaData.mime_type)
-      extra.mimeType = file._metaData.mime_type;
-    var body = new Buffer(file._base64, 'base64');
+    if(file.attributes.metaData.mime_type)
+      extra.mimeType = file.attributes.metaData.mime_type;
+    var body = new Buffer(file.attributes.base64, 'base64');
     qiniu.io.put(uptoken, file._qiniu_key, body, extra, function(err, ret) {
       delete file._qiniu_key;
-      delete file._base64;
+      delete file.attributes.base64;
       if(!err) {
          promise.resolve(file);
       } else {