fix(File): decode Files properly (#427)

also this makes File compatible with Query

Author: leeyeh

src/av.js

@@ -331,9 +331,9 @@ AV._decode = function(value, key) {
   }
   if (value.__type === 'File') {
     var file = new AV.File(value.name);
-    file.attributes.metaData = value.metaData || {};
-    file.attributes.url = value.url;
-    file.id = value.objectId;
+    const v = _.clone(value);
+    delete v.__type;
+    file._finishFetch(v);
     return file;
   }
   return _.mapObject(value, function(v, k) {

src/file.js

@@ -478,23 +478,25 @@ module.exports = function(AV) {
         var options = null;
 
         var request = AVRequest('files', null, this.id, 'GET', options);
-        return request.then((response) => {
-          var value = AV.Object.prototype.parse(response);
-          value.attributes = {
-            name: value.name,
-            url: value.url,
-            mime_type: value.mime_type,
-          };
-          value.attributes.metaData = value.metaData || {};
-          // clean
-          delete value.objectId;
-          delete value.metaData;
-          delete value.url;
-          delete value.name;
-          delete value.mime_type;
-          _.extend(this, value);
-          return this;
-        });
+        return request.then(this._finishFetch.bind(this));
+    },
+    _finishFetch: function(response) {
+      var value = AV.Object.prototype.parse(response);
+      value.attributes = {
+        name: value.name,
+        url: value.url,
+        mime_type: value.mime_type,
+      };
+      value.attributes.metaData = value.metaData || {};
+      value.id = value.objectId;
+      // clean
+      delete value.objectId;
+      delete value.metaData;
+      delete value.url;
+      delete value.name;
+      delete value.mime_type;
+      _.extend(this, value);
+      return this;
     }
   };
 };

test/av.js

@@ -33,5 +33,17 @@ describe('AV utils', () => {
       AV._decode(false).should.be.exactly(false);
       AV._decode('false').should.be.exactly('false');
     });
+
+    it('should decode File', () => {
+      const fileId = '1111111';
+      const json = { "mime_type": "image/png", "updatedAt": "2016-12-30T06:55:43.561Z", "key": "d7aaab5c477b289980fc.png", "name": "lc.png", "objectId": fileId, "createdAt": "2016-12-30T06:55:43.561Z", "__type": "File", "url": "", "bucket": "rYAutyUJ" };
+      const file = AV._decode(json);
+      expect(file).to.be.a(AV.File);
+      expect(file.id).to.be(fileId);
+      expect(file.name()).to.be('lc.png');
+      expect(file.get('mime_type')).to.be('image/png');
+      expect(typeof file.url()).to.be('string');
+      expect(file.createdAt).to.be.a(Date);
+    });
   });
 });

test/query.js

@@ -44,6 +44,19 @@ describe('Queries', function () {
 
   });
 
+  it('#File Query', () => {
+    const fileId = '52f9dd5ae4b019816c865985';
+    query = new AV.Query(AV.File);
+    query.equalTo('objectId', fileId);
+    return query.find().then(([file]) => {
+        expect(file).to.be.a(AV.File);
+        expect(file.id).to.be(fileId);
+        expect(file.name()).to.be('myfile.txt');
+        expect(file.get('mime_type')).to.be('text/plain');
+        expect(typeof file.url()).to.be('string');
+    });
+  });
+
   describe('#cloudQuery', function () {
     it('should return results.', function () {
       return AV.Query.doCloudQuery('select * from GameScore').then(function (result) {