Make responseHandlers as a helper & wrap response.

Huemul · Nov 11, 2016 · 3b19a69 · 3b19a69
1 parent 52f29e5
commit 3b19a69
Show file tree

Hide file tree

Showing 4 changed files with 135 additions and 22 deletions.
diff --git a/lib/helpers/responseHandler.js b/lib/helpers/responseHandler.js
@@ -0,0 +1,36 @@
+/**
+ * Wrapp a response
+ *
+ * @param {Object} response response object
+ * @param {String} reader type of reader to use on response body
+ * @return {Promise} resolves to the wrapped read response
+ */
+function wrapResponse(response, reader) {
+  return response[reader]()
+  .then(data => ({
+    headers: response.headers,
+    status: response.status,
+    data
+  }));
+}
+
+/**
+ * Reads or rejects a fetch request response
+ *
+ * @param {Object} response response object
+ * @return {Promise} read or rejection promise
+ */
+function responseHandler(response) {
+  if (!response.ok) {
+    const err   = new Error(response.statusText);
+    err.status  = response.status;
+    err.headers = response.headers;
+    return Promise.reject(err);
+  }
+  if (response.headers.get('Content-Type') === 'application/json') {
+    return wrapResponse(response, 'json');
+  }
+  return wrapResponse(response, 'text');
+}
+
+module.exports = responseHandler;
diff --git a/lib/index.js b/lib/index.js
@@ -1,9 +1,10 @@
 require('whatwg-fetch');
 const buildQuery = require('trae-query').buildQuery;
 
-const Middleware = require('./middleware');
-const Config     = require('./config');
-const skip       = require('./utils').skip;
+const Middleware      = require('./middleware');
+const Config          = require('./config');
+const skip            = require('./utils').skip;
+const responseHandler = require('./helpers/responseHandler');
 
 class Trae {
   constructor(config = {}) {
@@ -48,7 +49,7 @@ class Trae {
   _fetch(url, config) {
     return this._middleware.resolveRequests(config)
     .then(config => fetch(url, config))
-    .then(res => this.constructor._responseHandler(res))
+    .then(res => responseHandler(res))
     .then(res => this._middleware.resolveResponses(res));
   }
 
@@ -74,18 +75,6 @@ class Trae {
     });
   }
 
-  static _responseHandler(response) {
-    if (!response.ok) {
-      const err = new Error(response.statusText);
-      err.status = response.status;
-      return Promise.reject(err);
-    }
-    if (response.headers.get('Content-Type') === 'application/json') {
-      return response.json();
-    }
-    return response.text();
-  }
-
 }
 
 module.exports = new Trae();
diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap
@@ -1,3 +1,91 @@
+exports[`HTTP -> http del makes a DELETE request to baseURL + path 1`] = `
+Object {
+  "data": "Deleted!",
+  "headers": Headers {
+    "_headers": Object {
+      "content-type": Array [
+        "application/text",
+      ],
+    },
+  },
+  "status": 200,
+}
+`;
+
+exports[`HTTP -> http get makes a GET request to baseURL + path 1`] = `
+Object {
+  "data": Object {
+    "foo": "bar",
+  },
+  "headers": Headers {
+    "_headers": Object {
+      "content-type": Array [
+        "application/json",
+      ],
+    },
+  },
+  "status": 200,
+}
+`;
+
+exports[`HTTP -> http head makes a HEAD request to baseURL + path 1`] = `
+Object {
+  "data": "",
+  "headers": Headers {
+    "_headers": Object {},
+  },
+  "status": 200,
+}
+`;
+
+exports[`HTTP -> http patch makes a PATCH request to baseURL + path 1`] = `
+Object {
+  "data": Object {
+    "foo": "bar",
+  },
+  "headers": Headers {
+    "_headers": Object {
+      "content-type": Array [
+        "application/json",
+      ],
+    },
+  },
+  "status": 200,
+}
+`;
+
+exports[`HTTP -> http post makes a POST request to baseURL + path 1`] = `
+Object {
+  "data": Object {
+    "foo": "bar",
+  },
+  "headers": Headers {
+    "_headers": Object {
+      "content-type": Array [
+        "application/json",
+      ],
+    },
+  },
+  "status": 200,
+}
+`;
+
+exports[`HTTP -> http put makes a PUT request to baseURL + path 1`] = `
+Object {
+  "data": Object {
+    "foo": "bar",
+  },
+  "headers": Headers {
+    "_headers": Object {
+      "content-type": Array [
+        "application/json",
+      ],
+    },
+  },
+  "status": 200,
+}
+`;
+
 exports[`HTTP -> http response not ok gets rejected 1`] = `[Error: Not Found]`;
 
 exports[`trae defaults returns the current default config when no params are passed 1`] = `

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -105,7 +105,7 @@ describe('HTTP -> http', () => {
 
       return trae.get(url)
       .then((res) => {
-        expect(res).toEqual({ foo: 'bar' });
+        expect(res).toMatchSnapshot();
         expect(fetchMock.called(url)).toBeTruthy();
         expect(fetchMock.lastUrl()).toBe(url);
         expect(fetchMock.lastOptions().method).toBe('get');
@@ -129,7 +129,7 @@ describe('HTTP -> http', () => {
 
       return trae.delete(url)
       .then((res) => {
-        expect(res).toEqual('Deleted!');
+        expect(res).toMatchSnapshot();
         expect(fetchMock.called(url)).toBeTruthy();
         expect(fetchMock.lastUrl()).toBe(url);
         expect(fetchMock.lastOptions().method).toBe('delete');
@@ -149,7 +149,7 @@ describe('HTTP -> http', () => {
 
       return trae.head(url)
       .then((res) => {
-        expect(res).toEqual('');
+        expect(res).toMatchSnapshot();
         expect(fetchMock.called(url)).toBeTruthy();
         expect(fetchMock.lastUrl()).toBe(url);
         expect(fetchMock.lastOptions().method).toBe('head');
@@ -173,7 +173,7 @@ describe('HTTP -> http', () => {
 
       return trae.post(url, { foo: 'bar' })
       .then((res) => {
-        expect(res).toEqual({ foo: 'bar' });
+        expect(res).toMatchSnapshot();
         expect(fetchMock.called(url)).toBeTruthy();
         expect(fetchMock.lastUrl()).toBe(url);
         expect(fetchMock.lastOptions().method).toBe('post');
@@ -197,7 +197,7 @@ describe('HTTP -> http', () => {
 
       return trae.put(url, { foo: 'bar' })
       .then((res) => {
-        expect(res).toEqual({ foo: 'bar' });
+        expect(res).toMatchSnapshot();
         expect(fetchMock.called(url)).toBeTruthy();
         expect(fetchMock.lastUrl()).toBe(url);
         expect(fetchMock.lastOptions().method).toBe('put');
@@ -221,7 +221,7 @@ describe('HTTP -> http', () => {
 
       return trae.patch(url, { foo: 'bar' })
       .then((res) => {
-        expect(res).toEqual({ foo: 'bar' });
+        expect(res).toMatchSnapshot();
         expect(fetchMock.called(url)).toBeTruthy();
         expect(fetchMock.lastUrl()).toBe(url);
         expect(fetchMock.lastOptions().method).toBe('patch');