Merge remote-tracking branch 'upstream/master'

index.js

@@ -160,6 +160,10 @@ Collection.prototype.remove = function() {
 	}
 };
 
+Collection.prototype.getIndexes = function() {
+	this._apply(DRIVER_COLLECTION_PROTO.indexes, arguments);
+};
+
 forEachMethod(DRIVER_COLLECTION_PROTO, Collection.prototype, function(methodName, fn) {
 	Collection.prototype[methodName] = function() { // we just proxy the rest of the methods directly
 		this._apply(fn, ensureCallback(arguments));
@@ -195,7 +199,7 @@ var toConnectionString = function(conf) { // backwards compat config map (use a
 
 var parseConfig = function(cs) {
 	if (typeof cs === 'object' && cs) return toConnectionString(cs);
-
+	if (typeof cs !== 'string') throw new Error('connection string required'); // to avoid undef errors on bad conf
 	cs = cs.replace(/^\//, '');
 
 	if (cs.indexOf('/') < 0) return parseConfig('127.0.0.1/'+cs);

package.json

@@ -6,7 +6,7 @@
     "db",
     "mongodb"
   ],
-  "version": "0.7.5",
+  "version": "0.7.6",
   "repository": "git://github.com/gett/mongojs.git",
   "author": "Ge.tt <[email protected]>",
   "contributors": [

tests/insert.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var mongojs = require('mongojs');
+var mongojs = require('../index');
 var db = mongojs('test', ['a']);
 
 module.exports = function(docs, test) {

tests/test-simple.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var mongojs = require('mongojs');
+var mongojs = require('../index');
 var db = mongojs('test', ['a','b']);
 
 db.a.find(function(err, docs) {