mongoose 3.6.16 → 3.6.20

package/History.md

@@ -1,4 +1,41 @@
 
+3.6.20 (stable) / 2013-09-23
+===================
+
+ * fixed; repopulating modified populated paths #1697
+ * fixed; doc.equals w/ _id false #1687
+ * fixed; strict mode warning #1686
+ * docs; near/nearSphere
+
+3.6.19 (stable) / 2013-09-04
+==================
+
+  * fixed; population field selection w/ strings #1669
+  * docs; Date method caveats #1598
+
+3.6.18 (stable) / 2013-08-22
+===================
+
+  * updated; warn when using an unstable version of mongoose
+  * updated; mocha to 1.12.0
+  * updated; mongodb driver to 1.3.19 (fix error swallowing behavior)
+  * fixed; setters not firing on null values #1445 [ebensing](https://github.com/ebensing)
+  * fixed; properly exclude subdocument fields #1280 [ebensing](https://github.com/ebensing)
+  * fixed; cast error in findAndModify #1643 [aheuermann](https://github.com/aheuermann)
+  * website; update guide
+  * website; added documentation for safe:false and versioning interaction
+  * docs; mention that middleware dont run on Models
+  * docs; fix indexes link
+  * make; suppress warning msg in test
+  * tests; moar
+
+3.6.17 / 2013-08-13
+===================
+
+  * updated; driver to 1.3.18 (fixes memory leak)
+  * fixed; casting ref docs on creation #1606
+  * docs; query options
+
 3.6.16 / 2013-08-08
 ===================
 
@@ -323,6 +360,20 @@
   * updated; mpath to 0.1.1
   * updated; docs
 
+3.5.16 / 2013-08-13
+===================
+
+  * updated; driver to 1.3.18
+
+3.5.15 / 2013-07-26
+==================
+
+  * updated; sliced to 0.0.5
+  * updated; driver to 1.3.12
+  * fixed; regression in Query#count() due to driver change
+  * tests; fixed timeouts
+  * tests; handle differing test uris
+
 3.5.14 / 2013-05-15
 ===================
 

package/README.md

@@ -14,7 +14,7 @@ Mongoose is a [MongoDB](http://www.mongodb.org/) object modeling tool designed t
   - [Stack Overflow](http://stackoverflow.com/questions/tagged/mongoose)
   - [bug reports](https://github.com/learnboost/mongoose/issues/)
   - [help forum](http://groups.google.com/group/mongoose-orm)
-  - [10gen support](http://www.mongodb.org/display/DOCS/Technical+Support)
+  - [MongoDB support](http://www.mongodb.org/display/DOCS/Technical+Support)
   - (irc) #mongoosejs on freenode
 
 ## Installation

package/lib/document.js

@@ -163,6 +163,7 @@ Document.prototype.$__buildDoc = function (obj, fields, skipId) {
       , path = p.split('.')
       , len = path.length
       , last = len-1
+      , curPath = ''
       , doc_ = doc
       , i = 0
 
@@ -170,6 +171,13 @@ Document.prototype.$__buildDoc = function (obj, fields, skipId) {
       var piece = path[i]
         , def
 
+      // support excluding intermediary levels
+      if (exclude) {
+        curPath += piece;
+        if (curPath in fields) break;
+        curPath += '.';
+      }
+
       if (i === last) {
         if (fields) {
           if (exclude) {
@@ -429,15 +437,18 @@ Document.prototype.set = function (path, val, type, options) {
         , pathtype
         , key
 
+
       while (i--) {
         key = keys[i];
         pathtype = this.schema.pathType(prefix + key);
         if (null != path[key]
-            // need to know if plain object - no Buffer, ObjectId, etc
+            // need to know if plain object - no Buffer, ObjectId, ref, etc
             && utils.isObject(path[key])
             && (!path[key].constructor || 'Object' == path[key].constructor.name)
             && 'virtual' != pathtype
-            && !(this.$__path(prefix + key) instanceof MixedSchema)) {
+            && !(this.$__path(prefix + key) instanceof MixedSchema)
+            && !(this.schema.paths[key] && this.schema.paths[key].options.ref)
+          ) {
           this.set(path[key], prefix + key, constructing);
         } else if (strict) {
           if ('real' === pathtype || 'virtual' === pathtype) {
@@ -524,7 +535,7 @@ Document.prototype.set = function (path, val, type, options) {
     ? undefined
     : this.get(path);
 
-  if (!schema || null === val || undefined === val) {
+  if (!schema || undefined === val) {
     this.$__set(pathToMark, path, constructing, parts, schema, val, priorVal);
     return this;
   }
@@ -1580,7 +1591,7 @@ Document.prototype.toString = Document.prototype.inspect;
 Document.prototype.equals = function (doc) {
   var tid = this.get('_id');
   var docid = doc.get('_id');
-  return tid.equals
+  return tid && tid.equals
     ? tid.equals(docid)
     : tid === docid;
 }

package/lib/index.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /*!
  * Module dependencies.
@@ -16,6 +17,30 @@ var Schema = require('./schema')
   , utils = require('./utils')
   , format = utils.toCollectionName
   , mongodb = require('mongodb')
+  , pkg = require('../package.json')
+
+/*!
+ * Warn users if they are running an unstable release.
+ *
+ * Disable the warning by setting the MONGOOSE_DISABLE_STABILITY_WARNING
+ * environment variable.
+ */
+
+if (pkg.publishConfig && 'unstable' == pkg.publishConfig.tag) {
+  if (!process.env.MONGOOSE_DISABLE_STABILITY_WARNING) {
+    console.log('\u001b[33m');
+    console.log('##############################################################');
+    console.log('#');
+    console.log('#   !!! MONGOOSE WARNING !!!');
+    console.log('#');
+    console.log('#   This is an UNSTABLE release of Mongoose.');
+    console.log('#   Unstable releases are available for preview/testing only.');
+    console.log('#   DO NOT run this in production.');
+    console.log('#');
+    console.log('##############################################################');
+    console.log('\u001b[0m');
+  }
+}
 
 /**
  * Mongoose constructor.
@@ -444,7 +469,7 @@ Mongoose.prototype.Connection = Connection;
  * @api public
  */
 
-Mongoose.prototype.version = require(__dirname + '/../package.json').version;
+Mongoose.prototype.version = pkg.version;
 
 /**
  * The Mongoose constructor

package/lib/model.js

@@ -1812,6 +1812,8 @@ function populateDocs (docs, options, cb) {
     }
 
     if (ret) {
+      ret = convertTo_id(ret);
+
       // previously we always assigned this even if the document had no _id
       options._docs[id] = Array.isArray(ret)
         ? ret.slice()
@@ -1855,7 +1857,7 @@ function populateDocs (docs, options, cb) {
     // for document matching during assignment. we'll delete the
     // _id back off before returning the result.
     if ('string' == typeof select) {
-      select = null;
+      select = select.replace(/\s?-_id\s?/g, ' ');
     } else {
       // preserve original select conditions by copying
       select = utils.object.shallowCopy(select);
@@ -1905,6 +1907,28 @@ function populateDocs (docs, options, cb) {
   });
 }
 
+/*!
+ * Retrieve the _id of `val` if a Document or Array of Documents.
+ *
+ * @param {Array|Document|Any} val
+ * @return {Array|Document|Any}
+ */
+
+function convertTo_id (val) {
+  if (val instanceof Model) return val._id;
+
+  if (Array.isArray(val)) {
+    for (var i = 0; i < val.length; ++i) {
+      if (val[i] instanceof Model) {
+        val[i] = val[i]._id;
+      }
+    }
+    return val;
+  }
+
+  return val;
+}
+
 /*!
  * Assigns documents returned from a population query back
  * to the original document path.

package/lib/query.js

@@ -51,7 +51,8 @@ function Query (criteria, options) {
  * - [hint](http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%24hint) *
  * - [slaveOk](http://docs.mongodb.org/manual/applications/replication/#read-preference) *
  * - [lean](./api.html#query_Query-lean) *
- * - [safe](http://www.mongodb.org/display/DOCS/getLastError+Command)
+ *
+ * All other [options](http://mongodb.github.io/node-mongodb-native/api-generated/cursor.html#constructor) specified will be passed unaltered to the driver.
  *
  * _* denotes a query helper method is also available_
  *
@@ -864,8 +865,13 @@ Query.prototype.and = function and (array) {
 /**
  * Specifies a `$near` condition
  *
+ *     query.near('loc', [10, 20])
+ *     query.near([10, 20])
+ *
+ * _NOTE: does not currently support GeoJSON._
+ *
  * @param {String} path
- * @param {Number} val
+ * @param {Array} val
  * @return {Query} this
  * @see http://www.mongodb.org/display/DOCS/Geospatial+Indexing
  * @see $near http://docs.mongodb.org/manual/reference/operator/near/
@@ -890,8 +896,13 @@ Query.prototype.near = function (path, val) {
 /**
  * Specifies a `$nearSphere` condition.
  *
+ *     query.nearSphere('loc', [10, 20])
+ *     query.nearSphere([10, 20])
+ *
+ * _NOTE: does not currently support GeoJSON._
+ *
  * @param {String} path
- * @param {Object} val
+ * @param {Array} val
  * @return {Query} this
  * @see http://www.mongodb.org/display/DOCS/Geospatial+Indexing
  * @see $nearSphere http://docs.mongodb.org/manual/reference/operator/nearSphere/
@@ -2145,7 +2156,7 @@ Query.prototype._castUpdateVal = function _castUpdateVal (schema, val, op, $cond
   }
 
   if (schema.caster && op in castOps &&
-    ('Object' === val.constructor.name || Array.isArray(val))) {
+    (utils.isObject(val) || Array.isArray(val))) {
     // Cast values for ops that add data to MongoDB.
     // Ensures embedded documents get ObjectIds etc.
     var tmp = schema.cast(val);

package/lib/schema/embedded.js

@@ -0,0 +1,41 @@
+
+/*!
+ * Module dependencies.
+ */
+
+var SchemaType = require('../schematype')
+  , CastError = SchemaType.CastError
+  , errorMessages = require('../error').messages
+  , utils = require('../utils')
+  , Document
+
+/**
+ * EmbeddedDocument SchemaType constructor.
+ *
+ * @param {String} key
+ * @param {Object} options
+ * @inherits SchemaType
+ * @api private
+ */
+
+function SchemaEmbedded (key, options, EmbeddedDoc, parentArray) {
+  SchemaType.call(this, key, options, 'EmbeddedDocument');
+  this.EmbeddedDoc = EmbeddedDoc;
+  this.parentArray = parentArray;
+};
+
+/*!
+ * Inherits from SchemaType.
+ */
+
+SchemaEmbedded.prototype.__proto__ = SchemaType.prototype;
+
+SchemaEmbedded.prototype.cast = function (value, doc, init) {
+  return new this.EmbeddedDoc(value, this.parentArray);
+}
+
+/*!
+ * Module exports.
+ */
+
+module.exports = SchemaEmbedded;

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "mongoose"
   , "description": "Elegant MongoDB object modeling for Node.js"
-  , "version": "3.6.16"
+  , "version": "3.6.20"
   , "author": "Guillermo Rauch <guillermo@learnboost.com>"
   , "keywords": ["mongodb", "document", "model", "schema", "database", "odm", "data", "datastore", "query", "nosql", "orm", "db"]
   , "dependencies": {
         "hooks": "0.2.1"
-      , "mongodb": "1.3.17"
+      , "mongodb": "1.3.19"
       , "ms": "0.1.0"
       , "sliced": "0.0.5"
       , "muri": "0.3.1"
@@ -15,7 +15,7 @@
       , "regexp-clone": "0.0.1"
     }
   , "devDependencies": {
-        "mocha": "1.8.1"
+        "mocha": "1.12.0"
       , "node-static": "0.5.9"
       , "dox": "0.3.1"
       , "jade": "0.26.3"