Added isContentBody to Communicator

Author: masterWeber

src/communicator.js

@@ -9,6 +9,7 @@ class Communicator {
   static METHOD_GET = 'GET';
   static METHOD_DELETE = 'DELETE';
   static METHOD_POST = 'POST';
+  static CONTENT_BODY_KEY = 'Content-Body';
 
   baseUrl = 'https://ws3.morpher.ru';
   token = null;
@@ -34,13 +35,17 @@ class Communicator {
     }
   }
 
-  request(path, params, method) {
+  request(path, params = new Map(), method = Communicator.METHOD_GET) {
 
-    const url = this.buildUrl(path, params);
+    const isContentBody = this.isContentBody(params, method);
 
-    const contentType = this.isPost(method)
-        ? 'application/x-www-form-urlencoded'
-        : 'application/json';
+    const url = isContentBody
+        ? this.buildUrl(path)
+        : this.buildUrl(path, params);
+
+    const contentType = isContentBody
+        ? 'text/plain; charset=utf-8'
+        : 'application/x-www-form-urlencoded';
 
     const init = {
       method: method,
@@ -50,6 +55,10 @@ class Communicator {
       },
     };
 
+    if (isContentBody) {
+      init.body = params.get(Communicator.CONTENT_BODY_KEY);
+    }
+
     return new Promise((resolve, reject) => {
       const timer = setTimeout(
           () => reject(new Error('TIMEOUT')),
@@ -66,7 +75,7 @@ class Communicator {
     });
   }
 
-  buildUrl(path, params) {
+  buildUrl(path, params = new Map()) {
     let url = new URL(path, this.baseUrl);
 
     params.forEach((value, name) => {
@@ -92,6 +101,11 @@ class Communicator {
     return this._fetcher;
   }
 
+  isContentBody(params, method) {
+    return this.isPost(method) && params.size === 1 &&
+        params.has(Communicator.CONTENT_BODY_KEY);
+  }
+
   isPost(method) {
     return method.toUpperCase() === Communicator.METHOD_POST;
   }

test/unit/communicator.test.js

@@ -108,8 +108,86 @@ describe('Communicator', function() {
           communicator.buildUrl(path, params),
           baseUrl + path + '?key_1=value&key_2=value_1%2Cvalue_2',
       );
+
+      communicator = new Communicator();
+      assert.equal(
+          communicator.buildUrl(path),
+          communicator.baseUrl + path,
+      );
+    });
+
+  });
+
+  describe('#isContentBody()', function() {
+
+    const communicator = new Communicator();
+
+    it('should return false when no parameters are specified', function() {
+      return assert.equal(
+          communicator.isContentBody(new Map(), Communicator.METHOD_POST),
+          false,
+      );
     });
 
+    it('should return false when the \'Content-Body\' parameter is not specified',
+        function() {
+          const params = new Map();
+          params.set('k', 0);
+
+          return assert.equal(
+              communicator.isContentBody(params, Communicator.METHOD_POST),
+              false,
+          );
+        },
+    );
+
+    it('should return false when more than one parameter is specified',
+        function() {
+          const params = new Map();
+          params.set('k', 0);
+          params.set(Communicator.CONTENT_BODY_KEY, 'текст');
+
+          return assert.equal(
+              communicator.isContentBody(params, Communicator.METHOD_POST),
+              false,
+          );
+        },
+    );
+
+    it('should return false when the method is not \'post\'',
+        function() {
+          const params = new Map();
+          params.set(Communicator.CONTENT_BODY_KEY, 'текст');
+
+          assert.equal(
+              communicator.isContentBody(params, Communicator.METHOD_GET),
+              false,
+          );
+
+          assert.equal(
+              communicator.isContentBody(params, 'put'),
+              false,
+          );
+
+          assert.equal(
+              communicator.isContentBody(params, 'delete'),
+              false,
+          );
+        },
+    );
+
+    it('should return true when the \'post\' method, the parameter is the only one, and it\'s named \'Content-Body\'',
+        function() {
+          const params = new Map();
+          params.set(Communicator.CONTENT_BODY_KEY, 'текст');
+
+          assert.equal(
+              communicator.isContentBody(params, Communicator.METHOD_POST),
+              true,
+          );
+        },
+    );
+
   });
 
   describe('#isPost()', function() {