Merge pull request #25 from nodejitsu/fix-databases-superuser

Fix databases for superusers
nodejitsu · Jul 29, 2013 · 93c2cc5 · 93c2cc5
2 parents fcbc2a8 + 01e4ea1
commit 93c2cc5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/node.js/lib/client/databases.js b/node.js/lib/client/databases.js
@@ -8,6 +8,7 @@
  */
 
 var util = require('util'),
+    defaultUser = require('./helpers').defaultUser,
     Client = require('./client').Client;
 
 //
@@ -31,7 +32,8 @@ util.inherits(Databases, Client);
 // Provisions a database for the user
 //
 Databases.prototype.create = function (databaseType, databaseName, callback) {
-  var argv = ['databases', this.options.get('username'), databaseName];
+  databaseName = defaultUser.call(this, databaseName);
+  var argv = [ 'databases' ].concat(databaseName.split('/'));
 
   this.request({ method: 'POST', uri: argv, body: { type: databaseType }}, function (err, result, res) {
     if (err) return callback(err);
@@ -47,7 +49,8 @@ Databases.prototype.create = function (databaseType, databaseName, callback) {
 // Gets the metadata for the specified database
 //
 Databases.prototype.get = function (databaseName, callback) {
-  var argv = ['databases', this.options.get('username'), databaseName];
+  databaseName = defaultUser.call(this, databaseName);
+  var argv = [ 'databases' ].concat(databaseName.split('/'));
 
   this.request({ uri: argv }, function (err, result) {
     if (err) return callback(err);
@@ -82,7 +85,8 @@ Databases.prototype.list = function (username, callback) {
 // Deprovisions specified database
 //
 Databases.prototype.destroy = function (databaseName, callback) {
-  var argv = ['databases', this.options.get('username'), databaseName];
+  databaseName = defaultUser.call(this, databaseName);
+  var argv = [ 'databases' ].concat(databaseName.split('/'));
 
   this.request({ method: 'DELETE', uri: argv }, callback);
 };
diff --git a/node.js/lib/client/helpers.js b/node.js/lib/client/helpers.js
@@ -2,17 +2,17 @@
 
 //
 // ### function defaultUser (appName)
-// #### @appName {String} App name
+// #### @data {String} App name, user/app, or user/database.
 //
 // A helper to prepend a default username.
 // needs 'this' to be able to options.get('username').
 //
-exports.defaultUser = function (appName) {
+exports.defaultUser = function (data) {
-  if (appName.search('/') === -1) {
+  if (!~data.indexOf('/')) {
-    appName = this.options.get('username') + '/' + appName;
+    data = this.options.get('username') + '/' + data;
   }
 
-  return appName;
+  return data;
 };
 
 //