Merge pull request #1 from leoetlino/v0.2

Support both Meteor.Collection.ObjectID() and the default Meteor ID strings

modules/ngMeteor-collections.js

@@ -32,8 +32,8 @@ ngMeteorCollections.factory('$collection', ['$q', 'HashKeyCopier',
               // Remove items that don't exist in the collection anymore.
               angular.forEach(oldItems, function (oldItem) {
                 var index = newItems.map(function (item) {
-                  return item._id;
-                }).indexOf(oldItem._id);
+                  return item._id._str;
+                }).indexOf(oldItem._id._str);
                 if (index == -1) newItems.remove(oldItem._id);
               });
               newItems.save(); // Saves all items.
@@ -71,16 +71,21 @@ AngularMeteorCollection.prototype.save = function save(docs) {
   function upsertObject(item, $q) {
     var deferred = $q.defer();
 
-    item = angular.copy(item); // Makes a deep copy without the $$hashKeys.
+    item = angular.copy(item);
+    delete item.$$hashKey;
+    for (var property in item) {
+      delete property.$$hashKey;
+    }
 
     if (item._id) { // Performs an update if the _id property is set.
       var item_id = item._id; // Store the _id in temporary variable
       delete item._id; // Remove the _id property so that it can be $set using update.
-      collection.update(item_id, {$set: item}, function (error) {
+      var objectId = (item_id._str) ? new Meteor.Collection.ObjectID(item_id._str) : item_id;
+      collection.update(objectId, {$set: item}, function (error) {
         if (error) {
           deferred.reject(error);
         } else {
-          deferred.resolve({_id: item_id, action: "updated"});
+          deferred.resolve({_id: objectId, action: "updated"});
         }
       });
     } else { // Performs an insert if the _id property isn't set.
@@ -134,11 +139,12 @@ AngularMeteorCollection.prototype.remove = function remove(keys) {
       if(key._id) {
         key = key._id;
       }
-      collection.remove({_id: key}, function (error) {
+      var objectId = (key._str) ? new Meteor.Collection.ObjectID(key._str) : key;
+      collection.remove(objectId, function (error) {
         if (error) {
           deferred.reject(error);
         } else {
-          deferred.resolve({_id: key, action: "removed"});
+          deferred.resolve({_id: objectId, action: "removed"});
         }
       });
     } else {
@@ -166,4 +172,4 @@ AngularMeteorCollection.prototype.remove = function remove(keys) {
   }
 
   return $q.all(promises); // Returns all promises when they're resolved.
-};
+};

package.js

@@ -5,7 +5,9 @@ Package.describe({
 Package.on_use(function (api) {
 	// Exports the ngMeteor package scope
 	api.export('ngMeteor', 'client');
-
+
+    api.use('jquery', 'client');
+
 	// Files to load in Client only.
 	api.add_files([
 		// Lib Files