scaleway - npm Package Compare versions

Comparing version 0.7.0 to 0.8.0

lib/index.js

@@ -1,5 +0,2 @@
-var request = require('superagent-bluebird-promise'),
-    debug = require('debug')('node-scaleway:lib'),
-    config = require('./config'),
-    nodeify = require('nodeify'),
+var RawClient = require('./client'),
     _ = require('lodash');
@@ -9,149 +6,6 @@
 var Client = module.exports = function(options) {
-  this.config = _.defaults(options || {}, config);
+  var client = new RawClient(options);
+  var rc = require('./config');
+  client.setConfig(rc);
+  return client;
 };
-
-
-(function() {
-  var client;
-
-  this.request = function(path, method, input, options, cb) {
-    client = this;
-
-    // options parameter is optional
-    if (typeof options === 'function') {
-      cb = options;
-      options = {};
-    }
-    options = options || {};
-
-    var url = client.config.api_endpoint + path.replace(/^\//, '');
-
-    // build options
-    _.defaults(options, {
-      method: method,
-      url: url,
-      headers: {}
-    });
-    // default headers
-    _.defaults(options.headers, {
-      'Accept': 'application/json',
-      'User-Agent': 'node-scaleway'  // FIXME: append version dynamically
-    });
-    // token-based authentication
-    if (client.config.token) {
-      _.defaults(options.headers, {
-        'X-Auth-Token': client.config.token
-      });
-    }
-    var req = request(options.method, options.url);
-    _.forEach(options.headers, function(val, key) {
-      req.set(key, val);
-    });
-
-    // input
-    if (input) {
-      req.send(input);
-    }
-
-    debug(method + ' ' + url, options);
-
-    // display response from server
-    if (debug.enabled) {
-      options.transform = function(data, response) {
-        debug(response.statusCode, {
-          headers: response.headers,
-          body: data
-        });
-        return response;
-      };
-    }
-
-    if (client.config.dry_run) {
-      console.error('dry-run, should call "' + options.method
-                    + ' ' + options.url + '", exiting...');
-      process.exit(1);
-    }
-    return req.promise().nodeify(cb);
-  };
-
-  // HTTP verbs
-  this.get = function(path, options, cb) {
-    return this.request(path, 'GET', null, options, cb);
-  };
-  this.post = function(path, input, options, cb) {
-    return this.request(path, 'POST', input, options, cb);
-  };
-  this.patch = function(path, input, options, cb) {
-    return this.request(path, 'PATCH', input, options, cb);
-  };
-  this.put = function(path, input, options, cb) {
-    return this.request(path, 'PUT', input, options, cb);
-  };
-  this.delete = function(path, options, cb) {
-    return this.request(path, 'DELETE', null, options, cb);
-  };
-
-  // Helpers
-  /**
-   * Create a Server.
-   * You must have a root volume, it can be an image, or a volume.
-   *
-   * @param {Object} data
-   *  - {String} name (optional) The name of the new server
-   *  - {String} bootscript (optional) UUID of the bootscript to use
-   *  - {Array} tags (optional) List of tags to add
-   *  - {String} root_volume (optional) UUID of the volume to use for NBD0
-   *  - {String} image (optional) UUID of the image to use for NBD0
-   *  - {Array} volumes (optional) List of UUID to use for NBD1 -> NBD16
-   * @param {Object} options Request options
-   * @param {FUnction} fn Callback
-   */
-  this.createServer = function(data, options, fn) {
-    var postData = {
-      organization: data.organization || this.config.organization,
-      name: data.name
-    };
-    if (data.image) {
-      postData.image = data.image;
-    }
-    if (data.bootscript) {
-      postData.bootscript = data.bootscript;
-    }
-    if (data.root_volume) {
-      postData.volumes = postData.volumes || {};
-      postData.volumes['0'] = data.root_volume;
-    }
-    if (data.volumes && data.volumes.length) {
-      postData.volumes = postData.volumes || {};
-      data.volumes.forEach(function(volume, idx) {
-        postData.volumes[(idx + 1).toString()] = volume;
-      });
-    }
-    if (data.env) {
-      postData.tags = data.env;
-    }
-
-    return this.post('/servers', postData, options, fn);
-  };
-
-  /**
-   * Create a Volume.
-   *
-   * @param {Object} data
-   *  - {String} name (optional) The name of the new volume
-   *  - {Integer} size The size of the new volume
-   *  - {String} [l_ssd] volume_type The type of the new volume
-   * @param {Object} options Request options
-   * @param {FUnction} fn Callback
-   */
-  this.createVolume = function(data, options, fn) {
-    var postData = {
-      organization: data.organization || this.config.organization,
-      name: data.name || data.size,
-      size: parseInt(data.size),
-      volume_type: data.volume_type || 'l_ssd'
-    };
-    return this.post('/volumes', postData, options, fn);
-  };
-
-}).call(Client.prototype);

package.json

 {
   "name": "scaleway",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Scaleway.com API client",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

test/all.js

@@ -21,3 +21,3 @@ "use strict";
     var client = new Client();
-    inspect(client.config);
+    inspect('client', client);
     client.config.should.have.property('api_endpoint');
@@ -24,0 +24,0 @@ client.config.should.have.property('organization');

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

23803

increased by2.64%

Number of package files

18

increased by12.5%

Lines of code

482

increased by2.77%

No dependency changes