mongodb 2.2.29 → 2.2.33

package/lib/url_parser.js

@@ -2,9 +2,10 @@
 
 var ReadPreference = require('./read_preference'),
   parser = require('url'),
-  f = require('util').format;
+  f = require('util').format,
+  assign = require('./utils').assign;
 
-module.exports = function(url) {
+module.exports = function(url, options) {
   // Variables
   var connection_part = '';
   var auth_part = '';
@@ -144,6 +145,8 @@ module.exports = function(url) {
 
   // Add auth to final object if we have 2 elements
   if(auth.length == 2) object.auth = {user: auth[0], password: auth[1]};
+  // if user provided auth options, use that
+  if(options && options.auth != null) object.auth = options.auth;
 
   // Variables used for temporary storage
   var hostPart;
@@ -190,7 +193,7 @@ module.exports = function(url) {
         if(_host.indexOf("?") != -1) _host = _host.split(/\?/)[0];
       }
 
-      // No entry returned for duplicate servr
+      // No entry returned for duplicate server
       if(deduplicatedServers[_host + "_" + _port]) return null;
       deduplicatedServers[_host + "_" + _port] = 1;
 
@@ -398,8 +401,12 @@ module.exports = function(url) {
     dbOptions.readPreference = 'primary';
   }
 
+  // make sure that user-provided options are applied with priority
+  dbOptions = assign(dbOptions, options);
+
   // Add servers to result
   object.servers = servers;
+
   // Returned parsed object
   return object;
 }

package/lib/utils.js

@@ -107,7 +107,7 @@ var checkCollectionName = function checkCollectionName (collectionName) {
     throw new MongoError("collection names must not start or end with '.'");
   }
 
-  // Validate that we are not passing 0x00 in the colletion name
+  // Validate that we are not passing 0x00 in the collection name
   if(!!~collectionName.indexOf("\x00")) {
     throw new MongoError("collection names cannot contain a null character");
   }
@@ -295,7 +295,7 @@ var filterOptions = function(options, names) {
   return filterOptions;
 }
 
-// Object.assign method or polyfille
+// Object.assign method or polyfill
 var assign = Object.assign ? Object.assign : function assign(target) {
   if (target === undefined || target === null) {
     throw new TypeError('Cannot convert first argument to object');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.29",
+  "version": "2.2.33",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "2.1.13",
+    "mongodb-core": "2.1.17",
     "readable-stream": "2.2.7"
   },
   "devDependencies": {
@@ -50,7 +50,7 @@
     "url": "https://github.com/mongodb/node-mongodb-native/issues"
   },
   "scripts": {
-    "test": "node test/runner.js -t functional -l",
+    "test": "node test/runner.js -t functional",
     "coverage": "node_modules/.bin/nyc node test/runner.js -t functional && node_modules/.bin/nyc report --reporter=text-lcov | node_modules/.bin/coveralls",
     "lint": "eslint lib"
   },