mongoose 4.3.0 → 4.3.4

package/History.md

@@ -1,3 +1,38 @@
+4.3.4 / 2015-12-23
+==================
+ * fix: upgrade mongodb driver to 2.1.2 for repl set error #3712 [sansmischevia](https://github.com/sansmischevia)
+ * docs: validation docs typo #3709 [ivanmaeder](https://github.com/ivanmaeder)
+ * style: remove unused variables #3708 [ChristianMurphy](https://github.com/ChristianMurphy)
+ * fix(schema): duck-typing for schemas #3703 [mgcrea](https://github.com/mgcrea)
+ * docs: connection sample code issue #3697
+ * fix(schema): duck-typing for schemas #3693 [mgcrea](https://github.com/mgcrea)
+ * docs: clarify id schema option #3638
+
+4.3.3 / 2015-12-18
+==================
+ * fix(connection): properly support 'replSet' as well as 'replset' #3688 [taxilian](https://github.com/taxilian)
+ * fix(document): single nested doc pre hooks called before nested doc array #3687 [aliatsis](https://github.com/aliatsis)
+
+4.3.2 / 2015-12-17
+==================
+ * fix(document): .set() into single nested schemas #3686
+ * fix(connection): support 'replSet' as well as 'replset' option #3685
+ * fix(document): bluebird unhandled rejection when validating doc arrays #3681
+ * fix(document): hooks for doc arrays in single nested schemas #3680
+ * fix(document): post hooks for single nested schemas #3679
+ * fix: remove unused npm module #3674 [sybarite](https://github.com/sybarite)
+ * fix(model): don't swallow exceptions in nested doc save callback #3671
+ * docs: update keepAlive info #3667 [ChrisZieba](https://github.com/ChrisZieba)
+ * fix(document): strict 'throw' throws a specific mongoose error #3662
+ * fix: flakey test #3332
+ * fix(query): more robust check for RegExp #2969
+
+4.3.1 / 2015-12-11
+==================
+ * feat(aggregate): `.sample()` helper #3665
+ * fix(query): bitwise query operators with buffers #3663
+ * docs(migration): clarify `new` option and findByIdAndUpdate #3661
+
 4.3.0 / 2015-12-09
 ==================
  * feat(query): support for mongodb 3.2 bitwise query operators #3660

package/README.md

@@ -41,7 +41,7 @@ $ npm install mongoose
 
 ## Stability
 
