nodejitsu-api - npm Package Compare versions

Comparing version 0.2.3 to 0.2.4-1

lib/client/apps.js

@@ -9,3 +9,4 @@ /*
 var util = require('util'),
-    Client = require('./client').Client;
+    Client = require('./client').Client,
+    defaultUser = require('./helpers').defaultUser;
 
@@ -26,8 +27,13 @@ //
 //
-// ### function list (callback)
+// ### function list (username, callback)
 // #### @callback {function} Continuation to pass control to when complete
 // Lists all applications for the authenticated user
 //
-Apps.prototype.list = function (callback) {
-  var username = this.options.get('username');
+Apps.prototype.list = function (username, callback) {
+
+  if (arguments.length == 1) {
+    callback = username;
+    username = this.options.get('username');
+  }
+
   this.request('GET', ['apps', username], callback, function (res, result) {
@@ -45,4 +51,5 @@ callback(null, result.apps || res.statusCode);
 Apps.prototype.create = function (app, callback) {
-  var username = this.options.get('username');
-  this.request('POST', ['apps', username, app.name], app, callback, function (res, result) {
+  var appName = defaultUser.call(this, app.name);
+
+  this.request('POST', ['apps', appName], app, callback, function (res, result) {
     callback(null, result || res.statusCode);
@@ -59,4 +66,6 @@ })
 Apps.prototype.view = function (appName, callback) {
-  var username = this.options.get('username');
-  this.request('GET', ['apps', username, appName], callback, function (res, result) {
+  var appName = defaultUser.call(this, appName),
+      argv = ['apps'].concat(appName.split('/'));
+
+  this.request('GET', argv, callback, function (res, result) {
     callback(null, result.app || res.statusCode);
@@ -74,4 +83,6 @@ })
 Apps.prototype.update = function (appName, attrs, callback) {
-  var username = this.options.get('username');
-  this.request('PUT', ['apps', username, appName], attrs, callback, function (res, result) {
+  var appName = defaultUser.call(this, appName);
+      argv = ['apps'].concat(appName.split('/'));
+
+  this.request('PUT', argv, attrs, callback, function (res, result) {
     callback(null, result || res.statusCode);
@@ -88,4 +99,6 @@ });
 Apps.prototype.destroy = function (appName, callback) {
-  var username = this.options.get('username');
-  this.request('DELETE', ['apps', username, appName], callback, function (res, result) {
+  var appName = defaultUser.call(this, appName),
+      argv = ['apps'].concat(appName.split('/'));
+
+  this.request('DELETE', argv, callback, function (res, result) {
     callback(null, result || res.statusCode);
@@ -102,4 +115,6 @@ })
 Apps.prototype.start = function (appName, callback) {
-  var username = this.options.get('username');
-  this.request('POST', ['apps', username, appName, 'start'], callback, function (res, result) {
+  var appName = defaultUser.call(this, appName),
+      argv = ['apps'].concat(appName.split('/')).concat('start');
+
+  this.request('POST', argv, callback, function (res, result) {
     callback(null, result || res.statusCode);
@@ -116,4 +131,6 @@ });
 Apps.prototype.restart = function (appName, callback) {
-  var username = this.options.get('username');
-  this.request('POST', ['apps', username, appName, 'restart'], callback, function (res, result) {
+  var appName = defaultUser.call(this, appName),
+      argv = ['apps'].concat(appName.split('/')).concat('restart');
+
+  this.request('POST', argv, callback, function (res, result) {
     callback(null, result || res.statusCode);
@@ -130,4 +147,6 @@ });
 Apps.prototype.stop = function (appName, callback) {
-  var username = this.options.get('username');
-  this.request('POST', ['apps', username, appName, 'stop'], callback, function (res, result) {
+  var appName = defaultUser.call(this, appName),
+      argv = ['apps'].concat(appName.split('/')).concat('stop');
+
+  this.request('POST', argv, callback, function (res, result) {
     callback(null, result || res.statusCode);
@@ -145,6 +164,8 @@ });
 Apps.prototype.available = function (app, callback) {
-  var username = this.options.get('username');
-  this.request('POST', ['apps', username, app.name, 'available'], app, callback, function (res, result) {
+  var appName = defaultUser.call(this, app.name),
+      argv = ['apps'].concat(appName.split('/')).concat('available');
+
+  this.request('POST', argv, app, callback, function (res, result) {
     callback(null, result || res.statusCode);
   });
 };

lib/client/logs.js

@@ -9,3 +9,4 @@ /*
 var util = require('util'),
-    Client = require('./client').Client;
+    Client = require('./client').Client,
+    defaultUser = require('./helpers').defaultUser;
 
@@ -33,10 +34,11 @@ //
 Logs.prototype.byApp = function (appName, amount, callback) {
-  var username = this.options.get('username');
-  var options = {
-    from: 'NOW-1DAY',
-    until: 'NOW',
-    rows: amount
-  };
+  var appName = defaultUser.call(this, appName),
+      argv = ['logs'].concat(appName.split('/')),
+      options = {
+        from: 'NOW-1DAY',
+        until: 'NOW',
+        rows: amount
+      };
 
-  this.request('POST', ['logs', username, appName], options, callback, function (res, result) {
+  this.request('POST', argv, options, callback, function (res, result) {
     callback(null, result);
@@ -48,2 +50,3 @@ });
 // ### function byUser (amount, callback)
+// #### @username {string} Name of user whose logs we wish to retrieve
 // #### @amount {number} the number of lines to retrieve
@@ -53,5 +56,18 @@ // #### @callback {function} Continuation to pass control to when complete.
 //
-Logs.prototype.byUser = function (amount, callback) {
-  var username = this.options.get('username');
-  var options = {
+Logs.prototype.byUser = function (username, amount, callback) {
+  var options;
+
+
+  if (arguments.length == 2) {
+    callback = amount;
+    amount = username;
+    username = this.options.get('username');
+
+  }
+
+  if (typeof username === undefined || username === null) {
+    username = this.options.get('username');
+  }
+
+  options = {
     from: 'NOW-1DAY',
@@ -58,0 +74,0 @@ until: 'NOW',

lib/client/snapshots.js

@@ -9,3 +9,4 @@ /*
 var util = require('util'),
-    Client = require('./client').Client;
+    Client = require('./client').Client,
+    defaultUser = require('./helpers').defaultUser;
 
@@ -32,4 +33,6 @@ //
 Snapshots.prototype.list = function (appName, callback) {
-  var username = this.options.get('username');
-  this.request('GET', ['apps', username, appName, 'snapshots'], callback, function (res, result) {
+  var username = defaultUser.call(this, appName),
+      argv = ['apps'].concat(username.split('/')).concat('snapshots');
+
+  this.request('GET', argv, callback, function (res, result) {
     callback(null, result.snapshots);
@@ -49,6 +52,8 @@ });
 Snapshots.prototype.create = function (appName, snapshotName, filename, callback) {
-  var username = this.options.get('username'),
-      url = ['apps', username, appName, 'snapshots', snapshotName];
+  var appName = defaultUser.call(this, appName),
+      argv = ['apps']
+        .concat(appName.split('/'))
+        .concat(['snapshots', snapshotName]);
 
-  this.upload(url, 'application/octet-stream', filename, callback, function (res, body) {
+  this.upload(argv, 'application/octet-stream', filename, callback, function (res, body) {
     callback(null, body || res.statusCode);
@@ -67,6 +72,8 @@ });
 Snapshots.prototype.destroy = function (appName, snapshotName, callback) {
-  var username = this.options.get('username'),
-      url = ['apps', username, appName, 'snapshots', snapshotName];
+  var appName = defaultUser.call(this, appName),
+      argv = ['apps']
+        .concat(appName.split('/'))
+        .concat(['snapshots', snapshotName]);
       
-  this.request('DELETE', url, callback, function (res, body) {
+  this.request('DELETE', argv, callback, function (res, body) {
     callback(null, body || res.statusCode);
@@ -85,8 +92,10 @@ });
 Snapshots.prototype.activate = function (appName, snapshotName, callback) {
-  var username = this.options.get('username'),
-      url = ['apps', username, appName, 'snapshots', snapshotName, 'activate'];
+  var appName = defaultUser.call(this, appName),
+      argv = ['apps']
+        .concat(appName.split('/'))
+        .concat(['snapshots', snapshotName, 'activate']);
       
-  this.request('POST', url, callback, function (res, body) {
+  this.request('POST', argv, callback, function (res, body) {
     callback(null, body || res.statusCode);
   });
 };

lib/client/users.js

@@ -9,3 +9,4 @@ /*
 var util = require('util'),
-    Client = require('./client').Client;
+    Client = require('./client').Client,
+    defaultUser = require('./helpers').defaultUser;
     
@@ -61,8 +62,9 @@ //
 //
-// ### function view (callback)
+// ### function view (username, callback)
 // #### @callback {function} Continuation to pass control to when complete.
 // Retrieves data for the specified user.
 //
-Users.prototype.view = function (callback) {
-  this.request('GET', ['users', this.options.get('username')], callback, function (res, result) {
+Users.prototype.view = function (username, callback) {
+
+  this.request('GET', ['users', username], callback, function (res, result) {
     callback(null, result);
@@ -86,3 +88,3 @@ });
 // ### function forgot (username, callback) 
-// #### @user {Object} username requesting password reset.
+// #### @username {Object} username requesting password reset.
 // #### @params {Object} Object containing shake and new password, if applicable.
@@ -104,3 +106,4 @@ // #### @callback {function} Continuation to pass control to when complete
 //
-// ### function update (object, callback)
+// ### function update (username, object, callback)
+// #### @username {Object} username requesting password reset.
 // #### @object {Object} Updated information about user
@@ -110,6 +113,6 @@ // #### @callback {function} Continuation to pass control to when complete
 //
-Users.prototype.update = function (object, callback) {
-  this.request('PUT', ['users', this.options.get('username')], object, callback, function (res, result) {
+Users.prototype.update = function (username, object, callback) {
+  this.request('PUT', ['users', username], object, callback, function (res, result) {
     callback(null, result);
   });
 }

package.json

 {
     "name": "nodejitsu-api",
-    "version": "0.2.3",
+    "version": "0.2.4-1",
     "description": "nodejitsu API client wrapper",
@@ -5,0 +5,0 @@ "homepage": "http://github.com/nodejitsu/nodejitsu-api",

New alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

28603

increased by5.22%

Number of package files

20

increased by5.26%

Lines of code

747

increased by6.41%

Worsened metrics

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes