mongoose 3.6.19 → 3.6.20

package/History.md

@@ -1,5 +1,13 @@
 
-3.6.19 / 2013-09-04
+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

package/lib/document.js

@@ -1591,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,7 +17,7 @@ var Schema = require('./schema')
   , utils = require('./utils')
   , format = utils.toCollectionName
   , mongodb = require('mongodb')
-  , package = require(__dirname + '/../package.json')
+  , pkg = require('../package.json')
 
 /*!
  * Warn users if they are running an unstable release.
@@ -25,9 +26,9 @@ var Schema = require('./schema')
  * environment variable.
  */
 
-if (package.publishConfig && 'unstable' == package.publishConfig.tag) {
+if (pkg.publishConfig && 'unstable' == pkg.publishConfig.tag) {
   if (!process.env.MONGOOSE_DISABLE_STABILITY_WARNING) {
-    console.log('\033[33m');
+    console.log('\u001b[33m');
     console.log('##############################################################');
     console.log('#');
     console.log('#   !!! MONGOOSE WARNING !!!');
@@ -37,7 +38,7 @@ if (package.publishConfig && 'unstable' == package.publishConfig.tag) {
     console.log('#   DO NOT run this in production.');
     console.log('#');
     console.log('##############################################################');
-    console.log('\033[0m');
+    console.log('\u001b[0m');
   }
 }
 
@@ -468,7 +469,7 @@ Mongoose.prototype.Connection = Connection;
  * @api public
  */
 
-Mongoose.prototype.version = package.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()
@@ -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

@@ -865,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/
@@ -891,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/

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,7 +1,7 @@
 {
     "name": "mongoose"
   , "description": "Elegant MongoDB object modeling for Node.js"
-  , "version": "3.6.19"
+  , "version": "3.6.20"
   , "author": "Guillermo Rauch <guillermo@learnboost.com>"
   , "keywords": ["mongodb", "document", "model", "schema", "database", "odm", "data", "datastore", "query", "nosql", "orm", "db"]
   , "dependencies": {

package/747-todo

@@ -1,15 +0,0 @@
-
-X merge tests
-X update tests with new error messages
-X add inline documentation
-X add website documentation
-X add website documentation around custom validators using new {TEMPLATING} helpers
-
--- docs --
-
-- calling doc#invalidate()
-  - no longer uses the error message argument for the ValidationError "type" property
-  - the error message argument will be used as is for the error message. {TEMPLATING} is supported
-  - for custom validators, the error `type` property will always be set to "user defined"
-
-Any other changes??

package/createtest

@@ -1,20 +0,0 @@
-#!/bin/bash
-# copy our goosetest.js to another filename passed on the cmd line
-# and replace all occurances of {NAME} with the filename too.
-test $# -ne 1 && echo "usage: goosetest scriptname" && exit 0;
-
-# EDITOR must be set
-test -e $EDITOR && echo "Please set your EDITOR environment variable" && exit 0;
-
-# get the directory of ourself
-DIR="`dirname \"$0\"`"
-
-# does the file they are about to create exist?
-if test -e $1.js; then
-  # do not overwrite. open for editing.
-  $EDITOR $1.js
-else
-  # create
-  cat "$DIR/../goosetest.js" | sed "s/{NAME}/$1/g" >> $1.js
-  $EDITOR $1.js
-fi