Merge pull request #4 from OpenFn/v_1

V 1

lib/Client.js

@@ -3,88 +3,38 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.clientPost = clientPost;
-exports.getThenPost = getThenPost;
+exports.req = req;
 
 var _request = require('request');
 
 var _request2 = _interopRequireDefault(_request);
 
+var _Utils = require('./Utils');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function clientPost(_ref) {
-  var username = _ref.username;
-  var password = _ref.password;
-  var body = _ref.body;
-  var url = _ref.url;
+function req(method, _ref) {
+  var url = _ref.url,
+      headers = _ref.headers,
+      body = _ref.body,
+      auth = _ref.auth,
+      query = _ref.query;
 
   return new Promise(function (resolve, reject) {
-    _request2.default.post({
+    (0, _request2.default)({
       url: url,
+      headers: headers,
+      auth: auth,
+      qs: query,
+      method: method,
       json: body
     }, function (error, response, body) {
+      error = (0, _Utils.assembleError)({ error: error, response: response });
       if (error) {
         reject(error);
       } else {
-        console.log("POST succeeded.");
-        resolve(body);
-      }
-    });
-  });
-}
-
-function getThenPost(_ref2) {
-  var username = _ref2.username;
-  var password = _ref2.password;
-  var query = _ref2.query;
-  var url = _ref2.url;
-  var sendImmediately = _ref2.sendImmediately;
-  var postUrl = _ref2.postUrl;
-
-
-  function assembleError(_ref3) {
-    var response = _ref3.response;
-    var error = _ref3.error;
-
-    if (response && [200, 201, 202].indexOf(response.statusCode) > -1) return false;
-    if (error) return error;
-    return new Error('Server responded with ' + response.statusCode);
-  }
-
-  return new Promise(function (resolve, reject) {
-
-    (0, _request2.default)({
-      url: url, //URL to hit
-      qs: query, //Query string data
-      method: 'GET', //Specify the method
-      'auth': {
-        'user': username,
-        'pass': password,
-        'sendImmediately': sendImmediately
-      }
-    }, function (error, response, getResponseBody) {
-      error = assembleError({ error: error, response: response });
-      if (error) {
-        console.error("GET failed.");
-        console.log(response);
-        reject(error);
-      } else {
-        console.log("GET succeeded.");
-        console.log(response);
-        console.log(getResponseBody);
-        _request2.default.post({
-          url: postUrl,
-          json: JSON.parse(getResponseBody)
-        }, function (error, response, postResponseBody) {
-          error = assembleError({ error: error, response: response });
-          if (error) {
-            console.error("POST failed.");
-            reject(error);
-          } else {
-            console.log("POST succeeded.");
-            resolve(getResponseBody);
-          }
-        });
+        console.log("\x1b[32m%s\x1b[0m", '\u2713 ' + method + ' succeeded.');
+        resolve((0, _Utils.tryJson)(body));
       }
     });
   });

lib/Utils.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.assembleError = assembleError;
+exports.tryJson = tryJson;
+function assembleError(_ref) {
+  var response = _ref.response,
+      error = _ref.error;
+
+  if ([200, 201, 202].indexOf(response.statusCode) > -1) return false;
+  if (error) return error;
+  return new Error("Server responded with " + response.statusCode);
+}
+
+function tryJson(data) {
+  try {
+    return JSON.parse(data);
+  } catch (e) {
+    return data;
+  }
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "language-http",
-  "version": "0.4.0",
-  "description": "An HTTP Language Pack for OpenFn",
+  "version": "1.0.0",
+  "description": "An HTTP request language package for use with Open Function",
   "main": "lib/index.js",
   "scripts": {
     "build": "make",
@@ -14,7 +14,7 @@
     "lib/"
   ],
   "dependencies": {
-    "language-common": "github:openfn/language-common#v0.0.5",
+    "language-common": "github:openfn/language-common#v0.1.1",
     "request": "^2.72.0"
   },
   "devDependencies": {