Added tests for Api constructor, moved non-exported methods into plugins/ folder

Author: Hovhannes Babayan

src/Api.js

@@ -1,23 +1,45 @@
+/**
+ * Creates new Api instance. Accepts configuration object with the following keys:
+ *     hostname {String} - Required. A name of host to connect to
+ *     port {String} - Optional. A port on host to connect to. Defaults to 80.
+ *     version {String} - Optional. Which version of api to use.
+ *                        At the moment of writing can be 1.0, 2.0, 3.0, 4.0, 5.0.
+ *                        Pass 'internal' to use AtTask internal API (this is the latest version, maybe unstable)
+ * @param {Object} config
+ * @constructor
+ */
 function Api(config) {
     this.httpOptions = {
         hostname: config.hostname,
         port: config.port || 80,
-        path: '/attask/api',
         method: 'GET',
         withCredentials: false
     };
 
-    // Append version to hostname if provided
-    if (config.version) {
-        this.httpOptions.path = this.httpOptions.path + '/v' + config.version;
+    // Append version to path if provided
+    var path;
+    if (config.version === 'internal') {
+        path = '/attask/api-internal'
     }
+    else {
+        path = '/attask/api';
+        if (config.version) {
+            path = path + '/v' + config.version;
+        }
+    }
+    this.httpOptions.path = path;
 }
 
-require('./request')(Api);
-require('./login')(Api);
-require('./logout')(Api);
-require('./search')(Api);
-require('./get')(Api);
-require('./post')(Api);
+var plugins = [
+    'request',
+    'login',
+    'logout',
+    'search',
+    'get',
+    'post'
+];
+for(var i=0; i<plugins.length; ++i) {
+    require('./plugins/' + plugins[i])(Api);
+}
 
 module.exports = Api;

src/get.js src/plugins/get.jssrc/get.js renamed to src/plugins/get.js

@@ -1,4 +1,4 @@
-var Api = require('./Api');
+var Api = require('./../Api');
 
 module.exports = function(Api) {
     /**

src/login.js src/plugins/login.jssrc/login.js renamed to src/plugins/login.js

@@ -1,4 +1,4 @@
-var Api = require('./Api');
+var Api = require('./../Api');
 
 module.exports = function(Api) {
     Api.prototype.login = function (username, password) {

src/logout.js src/plugins/logout.jssrc/logout.js renamed to src/plugins/logout.js

@@ -1,4 +1,4 @@
-var Api = require('./Api');
+var Api = require('./../Api');
 
 module.exports = function(Api) {
     Api.prototype.logout = function () {

src/post.js src/plugins/post.jssrc/post.js renamed to src/plugins/post.js

@@ -1,4 +1,4 @@
-var Api = require('./Api');
+var Api = require('./../Api');
 
 module.exports = function(Api) {
     /**

src/request.js src/plugins/request.jssrc/request.js renamed to src/plugins/request.js

@@ -1,4 +1,4 @@
-var Api = require('./Api'),
+var Api = require('./../Api'),
     queryString = require('querystring'),
     http = require('http'),
     util = require('util');

src/search.js src/plugins/search.jssrc/search.js renamed to src/plugins/search.js

@@ -1,4 +1,4 @@
-var Api = require('./Api');
+var Api = require('./../Api');
 
 module.exports = function(Api) {
     Api.prototype.search = function (objCode, query, fields) {

test/ApiSpec.js

@@ -4,7 +4,7 @@ var Api = require('./../src/Api');
 
 
 describe('Create new instance for API', function() {
-	it('should have methods', function(){
+	it('should have methods', function() {
 		var api = new Api({hostname: 'localhost'});
 		expect(api).to.respondTo('get');
 		expect(api).to.respondTo('login');
@@ -21,4 +21,19 @@ describe('Create new instance for API', function() {
 		expect(api).to.respondTo('namedQuery');
 		expect(api).to.respondTo('metadata');
 	});
+
+	it('should set correct API path based on passed configuration (version is passed)', function() {
+		var api = new Api({version: '2.0'});
+		expect(api.httpOptions.path).to.equal('/attask/api/v2.0');
+	});
+
+	it('should set correct API path based on passed configuration (version is not passed)', function() {
+		var api = new Api({});
+		expect(api.httpOptions.path).to.equal('/attask/api');
+	});
+
+	it('should set correct API path based on passed configuration (version="internal")', function() {
+		var api = new Api({version: 'internal'});
+		expect(api.httpOptions.path).to.equal('/attask/api-internal');
+	});
 });