Skip to content

Commit

Permalink
Fixed tests and lints
Browse files Browse the repository at this point in the history
  • Loading branch information
etki committed Aug 11, 2017
1 parent 391866c commit 3294d42
Show file tree
Hide file tree
Showing 20 changed files with 1,473 additions and 869 deletions.
19 changes: 13 additions & 6 deletions Jakefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ var exec = function (command, options) {
return execute(command, options).then(complete, fail)
}

var chain = function (tasks, ignoreErrors) {
var termination = function (error, value) {
error ? fail(error) : complete(value)
}

var chain = function (tasks, callback, ignoreErrors) {
callback = callback || termination
tasks = tasks.map(function (task) {
if (typeof task === 'string' || task instanceof String) {
return jake.Task[task]
Expand All @@ -44,13 +49,15 @@ var chain = function (tasks, ignoreErrors) {
task.invoke(value)
})
carrier.addListener('fail', function (error) {
ignoreErrors ? task.invoke(error) : fail(error)
ignoreErrors ? task.invoke(error) : callback(error)
})
}
return task;
}, null)
last.addListener('complete', complete)
last.addListener('fail', fail)
last.addListener('complete', function (value) {
callback(null, value)
})
last.addListener('fail', callback)
tasks[0].invoke()
}

Expand Down Expand Up @@ -126,7 +133,7 @@ namespace('test', function () {
})

task('with-report', {async: true}, function () {
chain(['test:coverage', 'test:report'], true)
chain(['test:coverage', 'test:report'], termination, true)
})

suites.forEach(function (suite) {
Expand Down Expand Up @@ -176,7 +183,7 @@ namespace('test', function () {
})

task('with-report', {async: true}, function () {
chain(['test:' + suite + ':coverage', 'test:report'], true)
chain(['test:' + suite + ':coverage', 'test:report'], termination, true)
})
})
})
Expand Down
24 changes: 15 additions & 9 deletions lib/http/_common.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ function NetworkException (message, code, request) {
this.request = request
this.stack = new Error().stack
}
// poor man's byte economy
var N = NetworkException
extend(Error, N, 'NetworkException')
N.prototype.code = -1
N.prototype.message = 'Unexpected exception during request'
extend(Error, NetworkException, 'NetworkException')
NetworkException.prototype.code = -1
NetworkException.prototype.message = 'Unexpected exception during request'

var index = {
'-1': N
'-1': NetworkException
}

/**
Expand Down Expand Up @@ -94,16 +92,24 @@ var index = {
* @property {Function} VoxEngineErrorException
*/
var exports = {
NetworkException: N,
NetworkException: NetworkException,
codeExceptionIndex: index,
Method: Schema.Method
}

/**
* Declares new NetworkException (resembling VoxImplant HTTP client
* negative response codes)
*
* @param {string} name Exception name
* @param {int} code Exception code (response code)
* @param {string} message Default exception message
*/
function declare (name, code, message) {
var e = function () {
N.apply(this, arguments)
NetworkException.apply(this, arguments)
}
extend(N, e, name)
extend(NetworkException, e, name)
e.prototype.constructor = e
e.prototype.code = e.code = code
e.prototype.message = message
Expand Down
2 changes: 1 addition & 1 deletion lib/http/_schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ var Method = {
*
* @param {Method|string} method
* @param {string} resource
* @param {Query|undefined} [query]
* @param {*|undefined} [payload]
* @param {Query|undefined} [query]
* @param {Headers|undefined} [headers]
*
* @return {RestResponsePromise}
Expand Down
2 changes: 1 addition & 1 deletion lib/http/basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function BasicHttpClient (settings, transport) {
transport = transport || Net.httpRequestAsync
settings = settings || {}
var defaults = getDefaults()
var logger = Slf4j.assemble(setting('logger'), 'ama-team.voxengine-sdk.http.basic')
var logger = Slf4j.factory(setting('logger'), 'ama-team.voxengine-sdk.http.basic')
var self = this
var requests = 0

Expand Down
7 changes: 5 additions & 2 deletions lib/http/rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function JsonSerializer () {
* @property {boolean|undefined} retryOnServerError Whether request should be retried on server error (5xx),
* default: `true`
* @property {Headers|undefined} headers Object containing headers for every emitted request, default: `{}`
* @property {VarArgLoggerFactory} loggerFactory Factory for logger creation.
* @property {LoggerOptions} logger Logger options.
* @property {IHttpClient} client Underlying http client
*/

Expand Down Expand Up @@ -82,7 +82,7 @@ function RestClient (settings, transport) {
})
client = settings.client || new Client(opts, transport)
// noinspection JSUnusedAssignment
logger = Slf4j.assemble(opts.logger, 'ama-team.voxengine-sdk.http.rest')
logger = Slf4j.factory(opts.logger, 'ama-team.voxengine-sdk.http.rest')

function execute (request) {
var id = ++counter
Expand Down Expand Up @@ -165,6 +165,9 @@ function RestClient (settings, transport) {
})
}

/**
* @return {RestClientSettings}
*/
function getDefaults () {
return {
url: '',
Expand Down
12 changes: 9 additions & 3 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
module.exports = {
http: require('./http'),
logger: require('./logger')
var exports = {
Http: require('./http'),
Logger: require('./logger')
}
/** @deprecated */
exports.http = exports.Http
/** @deprecated */
exports.logger = exports.Logger

module.exports = exports
Loading

0 comments on commit 3294d42

Please sign in to comment.