-The current stable branch is [master](https://github.com/Automattic/mongoose/tree/master). The [3.8.x](https://github.com/Automattic/mongoose/tree/3.8.x) branch contains legacy support for the 3.x release series, which will continue to be actively maintained until September 1, 2015.
+The current stable branch is [master](https://github.com/Automattic/mongoose/tree/master). The [3.8.x](https://github.com/Automattic/mongoose/tree/3.8.x) branch contains legacy support for the 3.x release series, which is no longer under active development as of September 2015. The [3.8.x docs](http://mongoosejs.com/docs/3.8.x/) are still available.
 
 ## Overview
 

package/lib/aggregate.js

@@ -294,6 +294,23 @@ Aggregate.prototype.lookup = function(options) {
   return this.append({ $lookup: options });
 };
 
+/**
+ * Appends new custom $sample operator(s) to this aggregate pipeline.
+ *
+ * ####Examples:
+ *
+ *     aggregate.sample(3); // Add a pipeline that picks 3 random documents
+ *
+ * @see $sample https://docs.mongodb.org/manual/reference/operator/aggregation/sample/#pipe._S_sample
+ * @param {Number} size number of random documents to pick
+ * @return {Aggregate}
+ * @api public
+ */
+
+Aggregate.prototype.sample = function(size) {
+  return this.append({ $sample: { size: size } });
+};
+
 /**
  * Appends a new $sort operator to this aggregate pipeline.
  *

package/lib/browserDocument.js

@@ -28,7 +28,7 @@ function Document(obj, schema, fields, skipId, skipInit) {
     return new Document( obj, schema, fields, skipId, skipInit );
 
 
-  if (utils.isObject(schema) && !(schema instanceof Schema)) {
+  if (utils.isObject(schema) && !schema.instanceOfSchema) {
     schema = new Schema(schema);
   }
 

package/lib/connection.js

@@ -619,13 +619,13 @@ Connection.prototype.model = function(name, schema, collection) {
     schema = false;
   }
 
-  if (utils.isObject(schema) && !(schema instanceof Schema)) {
+  if (utils.isObject(schema) && !schema.instanceOfSchema) {
     schema = new Schema(schema);
   }
 
   if (this.models[name] && !collection) {
     // model exists but we are not subclassing with custom collection
-    if (schema instanceof Schema && schema != this.models[name].schema) {
+    if (schema && schema.instanceOfSchema && schema != this.models[name].schema) {
       throw new MongooseError.OverwriteModelError(name);
     }
     return this.models[name];
@@ -634,7 +634,7 @@ Connection.prototype.model = function(name, schema, collection) {
   var opts = { cache: false, connection: this };
   var model;
 
-  if (schema instanceof Schema) {
+  if (schema && schema.instanceOfSchema) {
     // compile a model
     model = this.base.model(name, schema, collection, opts);
 

package/lib/document.js

@@ -8,6 +8,7 @@ var EventEmitter = require('events').EventEmitter,
     MongooseError = require('./error'),
     MixedSchema = require('./schema/mixed'),
     Schema = require('./schema'),
+    StrictModeError = require('./error/strict'),
     ValidatorError = require('./schematype').ValidatorError,
     utils = require('./utils'),
     clone = utils.clone,
@@ -514,7 +515,7 @@ Document.prototype.set = function(path, val, type, options) {
             this.set(prefix + key,
               path[key].toObject({ virtuals: false }), constructing);
           } else if ('throw' == strict) {
-            throw new Error('Field `' + key + '` is not in schema.');
+            throw new StrictModeError(key);
           }
         } else if (undefined !== path[key]) {
           this.set(prefix + key, path[key], constructing);
@@ -560,7 +561,7 @@ Document.prototype.set = function(path, val, type, options) {
 
     if (!mixed) {
       if ('throw' == strict) {
-        throw new Error("Field `" + path + "` is not in schema.");
+        throw new StrictModeError(path);
       }
       return this;
     }
@@ -742,6 +743,8 @@ Document.prototype.$__set = function(
         obj = obj[parts[i]];
       } else if (obj[parts[i]] && obj[parts[i]] instanceof Embedded) {
         obj = obj[parts[i]];
+      } else if (obj[parts[i]] && obj[parts[i]].$isSingleNested) {
+        obj = obj[parts[i]];
       } else if (obj[parts[i]] && Array.isArray(obj[parts[i]])) {
         obj = obj[parts[i]];
       } else {
@@ -1628,6 +1631,7 @@ Document.prototype.$__getAllSubdocs = function() {
 
     if (val instanceof Embedded) seed.push(val);
     if (val && val.$isSingleNested) {
+      seed = Object.keys(val._doc).reduce(docReducer.bind(val._doc), seed);
       seed.push(val);
     }
     if (val && val.isMongooseDocumentArray) {

package/lib/drivers/node-mongodb-native/connection.js

@@ -188,7 +188,7 @@ NativeConnection.prototype.doOpenSet = function(fn) {
 
   var server = this.options.mongos
     ? new Mongos(servers, this.options.mongos)
-    : new ReplSetServers(servers, this.options.replset);
+    : new ReplSetServers(servers, this.options.replset || this.options.replSet);
   this.db = new Db(this.name, server, this.options.db);
 
   this.db.on('fullsetup', function() {
@@ -232,7 +232,7 @@ NativeConnection.prototype.parseOptions = function(passed, connStrOpts) {
   o.db || (o.db = {});
   o.auth || (o.auth = {});
   o.server || (o.server = {});
-  o.replset || (o.replset = {});
+  o.replset || (o.replset = o.replSet) || (o.replset = {});
   o.server.socketOptions || (o.server.socketOptions = {});
   o.replset.socketOptions || (o.replset.socketOptions = {});
 

package/lib/error/strict.js

@@ -0,0 +1,35 @@
+/*!
+ * Module dependencies.
+ */
+
+var MongooseError = require('../error.js');
+
+/**
+ * Strict mode error constructor
+ *
+ * @param {String} type
+ * @param {String} value
+ * @inherits MongooseError
+ * @api private
+ */
+
+function StrictModeError(path) {
+  MongooseError.call(this, 'Field `' + path + '` is not in schema and strict ' +
+    'mode is set to throw.');
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this);
+  } else {
+    this.stack = new Error().stack;
+  }
+  this.name = 'StrictModeError';
+  this.path = path;
+}
+
+/*!
+ * Inherits from MongooseError.
+ */
+
+StrictModeError.prototype = Object.create(MongooseError.prototype);
+StrictModeError.prototype.constructor = MongooseError;
+
+module.exports = StrictModeError;

