further simplify the genericResponse handler as per comments

Author: martintajur

examples/add-file.js

@@ -0,0 +1,29 @@
+/*!
+ * This basic example shows how to fetch some deals
+ * matching a specific filter from Pipedrive account.
+ *
+ * It starts by fetching the first deals filter from the
+ * account, it then fetches 5 deals matching to this
+ * filter.
+ *
+ * It will then display a list of found deals along
+ * with the values and with how many activities they are
+ * associated with.
+ *
+ * Usage:
+ * node list-deals.js APITOKEN
+**/
+
+if (!process.argv[2]) {
+	process.stderr.write('Please provide API token!' + "\n");
+	process.exit();
+}
+
+var Pipedrive = require(__dirname + '/../index');
+var pipedrive = new Pipedrive.Client(process.argv[2]);
+var _ = require('lodash');
+
+pipedrive.Files.add({ name: 'test.js' }, { data: __dirname + '/add-file.js' }, function(addFileErr, addFileData) {
+	if (addFileErr) throw addFileErr;
+	console.log(addFileData);
+});

lib/restHandlers.js

@@ -24,51 +24,56 @@
 			return;
 		}
 
-		var statusCodeGroup = parseInt((rawResponse.statusCode || 0).toString().substr(0, 1), 10);
+		var statusCodeGroup = parseInt((rawResponse.statusCode || 0).toString().substr(0, 1), 10),
+			responseError = null,
+			responseData = {},
+			responseAdditionalData = {};
 
 		if (_.isString(responseBody)) {
 			try {
 				responseBody = JSON.parse(responseBody);
 			}
-			catch (err) {}
+			catch (err) {
+				responseError = new Error('Malformed Pipedrive API response');
+			}
 		}
 
-		if (responseBody.success === true) {
-			callback(null, responseBody.data, responseBody.additional_data, rawRequest, rawResponse);
-			return;
+		if (!responseError && responseBody.success === true) {
+			responseError = null;
+			responseData = responseBody.data;
+			responseAdditionalData = responseBody.additional_data;
 		}
 		else if (statusCodeGroup === 4 || statusCodeGroup === 5) {
-			var errorObject = new Error();
-
 			if (_.isObject(rawResponse._error)) {
-				errorObject = rawResponse._error;
+				responseError = rawResponse._error;
 			}
 			else {
-				errorObject = new Error('Got HTTP response ' + rawResponse.statusCode + ' from Pipedrive API');
+				responseError = new Error('Got HTTP response ' + rawResponse.statusCode + ' from Pipedrive API');
 
 				if (responseBody.error) {
-					errorObject = new Error('Pipedrive API error:' + responseBody.error);
+					responseError = new Error('Pipedrive API error:' + responseBody.error);
 				}
 				else {
 					try {
 						var errorBody = JSON.parse(rawResponse.rawEncoded.toString('utf8'));
 						if (!_.isUndefined(errorBody.error)) {
-							errorObject = new Error('Pipedrive API error:' + errorBody.error);
+							responseError = new Error('Pipedrive API error:' + errorBody.error);
 						}
 					}
-					catch (err) {}
+					catch (err) {
+						responseError = new Error('Malformed Pipedrive API response');
+					}
 				}
 			}
 
-			callback(errorObject, null, null, rawRequest, rawResponse);
-			return;
+			responseData = null;
+			responseAdditionalData = null;
 		}
 		else if (responseBody.error) {
-			callback(responseBody.error, responseBody.data || {}, responseBody.additional_data || {}, rawRequest, rawResponse);
-			return;
+			responseError = new Error(responseBody.error);
 		}
 
-		callback(null, responseBody.data || {}, responseBody.additional_data || {}, rawRequest, rawResponse);
+		callback(responseError, responseData, responseAdditionalData, rawRequest, rawResponse);
 	};
 
 	// GET /items