From a9a54b41fc2c1fc182e59e9f0af788c68e190d0e Mon Sep 17 00:00:00 2001 From: Todd Pressley Date: Sun, 26 Nov 2017 22:10:03 -0500 Subject: [PATCH 1/6] add guarded alias for console.log --- lib/eventbrite/helpers.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/eventbrite/helpers.js b/lib/eventbrite/helpers.js index d03f2d2..2ac677f 100644 --- a/lib/eventbrite/helpers.js +++ b/lib/eventbrite/helpers.js @@ -92,3 +92,9 @@ exports.createEventbriteError = function (errorResponse) { return error; }; +/** + * @param statements Arguments to be passed through into logger + * @param isDebug Boolean switch for returned logging function + * @returns Guarded alias of console.log + */ +exports.loggerWhenDebug = (isDebug) => (...statements) => isDebug ? console.log.apply(console, statements) : void 0; From bc50655f68f196eb59d58983497e1527949d1f64 Mon Sep 17 00:00:00 2001 From: Todd Pressley Date: Sun, 26 Nov 2017 22:27:31 -0500 Subject: [PATCH 2/6] change conditional logger name --- lib/eventbrite/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/eventbrite/helpers.js b/lib/eventbrite/helpers.js index 2ac677f..6aaea8b 100644 --- a/lib/eventbrite/helpers.js +++ b/lib/eventbrite/helpers.js @@ -97,4 +97,4 @@ exports.createEventbriteError = function (errorResponse) { * @param isDebug Boolean switch for returned logging function * @returns Guarded alias of console.log */ -exports.loggerWhenDebug = (isDebug) => (...statements) => isDebug ? console.log.apply(console, statements) : void 0; +exports.loggerWhenTrue = (isTrue) => (...statements) => isDebug ? console.log.apply(console, statements) : void 0; From d8a229750e563ee08cd28d79c7ef7edd43026021 Mon Sep 17 00:00:00 2001 From: Todd Pressley Date: Sun, 26 Nov 2017 22:32:07 -0500 Subject: [PATCH 3/6] replace if (this.DEBUG) console statements --- lib/eventbrite/eventbrite_v3.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/eventbrite/eventbrite_v3.js b/lib/eventbrite/eventbrite_v3.js index 4d68dde..520cbe4 100644 --- a/lib/eventbrite/eventbrite_v3.js +++ b/lib/eventbrite/eventbrite_v3.js @@ -1,6 +1,7 @@ var http = require('http'), request = require('request'), - helpers = require('./helpers'); + helpers = require('./helpers'), + logInDebug = ()=>{}; /** * eventbrite API wrapper for the API version 3. This object should not be @@ -23,6 +24,8 @@ function eventbriteAPI_v3(options) { this.DEBUG = options.DEBUG || false; this.contentType = options.contentType || 'application/json'; this.userAgent = options.userAgent || 'node-eventbrite/' + this.version; + + logInDebug = helpers.loggerWhenTrue(this.DEBUG); } module.exports = eventbriteAPI_v3; @@ -68,12 +71,10 @@ eventbriteAPI_v3.prototype.execute = function (verb, resource, method, available finalParams[currentParam] = givenParams[currentParam]; } - if (this.DEBUG) { - console.log("uri", uri); - console.log("verb", verb); - console.log("headers", headers); - console.log("finalParams", finalParams); - } + logInDebug("uri", uri); + logInDebug("verb", verb); + logInDebug("headers", headers); + logInDebug("finalParams", finalParams); // Build our request object var requestObject = { @@ -96,7 +97,7 @@ eventbriteAPI_v3.prototype.execute = function (verb, resource, method, available request(requestObject, function (error, response, body) { var parsedResponse; if (error) { - if (this.DEBUG)console.log("error", error); + logInDebug("error", error); var err = new Error('Unable to connect to the eventbrite API endpoint.'); err.error_message = error; err.code = "REQUEST_ERROR"; @@ -106,11 +107,11 @@ eventbriteAPI_v3.prototype.execute = function (verb, resource, method, available try { parsedResponse = JSON.parse(body); if (parsedResponse.error){ - if (this.DEBUG)console.log("error", parsedResponse.error, parsedResponse.error_description); + logInDebug("error", parsedResponse.error, parsedResponse.error_description); return callback(helpers.createEventbriteError(parsedResponse)); } } catch (error) { - if (this.DEBUG)console.log("error", error); + logInDebug("error", error); return callback(new Error('Error parsing JSON answer from eventbrite API.')); } From b70de7ec3fa173be83ce09b50b271740010e5cd4 Mon Sep 17 00:00:00 2001 From: Todd Pressley Date: Sun, 26 Nov 2017 22:40:18 -0500 Subject: [PATCH 4/6] re-re-name resulting logger fn --- lib/eventbrite/eventbrite_v3.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/eventbrite/eventbrite_v3.js b/lib/eventbrite/eventbrite_v3.js index 520cbe4..ba8392a 100644 --- a/lib/eventbrite/eventbrite_v3.js +++ b/lib/eventbrite/eventbrite_v3.js @@ -1,7 +1,7 @@ var http = require('http'), request = require('request'), helpers = require('./helpers'), - logInDebug = ()=>{}; + logIfDebug = ()=>{}; /** * eventbrite API wrapper for the API version 3. This object should not be @@ -25,7 +25,7 @@ function eventbriteAPI_v3(options) { this.contentType = options.contentType || 'application/json'; this.userAgent = options.userAgent || 'node-eventbrite/' + this.version; - logInDebug = helpers.loggerWhenTrue(this.DEBUG); + logIfDebug = helpers.loggerWhenTrue(this.DEBUG); } module.exports = eventbriteAPI_v3; @@ -71,10 +71,10 @@ eventbriteAPI_v3.prototype.execute = function (verb, resource, method, available finalParams[currentParam] = givenParams[currentParam]; } - logInDebug("uri", uri); - logInDebug("verb", verb); - logInDebug("headers", headers); - logInDebug("finalParams", finalParams); + logIfDebug("uri", uri); + logIfDebug("verb", verb); + logIfDebug("headers", headers); + logIfDebug("finalParams", finalParams); // Build our request object var requestObject = { @@ -97,7 +97,7 @@ eventbriteAPI_v3.prototype.execute = function (verb, resource, method, available request(requestObject, function (error, response, body) { var parsedResponse; if (error) { - logInDebug("error", error); + logIfDebug("error", error); var err = new Error('Unable to connect to the eventbrite API endpoint.'); err.error_message = error; err.code = "REQUEST_ERROR"; @@ -107,11 +107,11 @@ eventbriteAPI_v3.prototype.execute = function (verb, resource, method, available try { parsedResponse = JSON.parse(body); if (parsedResponse.error){ - logInDebug("error", parsedResponse.error, parsedResponse.error_description); + logIfDebug("error", parsedResponse.error, parsedResponse.error_description); return callback(helpers.createEventbriteError(parsedResponse)); } } catch (error) { - logInDebug("error", error); + logIfDebug("error", error); return callback(new Error('Error parsing JSON answer from eventbrite API.')); } From 2da1a68a2485865e35032d582c9a7f0f4fb79eeb Mon Sep 17 00:00:00 2001 From: Todd Pressley Date: Sun, 26 Nov 2017 22:47:01 -0500 Subject: [PATCH 5/6] lol --- lib/eventbrite/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/eventbrite/helpers.js b/lib/eventbrite/helpers.js index 6aaea8b..ecd8c9f 100644 --- a/lib/eventbrite/helpers.js +++ b/lib/eventbrite/helpers.js @@ -97,4 +97,4 @@ exports.createEventbriteError = function (errorResponse) { * @param isDebug Boolean switch for returned logging function * @returns Guarded alias of console.log */ -exports.loggerWhenTrue = (isTrue) => (...statements) => isDebug ? console.log.apply(console, statements) : void 0; +exports.loggerWhenTrue = (isTrue) => (...statements) => isTrue ? console.log.apply(console, statements) : void 0; From 8301ee5a7c85dae260396214cbf64366f56738c1 Mon Sep 17 00:00:00 2001 From: Todd Pressley Date: Sun, 26 Nov 2017 22:57:57 -0500 Subject: [PATCH 6/6] LOL --- lib/eventbrite/helpers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/eventbrite/helpers.js b/lib/eventbrite/helpers.js index ecd8c9f..af22f1c 100644 --- a/lib/eventbrite/helpers.js +++ b/lib/eventbrite/helpers.js @@ -92,9 +92,9 @@ exports.createEventbriteError = function (errorResponse) { return error; }; -/** - * @param statements Arguments to be passed through into logger - * @param isDebug Boolean switch for returned logging function + +/** + * @param isTrue Boolean switch for returned logging function * @returns Guarded alias of console.log */ exports.loggerWhenTrue = (isTrue) => (...statements) => isTrue ? console.log.apply(console, statements) : void 0;