Merge pull request #73 from Ryanc1256/master

Updated the replace method for the sanitize method.

lib/database/index.js

@@ -342,7 +342,7 @@ Database.prototype.create = function create(collectionName, data, cb) {
       primary = self.schema._primary[name];
 
 
-  name = typeof name == "string" ? name.replace(/\s/gi, "_") : name;
+  name = Utils.replaceSpaces(name);
 
   async.auto({
 

lib/database/schema.js

@@ -143,7 +143,7 @@ Schema.prototype.indexKey = function(collectionName, index) {
 
 Schema.prototype.recordKey = function(collectionName, index, key) {
   var name = collectionName.toLowerCase();
-  var keyName = typeof key == "string" ? key.replace(/\s/gi, "_") : key;
+  var keyName = Utils.replaceSpaces( key );
   return 'waterline:' + name + ':' + index + ':' + keyName;
 };
 

lib/utils.js

@@ -56,6 +56,16 @@ utils.sanitize = function sanitize(str) {
   return typeof str === 'string' ? str.replace(/\s+/g, '_') : str;
 };
 
+/**
+ * Sanitize a key by removing spaces or reserved charaters
+ *
+ * @param {String} str
+ */
+
+utils.replaceSpaces  = function replaceSpaces(str) {
+  return typeof str === 'string' ? str.replace(/\s/g, '_') : str;
+};
+
 /**
 * A simple object key count method
 * 

test/utils/utils.js

@@ -0,0 +1,22 @@
+/**
+ * Test dependencies
+ */
+
+var assert = require('assert'),
+    Adapter = require('../../'),
+    Utils = require('../../lib/utils'),
+    Support = require('../support')(Adapter),
+    Errors = require('waterline-errors').adapter;
+
+/**
+ * Raw adapter specific tests
+ */
+
+describe('Utility `.replaceSpaces()`', function() {
+  describe('replace spaces', function() {
+      it('should replace spaces with a _ ', function(done) {
+        assert.equal( Utils.replaceSpaces("My string with spaces"), "My_string_with_spaces" );
+        done();
+      });
+  });
+});