mongoose 4.3.3 → 4.3.4

package/History.md

@@ -1,3 +1,13 @@
+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)

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/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/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/schema/number.js

@@ -240,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.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,7 +243,6 @@ Object.defineProperty(Schema.prototype, '_defaultMiddleware', {
     hook: 'save',
     isAsync: true,
     fn: function(next, done) {
-      var Promise = PromiseProvider.get();
       var subdocs = this.$__getAllSubdocs();
 
       if (!subdocs.length || this.$__preSavingFromParent) {
@@ -540,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);
     }
 
@@ -564,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.3",
+  "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",