removed versioning, keeping old style, fixed mocking

This commit is contained in:
Josh Harvey 2014-07-05 15:34:58 -04:00
parent f924123bd9
commit b2e7ca6ad1
3 changed files with 14 additions and 30 deletions

View file

@ -1,14 +1,11 @@
'use strict';
var ApiResponse = function(config) {
this.config = config;
this.response = config.response;
this.targetVersion = config.targetVersion;
this.version = config.version;
var ApiResponse = function(res) {
this.response = res;
};
ApiResponse.factory = function factory(config) {
return new ApiResponse(config);
ApiResponse.factory = function factory(res) {
return new ApiResponse(res);
};
module.exports = ApiResponse;
@ -21,25 +18,15 @@ ApiResponse.prototype.respond = function respond(err, res, statusCodeOpt) {
};
ApiResponse.prototype._buildErr = function _buildErr(err) {
// Handle err as either string or error type
var message = err.message || err;
var name = err.name || null;
if (this.targetVersion < 1) return {err: message, errType: name};
return {err: {
name: name,
message: message,
version: this.version
}
};
return {err: message, errType: name};
};
ApiResponse.prototype._buildResponse = function _buildResponse(res) {
if (this.targetVersion < 1) {
var fullRes = res;
fullRes = fullRes || {};
fullRes.err = null;
return fullRes;
}
return {err: null, result: res || null, version: this.version};
var fullRes = res;
fullRes = fullRes || {};
fullRes.err = null;
return fullRes;
};