[mongolab][api] use the cloud from the config, required to create a database

cronopio · cronopio · commit f8090eac9f84 · 2012-08-31T18:11:52.000-05:00
diff --git a/lib/pkgcloud/mongolab/database/client/databases.js b/lib/pkgcloud/mongolab/database/client/databases.js
@@ -38,22 +38,30 @@ exports.createDatabase = function createDatabase (options, callback) {
     options['plan'] = 'free';
   }
 
+  // We have to setup the correct prefix for database name
+  // for the moment we use the 'owner' field because we expect the correct prefix there.
+  var databaseName = [options['owner'], options['name']].join('_');
+
   // Setup the account name according mongolab API.
-  var account = [this.config.username, options['owner']].join('_');
+  // @todo We need a helper function for add the prefix if its necesary
+  //var account = [this.config.username, options['owner']].join('_');
+  var account = options['owner'] // at the moment we need provide the username with the prefix (partner name)
 
   var createOptions = {
     method: 'POST',
     path: 'accounts/' + account + '/databases',
     body: {
-      name: options['name'],
+      name: databaseName,
       plan: options['plan'],
-      username: options['owner']
+      username: options['owner'],
+      // In future we will have to change this for support multiples clouds and user-selected cloud.
+      cloud: this.config.cloud
     }
   }
 
   this.request(createOptions, callback, function (body, response) {
-      // Work in progress here.
-      // We need create the owner account before create any database.
+    // @todo: We need to parse the response instantiating a Database class, and pass it to callback.
+    return callback(null, body);
   });
 };
 
diff --git a/test/mongolab/databases/databases-test.js b/test/mongolab/databases/databases-test.js
@@ -55,15 +55,15 @@ vows.describe('pkgcloud/mongolab/databases').addBatch({
       }
     }
   }
-})/**.addBatch({
+}).addBatch({
   "The pkgcloud MongoLab client": {
-    "the create() method": {
+    "the createDatabase() method": {
       "with correct options": {
         topic: function () {
           client.createDatabase({
             plan:'free',
             name:'testDatabase',
-            owner:'daniel'
+            owner: testContext.account.username
           }, this.callback)
         },
         "should respond correctly": function (err, database) {
@@ -97,7 +97,7 @@ vows.describe('pkgcloud/mongolab/databases').addBatch({
       }
     }
   }
-})**/.addBatch({
+}).addBatch({
   "The pkgcloud MongoLab client": {
     "the deleteAccount() method": {
       "with correct options": {

Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,15 @@ vows.describe('pkgcloud/mongolab/databases').addBatch({`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
`58`		`-})/**.addBatch({`
	`58`	`+}).addBatch({`
`59`	`59`	`"The pkgcloud MongoLab client": {`
`60`		`- "the create() method": {`
	`60`	`+ "the createDatabase() method": {`
`61`	`61`	`"with correct options": {`
`62`	`62`	`topic: function () {`
`63`	`63`	`client.createDatabase({`
`64`	`64`	`plan:'free',`
`65`	`65`	`name:'testDatabase',`
`66`		`- owner:'daniel'`
	`66`	`+ owner: testContext.account.username`
`67`	`67`	`}, this.callback)`
`68`	`68`	`},`
`69`	`69`	`"should respond correctly": function (err, database) {`
`@@ -97,7 +97,7 @@ vows.describe('pkgcloud/mongolab/databases').addBatch({`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
`100`		`-})**/.addBatch({`
	`100`	`+}).addBatch({`
`101`	`101`	`"The pkgcloud MongoLab client": {`
`102`	`102`	`"the deleteAccount() method": {`
`103`	`103`	`"with correct options": {`