package/lib/index.js

@@ -307,7 +307,7 @@ Mongoose.prototype.model = function(name, schema, collection, skipInit) {
     schema = false;
   }
 
-  if (utils.isObject(schema) && !(schema instanceof Schema)) {
+  if (utils.isObject(schema) && !(schema.instanceOfSchema)) {
     schema = new Schema(schema);
   }
 
@@ -342,7 +342,7 @@ Mongoose.prototype.model = function(name, schema, collection, skipInit) {
   // connection.model() may be passing a different schema for
   // an existing model name. in this case don't read from cache.
   if (this.models[name] && false !== options.cache) {
-    if (schema instanceof Schema && schema != this.models[name].schema) {
+    if (schema && schema.instanceOfSchema && schema != this.models[name].schema) {
       throw new mongoose.Error.OverwriteModelError(name);
     }
 

package/lib/model.js

@@ -775,7 +775,7 @@ Model.prototype.model = function model(name) {
  */
 
 Model.discriminator = function discriminator(name, schema) {
-  if (!(schema instanceof Schema)) {
+  if (!(schema && schema.instanceOfSchema)) {
     throw new Error("You must pass a valid discriminator Schema");
   }
 

package/lib/query.js

@@ -13,6 +13,7 @@ var utils = require('./utils');
 var helpers = require('./queryhelpers');
 var Document = require('./document');
 var QueryStream = require('./querystream');
+var StrictModeError = require('./error/strict');
 var cast = require('./cast');
 
 /**
@@ -847,7 +848,7 @@ Query.prototype.read = function read(pref, tags) {
  * - [sort](http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%7B%7Bsort(\)%7D%7D) *
  * - [limit](http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%7B%7Blimit%28%29%7D%7D) *
  * - [skip](http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%7B%7Bskip%28%29%7D%7D) *
- * - [maxscan](http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%24maxScan) *
+ * - [maxscan](https://docs.mongodb.org/v3.2/reference/operator/meta/maxScan/#metaOp._S_maxScan) *
  * - [batchSize](http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%7B%7BbatchSize%28%29%7D%7D) *
  * - [comment](http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%24comment) *
  * - [snapshot](http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%7B%7Bsnapshot%28%29%7D%7D) *
@@ -2342,7 +2343,7 @@ Query.prototype._walkUpdatePath = function _walkUpdatePath(obj, op, pref) {
             this.model.schema.pathType(positionalPath) === 'adhocOrUndefined' &&
             !this.model.schema.hasMixedParent(positionalPath)) {
           if (strict === 'throw') {
-            throw new Error('Field `' + pathToCheck + '` is not in schema.');
+            throw new StrictModeError(pathToCheck);
           } else if (strict) {
             delete obj[key];
             continue;
@@ -2365,8 +2366,8 @@ Query.prototype._walkUpdatePath = function _walkUpdatePath(obj, op, pref) {
                  !/real|nested/.test(this.model.schema.pathType(prefix + key));
 
       if (skip) {
-        if ('throw' == strict) {
-          throw new Error('Field `' + prefix + key + '` is not in schema.');
+        if (strict === 'throw') {
+          throw new StrictModeError(prefix + key);
         } else {
           delete obj[key];
         }

package/lib/schema/buffer.js

@@ -2,6 +2,7 @@
  * Module dependencies.
  */
 
+var handleBitwiseOperator = require('./operators/bitwise');
 var utils = require('../utils');
 
 var MongooseBuffer = require('../types').Buffer;
@@ -140,6 +141,10 @@ function handleSingle(val) {
 
 SchemaBuffer.prototype.$conditionalHandlers =
   utils.options(SchemaType.prototype.$conditionalHandlers, {
+    '$bitsAllClear': handleBitwiseOperator,
+    '$bitsAnyClear': handleBitwiseOperator,
+    '$bitsAllSet': handleBitwiseOperator,
+    '$bitsAnySet': handleBitwiseOperator,
     '$gt' : handleSingle,
     '$gte': handleSingle,
     '$lt' : handleSingle,

package/lib/schema/documentarray.js

@@ -97,7 +97,7 @@ DocumentArray.prototype.doValidate = function(array, fn, scope) {
         continue;
       }
 
-      doc.validate(function(err) {
+      doc.validate({ __noPromise: true }, function(err) {
         if (err) {
           error = err;
         }

package/lib/schema/embedded.js

@@ -14,8 +14,15 @@ module.exports = Embedded;
  */
 
 function Embedded(schema, path, options) {
-  var _embedded = function() {
+  var _embedded = function(value, path, parent) {
+    var _this = this;
     Subdocument.apply(this, arguments);
+    this.$parent = parent;
+    if (parent) {
+      parent.on('save', function() {
+        _this.emit('save', _this);
+      });
+    }
   };
   _embedded.prototype = Object.create(Subdocument.prototype);
   _embedded.prototype.$__setSchema(schema);
@@ -52,8 +59,7 @@ Embedded.prototype.cast = function(val, doc, init) {
   if (val && val.$isSingleNested) {
     return val;
   }
-  var subdoc = new this.caster();
-  subdoc.$parent = doc;
+  var subdoc = new this.caster(undefined, undefined, doc);
   if (init) {
     subdoc.init(val);
   } else {

package/lib/schema/number.js

@@ -2,11 +2,12 @@
  * Module requirements.
  */
 
-var SchemaType = require('../schematype'),
-    CastError = SchemaType.CastError,
-    errorMessages = require('../error').messages,
-    utils = require('../utils'),
-    Document;
+var SchemaType = require('../schematype');
+var CastError = SchemaType.CastError;
+var handleBitwiseOperator = require('./operators/bitwise');
+var errorMessages = require('../error').messages;
+var utils = require('../utils');
+var Document;
 
 /**
  * Number SchemaType constructor.
@@ -239,18 +240,6 @@ function handleArray(val) {
   });
 }
 
-function handleBitwiseOperator(val) {
-  var _this = this;
-  if (Array.isArray(val)) {
-    return val.map(function(v) { return _this.cast(v); });
-  } else if (Buffer.isBuffer(val)) {
-    return val;
-  } else {
-    // Assume trying to cast to number
-    return this.cast(val);
-  }
-}
-
 SchemaNumber.prototype.$conditionalHandlers =
   utils.options(SchemaType.prototype.$conditionalHandlers, {
     '$bitsAllClear': handleBitwiseOperator,

package/lib/schema/operators/bitwise.js

@@ -0,0 +1,37 @@
+/*!
+ * Module requirements.
+ */
+
+var CastError = require('../../error/cast');
+
+/*!
+ * ignore
+ */
+
+function handleBitwiseOperator(val) {
+  var _this = this;
+  if (Array.isArray(val)) {
+    return val.map(function(v) {
+      return _castNumber(_this, v);
+    });
+  } else if (Buffer.isBuffer(val)) {
+    return val;
+  } else {
+    // Assume trying to cast to number
+    return _castNumber(_this, val);
+  }
+}
+
+/*!
+ * ignore
+ */
+
+function _castNumber(_this, num) {
+  var v = Number(num);
+  if (isNaN(v)) {
+    throw new CastError('number', num, _this.path);
+  }
+  return v;
+}
+
+module.exports = handleBitwiseOperator;

package/lib/schema/string.js

@@ -3,11 +3,11 @@
  * Module dependencies.
  */
 
-var SchemaType = require('../schematype'),
-    CastError = SchemaType.CastError,
-    errorMessages = require('../error').messages,
-    utils = require('../utils'),
-    Document;
+var SchemaType = require('../schematype');
+var CastError = SchemaType.CastError;
+var errorMessages = require('../error').messages;
+var utils = require('../utils');
+var Document;
 
 /**
  * String SchemaType constructor.
@@ -480,7 +480,9 @@ SchemaString.prototype.castForQuery = function($conditional, val) {
     return handler.call(this, val);
   } else {
     val = $conditional;
-    if (val instanceof RegExp) return val;
+    if (Object.prototype.toString.call(val) === '[object RegExp]') {
+      return val;
+    }
     return this.cast(val);
   }
 };

package/lib/schema.js

@@ -9,7 +9,6 @@ var utils = require('./utils');
 var MongooseTypes;
 var Kareem = require('kareem');
 var async = require('async');
-var PromiseProvider = require('./promise_provider');
 
 var IS_QUERY_HOOK = {
   count: true,
@@ -186,6 +185,7 @@ function idGetter() {
  */
 Schema.prototype = Object.create( EventEmitter.prototype );
 Schema.prototype.constructor = Schema;
+Schema.prototype.instanceOfSchema = true;
 
 /**
  * Default middleware attached to a schema. Cannot be changed.
@@ -243,8 +243,7 @@ Object.defineProperty(Schema.prototype, '_defaultMiddleware', {
     hook: 'save',
     isAsync: true,
     fn: function(next, done) {
-      var Promise = PromiseProvider.get(),
-          subdocs = this.$__getAllSubdocs();
+      var subdocs = this.$__getAllSubdocs();
 
       if (!subdocs.length || this.$__preSavingFromParent) {
         done();
@@ -252,26 +251,22 @@ Object.defineProperty(Schema.prototype, '_defaultMiddleware', {
         return;
       }
 
-      new Promise.ES6(function(resolve, reject) {
-        async.each(subdocs, function(subdoc, cb) {
-          subdoc.$__preSavingFromParent = true;
-          subdoc.save(function(err) {
-            cb(err);
-          });
-        }, function(error) {
-          for (var i = 0; i < subdocs.length; ++i) {
-            delete subdocs[i].$__preSavingFromParent;
-          }
-          if (error) {
-            reject(error);
-            return;
-          }
-          resolve();
+      async.each(subdocs, function(subdoc, cb) {
+        subdoc.$__preSavingFromParent = true;
+        subdoc.save(function(err) {
+          cb(err);
         });
-      }).then(function() {
+      }, function(error) {
+        for (var i = 0; i < subdocs.length; ++i) {
+          delete subdocs[i].$__preSavingFromParent;
+        }
+        if (error) {
+          done(error);
+          return;
+        }
         next();
         done();
-      }, done);
+      });
     }
   }]
 });
@@ -460,6 +455,9 @@ Schema.prototype.path = function(path, obj) {
   if (obj == undefined) {
     if (this.paths[path]) return this.paths[path];
     if (this.subpaths[path]) return this.subpaths[path];
+    if (this.singleNestedPaths[path]) {
+      return this.singleNestedPaths[path];
+    }
 
     // subpaths?
     return /\.\d+\.?.*$/.test(path)
@@ -541,7 +539,7 @@ Schema.interpretAsType = function(path, obj, options) {
       ? obj.cast
       : type[0];
 
-    if (cast instanceof Schema) {
+    if (cast && cast.instanceOfSchema) {
       return new MongooseTypes.DocumentArray(path, cast, obj);
     }
 
@@ -565,7 +563,7 @@ Schema.interpretAsType = function(path, obj, options) {
     return new MongooseTypes.Array(path, cast || MongooseTypes.Mixed, obj);
   }
 
-  if (type instanceof Schema) {
+  if (type && type.instanceOfSchema) {
     return new MongooseTypes.Embedded(type, path, obj);
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "4.3.0",
+  "version": "4.3.4",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -23,7 +23,7 @@
     "bson": "0.4.19",
     "hooks-fixed": "1.1.0",
     "kareem": "1.0.1",
-    "mongodb": "2.1.0",
+    "mongodb": "2.1.2",
     "mpath": "0.1.1",
     "mpromise": "0.5.4",
     "mquery": "1.6.3",

package/contRun.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-make test
-
-ret=$?
-
-while [ $ret == 0 ]; do
-  make test
-  ret=$?
-done