Merge pull request #14 from Receiptful/feature/remove-body-error

Remove body from Error

Author: stefanosala

.eslintrc

@@ -0,0 +1,48 @@
+{
+  "extends": "airbnb-base",
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "globals": {
+    "fetch": true,
+    "Headers": true
+  },
+  "rules": {
+    "arrow-parens": ["error", "as-needed"],
+    "arrow-body-style": "off",
+    "class-methods-use-this": "warn",
+    "comma-dangle": ["error", "never"],
+    "consistent-return": "off",
+    "default-case": "off",
+    "func-names": "off",
+    "generator-star-spacing": ["error", { "before": true, "after": true }],
+    "guard-for-in": "warn",
+    "no-case-declarations": "warn",
+    "no-confusing-arrow": "off",
+    "no-continue": "off",
+    "no-extra-boolean-cast": "warn",
+    "no-mixed-operators": "warn",
+    "no-new": "off",
+    "no-param-reassign": "off",
+    "no-path-concat": "off",
+    "no-plusplus": "off",
+    "no-prototype-builtins": "warn",
+    "no-restricted-syntax": "warn",
+    "no-return-assign": "off",
+    "no-shadow": "off",
+    "no-underscore-dangle": "off",
+    "no-var": "warn",
+    "object-property-newline": "warn",
+    "object-shorthand": "warn",
+    "operator-assignment": "warn",
+    "one-var": "off",
+    "padded-blocks": "warn",
+    "prefer-arrow-callback": "warn",
+    "prefer-rest-params": "warn",
+    "prefer-spread": "warn",
+    "prefer-template": "off",
+    "space-before-function-paren": ["error", "never"],
+    "strict": "off"
+  }
+}

.jscsrc

@@ -42,11 +42,9 @@ class Request {
     return oauth.authorize(req);
   }
 
-  error(message, response, body, error) {
+  error(message, response, error) {
     if (!error) error = new Error(message);
-    error.body = body;
     error.response = {
-      body: response.body,
       statusCode: response.statusCode
     };
     return error;
@@ -100,10 +98,20 @@ class Request {
           return;
         }
 
+        if (response === -1 || body === -1) {
+          const msg = 'A meaningless error has occurred, returning -1. ' +
+            'This could be the result of an incorrect folder setup.';
+          const error = this.error(msg, response);
+          logger.error(msg);
+          reject(error);
+          cb(error, body, response);
+          return;
+        }
+
         // Handle error codes between 400 & 600
         if (response.statusCode >= 400 && response.statusCode < 600) {
           const msg = `Request failed with code: ${response.statusCode}`;
-          const error = this.error(msg, response, body);
+          const error = this.error(msg, response);
 
           logger.error(msg);
           reject(error);
@@ -120,7 +128,7 @@ class Request {
             return;
           }
 
-          var json = {};
+          let json = {};
           if (typeof body === 'string' && body.trim() !== '') {
             json = JSON.parse(body.trim());
           } else if (typeof body === 'object') {
@@ -129,7 +137,7 @@ class Request {
 
           if (json.hasOwnProperty('error') || json.hasOwnProperty('errors')) {
             const errorMessage = json.error || JSON.stringify(json.errors);
-            const serverError = this.error(errorMessage, response, body);
+            const serverError = this.error(errorMessage, response);
             cb(serverError, body, response);
             reject(serverError);
             return;
@@ -142,7 +150,7 @@ class Request {
         } catch (e) {
 
           const malformedMsg = `Error parsing response body: ${e.message || e}`;
-          const malformedError = this.error(malformedMsg, body, response, e);
+          const malformedError = this.error(malformedMsg, response, e);
 
           logger.error(malformedMsg);
           cb(malformedError, body, response);

.jshintrc

@@ -1,7 +1,8 @@
 'use strict';
 
 const logger = require('./logger'),
-  Request = require('./request');
+  Request = require('./request'),
+  util = require('util');
 
 /**
  * Constructor sets the options for the module
@@ -49,7 +50,7 @@ class WooCommerce {
       timeout: this.options.timeout
     });
 
-    logger.info(require('util').inspect(this.options));
+    logger.info(util.inspect(this.options));
   }
 
   fullPath(path) {

lib/request.js

@@ -5,9 +5,7 @@
   "main": "lib/woocommerce.js",
   "scripts": {
     "exectests": "node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha",
-    "jshint": "node_modules/.bin/jshint lib test",
-    "jscs": "node_modules/.bin/jscs lib test",
-    "lint": "npm run jshint && npm run jscs",
+    "lint": "node_modules/.bin/eslint lib test --quiet",
     "test": "npm run exectests && npm run lint"
   },
   "repository": {
@@ -30,9 +28,10 @@
   "homepage": "https://github.com/Receiptful/node-woocommerce",
   "devDependencies": {
     "chai": "^3.5.0",
+    "eslint": "^3.7.1",
+    "eslint-config-airbnb-base": "^8.0.0",
+    "eslint-plugin-import": "^1.16.0",
     "istanbul": "^0.4.2",
-    "jscs": "^2.9.0",
-    "jshint": "^2.9.1",
     "mocha": "^2.4.5",
     "nock": "^7.2.2",
     "sinon": "^1.17.3"

lib/woocommerce.js

@@ -0,0 +1,8 @@
+{
+  "env": {
+    "mocha": true
+  },
+  "rules": {
+    "import/no-extraneous-dependencies": ["error", { devDependencies: true }],
+  }
+}

package.json

@@ -30,7 +30,7 @@ describe('Request', () => {
   });
 
   it('Should return an error if hostname is missing', () => {
-    should.Throw(() => {
+    should.throw(() => {
       new Request();
     }, Error);
   });

test/.eslintrc

@@ -15,13 +15,13 @@ describe('WooCommerce', () => {
 
   describe('Constructor: #WooCommerce', () => {
     it('Should throw an error if the consumerKey or secret are missing', () => {
-      should.Throw(() => {
+      should.throw(() => {
         new WooCommerce();
       }, Error);
     });
 
     it('Should throw an error if the url is missing', () => {
-      should.Throw(() => {
+      should.throw(() => {
         new WooCommerce({
           consumerKey: 'foo',
           secret: 'foo'