Fix $pullAll and clean $pushAll by converting it to $push+$each rathe…

…r than deleting it; fixes #9
Meteor-Community-Packages · Oct 29, 2013 · fe7950a · fe7950a
1 parent fd88f65
commit fe7950a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ A simple, reactive schema validation smart package for Meteor.
 
 ## Change Log
 
+### 0.2.13
+
+Fix $pullAll and clean $pushAll by converting it to $push+$each rather than
+deleting it.
+
 ### 0.2.12
 
 Add workaround for Safari bug.

diff --git a/simple-schema-tests.js b/simple-schema-tests.js
@@ -2438,13 +2438,29 @@ Tinytest.add("SimpleSchema - Cleanup With Modifier Operators", function(test) {
   //type conversion works
   doTest({$pop: {allowedNumbersArray: "1"}}, {$pop: {allowedNumbersArray: 1}});
 
-  //DEPRECATED OPERATORS SHOULD BE REMOVED
-
-  //$PUSHALL
-  doTest({$pushAll: {allowedNumbersArray: [1, 2, 3]}}, {});
-
   //$PULLALL
-  doTest({$pullAll: {allowedNumbersArray: [1, 2, 3]}}, {});
+
+  doTest({$pullAll: {allowedNumbersArray: [1, 2, 3]}}, {$pullAll: {allowedNumbersArray: [1, 2, 3]}});
+  doTest({$pullAll: {allowedNumbersArray: ["1", 2, 3]}}, {$pullAll: {allowedNumbersArray: [1, 2, 3]}});
+
+  //$PUSHALL (DEPRECATED - SHOULD BE TRANSLATED TO $PUSH+$EACH
+
+  doTest({$pushAll: {allowedNumbersArray: [1, 2, 3]}}, {$push: {allowedNumbersArray: {$each: [1, 2, 3]}}});
+  doTest({$pushAll: {allowedNumbersArray: ["1", 2, 3]}}, {$push: {allowedNumbersArray: {$each: [1, 2, 3]}}});
+  //if there's also $push for some reason, the two should be combined
+  doTest({
+    $push: {
+      allowedNumbersArray: {$each: ["1", 2, 3]},
+      allowedStringsArray: {$each: ["tuna", "fish"]}
+    },
+    $pushAll: {allowedNumbersArray: ["4", 5, 6]}
+  }, {
+    $push: {
+      allowedNumbersArray: {$each: [1, 2, 3, 4, 5, 6]},
+      allowedStringsArray: {$each: ["tuna", "fish"]}
+    }
+  });
+
 });
 
 Tinytest.add("SimpleSchema - Custom Types", function(test) {

diff --git a/simple-schema.js b/simple-schema.js
@@ -117,22 +117,27 @@ SimpleSchema.prototype.validator = function(func) {
   this._validators.push(func);
 };
 
-//filter and automatically type convert
+// Filter and automatically type convert
 SimpleSchema.prototype.clean = function(doc, options) {
   var newDoc, self = this;
 
-  //by default, doc will be filtered and autoconverted
+  // By default, doc will be filtered and autoconverted
   options = _.extend({
     filter: true,
     autoConvert: true
   }, options || {});
 
-  //delete deprecated operators
+  // Convert $pushAll (deprecated) to $push with $each
   if ("$pushAll" in doc) {
-    delete doc.$pushAll;
-  }
-  if ("$pullAll" in doc) {
-    delete doc.$pullAll;
+    doc.$push = doc.$push || {};
+    for (var field in doc.$pushAll) {
+      doc.$push[field] = doc.$push[field] || {};
+      doc.$push[field].$each = doc.$push[field].$each || [];
+      for (var i = 0, ln = doc.$pushAll[field].length; i < ln; i++) {
+        doc.$push[field].$each.push(doc.$pushAll[field][i]);
+      }
+      delete doc.$pushAll;
+    }
   }
 
   var mDoc = new MongoObject(doc);

diff --git a/smart.json b/smart.json
@@ -3,7 +3,7 @@
   "description": "A simple schema validation object with reactivity. Used by collection2 and autoform.",
   "homepage": "https://github.com/aldeed/meteor-simple-schema",
   "author": "Eric Dobbertin (http://dairystatedesigns.com)",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "git": "https://github.com/aldeed/meteor-simple-schema.git",
   "packages": {}
 }