@selkirk-systems/fetch 0.1.0 → 0.1.2

package/dist/index.js

@@ -10,13 +10,19 @@ var _networkTimer = null;
 
 function _checkFetchStatus(response) {
     if (response.status >= 200 && response.status < 300) {
-        return response.json();
+        if (response.text.length > 0) {
+            return response.json();
+        }
     } else {
         var error = new Error(response.statusText);
-        return response.json().then(function (result) {
-            error.response = result;
+        if (response.text.length) {
+            return response.json().then(function (result) {
+                error.response = result;
+                throw error;
+            });
+        } else {
             throw error;
-        });
+        }
     }
 }
 
@@ -25,14 +31,16 @@ function _invokeFetch(url, props) {
         throw new Error("fetch:Missing Parameter - URL");
     }
 
-    var options = Assign({
+    var options = {
         method: "GET",
         credentials: 'same-origin',
         headers: {
             'Accept': 'application/json',
             'Content-Type': 'application/json'
         }
-    }, props);
+    };
+
+    options = Assign(options, props);
 
     if (_networkTimer) {
         return new Promise(function (resolve, reject) {
@@ -40,7 +48,7 @@ function _invokeFetch(url, props) {
         });
     }
 
-    if (options.body) options.body = JSON.stringify(options.body);
+    if (options.headers['Content-Type'] === "application/json" && options.body) options.body = JSON.stringify(options.body);
 
     return fetch(url, options).then(_checkFetchStatus);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selkirk-systems/fetch",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A wrapper on fetch-polyfill that will work for server and client environments",
   "selkirk": {
     "bambooDeploy": "npm",
@@ -10,9 +10,6 @@
       "http://bamboo5.selkirksystems.com/browse/RCB-EDFPUB"
     ]
   },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
   "repository": {
     "type": "git",
     "url": "https://bitbucket.org/selkirk/selkirk-fetch.git"
@@ -65,7 +62,7 @@
   "dependencies": {
     "babel-runtime": "^6.6.1",
     "bluebird": "^3.4.6",
-    "es6-promise": "^3.2.1",
+    "es6-promise": "^4.2.2",
     "isomorphic-fetch": "^2.2.1",
     "object-assign": "^4.1.0"
   }

package/src/index.js

@@ -8,13 +8,19 @@ const _networkTimer = null;
 
 function _checkFetchStatus(response) {
    if (response.status >= 200 && response.status < 300) {
-      return response.json()
+	   if (response.text.length > 0) {
+	   		return response.json()
+   		}
    } else {
       var error = new Error(response.statusText);
-       return response.json().then((result)=>{
-           error.response = result;
-           throw error;
-       });
+      if (response.text.length) {
+	       return response.json().then((result)=>{
+	           error.response = result;
+	           throw error;
+	       });
+      } else {
+    	  throw error;
+      }
    }
 }
 
@@ -22,15 +28,18 @@ function _invokeFetch(url,props) {
    if(!url) {
       throw new Error("fetch:Missing Parameter - URL");
    }
-
-   var options = Assign({
+  
+   var options = {
       method:"GET",
       credentials:'same-origin',
       headers: {
          'Accept': 'application/json',
          'Content-Type': 'application/json'
       }
-   },props);
+   };
+   
+    options = Assign(options,props);
+   
 
    if(_networkTimer){
       return new Promise((resolve,reject)=>{
@@ -38,7 +47,7 @@ function _invokeFetch(url,props) {
       })
    }
 
-   if(options.body)options.body = JSON.stringify(options.body);
+   if(options.headers['Content-Type'] === "application/json" && options.body)options.body = JSON.stringify(options.body);
 
    return fetch(url, options)
       .then(_checkFetchStatus)