Merge pull request Urigo#438 from mxab/cfs-file-insert-fix

Cfs file insert fix

Author: Urigo

modules/angular-meteor-meteorCollection.js

@@ -30,8 +30,7 @@ angularMeteorCollections.factory('AngularMeteorCollection', ['$q', '$meteorSubsc
         var deferred = $q.defer();
 
         // delete $$hashkey
-        if (!(item instanceof File))
-          item = $meteorUtils.stripDollarPrefixedKeys(item);
+        item = $meteorUtils.stripDollarPrefixedKeys(item);
 
         if (item._id) { // Performs an update if the _id property is set.
           var item_id = item._id; // Store the _id in temporary variable

modules/angular-meteor-utils.js

@@ -25,15 +25,15 @@ angularMeteorUtils.service('$meteorUtils', [ '$timeout',
     };
     // Borrowed from angularFire - https://github.com/firebase/angularfire/blob/master/src/utils.js#L445-L454
     this.stripDollarPrefixedKeys = function (data) {
-      if( !angular.isObject(data) || data instanceof File || data instanceof Date) { return data; }
+      if( !angular.isObject(data) || data instanceof File || (typeof FS === 'object' && data instanceof FS.File) || data instanceof Date) { return data; }
       var out = angular.isArray(data)? [] : {};
       angular.forEach(data, function(v,k) {
         if(typeof k !== 'string' || k.charAt(0) !== '$') {
           out[k] = self.stripDollarPrefixedKeys(v);
         }
       });
       return out;
-    }
+    };
   }]);
 
 angularMeteorUtils.run(['$rootScope', '$meteorUtils',

tests/integration/angular-meteor-utils-spec.js

@@ -70,4 +70,49 @@ describe('$meteorUtils service', function () {
       expect(handle.stop).toHaveBeenCalled();
     });
   });
+  describe('stripDollarPrefixedKeys', function () {
+
+    it('should remove keys with $ prefix', function(){
+
+      var result = $meteorUtils.stripDollarPrefixedKeys({'$foo': 1, '$$baz': 3, bar : 2});
+      expect(result.hasOwnProperty('$foo')).toBe(false);
+      expect(result.hasOwnProperty('$$baz')).toBe(false);
+      expect(result.bar).toEqual(2);
+
+    });
+    it('should ignore FS.File instances', function(){
+
+      var cfsExits = typeof window.FS === 'object';
+      if(!cfsExits){
+        window.FS = {
+          File : function(){}
+        };
+      }
+
+      var fsFile = new FS.File();
+      var result = $meteorUtils.stripDollarPrefixedKeys(fsFile);
+
+      if(!cfsExits){ // clean up
+        delete window.FS;
+      }
+      expect(result).toBe(fsFile);
+
+    });
+    it('should ignore Date instances', function(){
+
+      var input = new Date();
+      var result = $meteorUtils.stripDollarPrefixedKeys(input);
+
+      expect(result).toBe(input);
+
+    });
+    it('should ignore File instances', function(){
+
+      var input = new File([], "myfile.jpg");
+      var result = $meteorUtils.stripDollarPrefixedKeys(input);
+
+      expect(result).toBe(input);
+
+    });
+  });
 });