Stable Version 1.0.0-beta.2.

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 1.0.0-beta.2 - 10 January 2014
+
+Fixed some tests.
+
 ##### 1.0.0-beta.1 - 10 January 2014
 
 Now in beta

dist/js-data-http.js

@@ -1,7 +1,7 @@
 /**
 * @author Jason Dobry <jason.dobry@gmail.com>
 * @file js-data-http.js
-* @version 1.0.0-beta.1 - Homepage <http://www.js-data.io/docs/dshttpadapter>
+* @version 1.0.0-beta.2 - Homepage <http://www.js-data.io/docs/dshttpadapter>
 * @copyright (c) 2014 Jason Dobry 
 * @license MIT <https://github.com/js-data/js-data-http/blob/master/LICENSE>
 *
@@ -33,9 +33,13 @@ module.exports = function xhrAdapter(resolve, reject, config) {
     config.headers || {}
   );
 
+  if (utils.isFormData(data)) {
+    delete headers['Content-Type']; // Let the browser set it
+  }
+
   // Create the request
   var request = new(XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
-  request.open(config.method, buildUrl(config.url, config.params), true);
+  request.open(config.method.toUpperCase(), buildUrl(config.url, config.params), true);
 
   // Listen for ready state
   request.onreadystatechange = function () {
@@ -123,20 +127,22 @@ var axios = module.exports = function axios(config) {
   // Don't allow overriding defaults.withCredentials
   config.withCredentials = config.withCredentials || defaults.withCredentials;
 
-  var promise = new Promise(function (resolve, reject) {
-    try {
-      // For browsers use XHR adapter
-      if (typeof window !== 'undefined') {
-        require('./adapters/xhr')(resolve, reject, config);
-      }
-      // For node use HTTP adapter
-      else if (typeof process !== 'undefined') {
-        require('./adapters/http')(resolve, reject, config);
+  var serverRequest = function (config) {
+    return new Promise(function (resolve, reject) {
+      try {
+        // For browsers use XHR adapter
+        if (typeof window !== 'undefined') {
+          require('./adapters/xhr')(resolve, reject, config);
+        }
+        // For node use HTTP adapter
+        else if (typeof process !== 'undefined') {
+          require('./adapters/http')(resolve, reject, config);
+        }
+      } catch (e) {
+        reject(e);
       }
-    } catch (e) {
-      reject(e);
-    }
-  });
+    });
+  };
 
   function deprecatedMethod(method, instead, docs) {
     try {
@@ -151,6 +157,24 @@ var axios = module.exports = function axios(config) {
     } catch (e) {}
   }
 
+  var chain = [serverRequest, undefined];
+  var promise = Promise.resolve(config);
+
+  utils.forEach(axios.interceptors.request.handlers, function (interceptor) {
+    chain.unshift(interceptor.request, interceptor.requestError);
+  });
+
+  utils.forEach(axios.interceptors.response.handlers, function (interceptor) {
+    chain.push(interceptor.response, interceptor.responseError);
+  });
+
+  while (chain.length) {
+    var thenFn = chain.shift();
+    var rejectFn = chain.shift();
+
+    promise = promise.then(thenFn, rejectFn);
+  }
+
   // Provide alias for success
   promise.success = function success(fn) {
     deprecatedMethod('success', 'then', 'https://github.com/mzabriskie/axios/blob/master/README.md#response-api');
@@ -183,6 +207,22 @@ axios.all = function (promises) {
 };
 axios.spread = require('./helpers/spread');
 
+// interceptors
+axios.interceptors = {
+  request: {
+    handlers: [],
+    use: function (thenFn, rejectFn) {
+      axios.interceptors.request.handlers.push({ request: thenFn, requestError: rejectFn });
+    }
+  },
+  response: {
+    handlers: [],
+    use: function (thenFn, rejectFn) {
+      axios.interceptors.response.handlers.push({ response: thenFn, responseError: rejectFn });
+    }
+  }
+};
+
 // Provide aliases for supported request methods
 createShortMethods('delete', 'get', 'head');
 createShortMethodsWithData('post', 'put', 'patch');
@@ -209,6 +249,7 @@ function createShortMethodsWithData() {
     };
   });
 }
+
 }).call(this,require('_process'))
 },{"./adapters/http":2,"./adapters/xhr":2,"./defaults":4,"./helpers/spread":8,"./utils":11,"_process":22,"es6-promise":12}],4:[function(require,module,exports){
 'use strict';
@@ -503,6 +544,16 @@ function isArrayBuffer(val) {
   return toString.call(val) === '[object ArrayBuffer]';
 }
 
+/**
+ * Determine if a value is a FormData
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an FormData, otherwise false
+ */
+function isFormData(val) {
+  return toString.call(val) === '[object FormData]';
+}
+
 /**
  * Determine if a value is a view on an ArrayBuffer
  *
@@ -669,6 +720,7 @@ function merge(obj1/*, obj2, obj3, ...*/) {
 module.exports = {
   isArray: isArray,
   isArrayBuffer: isArrayBuffer,
+  isFormData: isFormData,
   isArrayBufferView: isArrayBufferView,
   isString: isString,
   isNumber: isNumber,

dist/js-data-http.min.js

@@ -1,7 +1,7 @@
 {
   "name": "js-data-http",
   "description": "http adapter for js-data.",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "homepage": "http://www.js-data.io/docs/dshttpadapter",
   "repository": {
     "type": "git",

package.json

@@ -31,7 +31,7 @@ describe('DSHttpAdapter.create(resourceConfig, attrs, options)', function () {
     setTimeout(function () {
       assert.equal(1, _this.requests.length);
       assert.equal(_this.requests[0].url, 'api/posts');
-      assert.equal(_this.requests[0].method, 'post');
+      assert.equal(_this.requests[0].method, 'POST');
       assert.equal(_this.requests[0].requestBody, DSUtils.toJson({ author: 'John', age: 30 }));
       _this.requests[0].respond(200, {'Content-Type': 'application/json'}, DSUtils.toJson(p1));
     }, 10);

test/create.spec.js

@@ -18,7 +18,7 @@ describe('DSHttpAdapter.destroy(resourceConfig, id, options)', function () {
       setTimeout(function () {
         assert.equal(2, _this.requests.length);
         assert.equal(_this.requests[1].url, 'api2/posts/1');
-        assert.equal(_this.requests[1].method, 'delete');
+        assert.equal(_this.requests[1].method, 'DELETE');
         _this.requests[1].respond(200, {'Content-Type': 'text/plain'}, '1');
       }, 10);
 
@@ -30,7 +30,7 @@ describe('DSHttpAdapter.destroy(resourceConfig, id, options)', function () {
     setTimeout(function () {
       assert.equal(1, _this.requests.length);
       assert.equal(_this.requests[0].url, 'api/posts/1');
-      assert.equal(_this.requests[0].method, 'delete');
+      assert.equal(_this.requests[0].method, 'DELETE');
       _this.requests[0].respond(200, {'Content-Type': 'text/plain'}, '1');
     }, 10);
   });

test/destroy.spec.js

@@ -24,7 +24,7 @@ describe('DSHttpAdapter.destroyAll(resourceConfig, params, options)', function (
       setTimeout(function () {
         assert.equal(2, _this.requests.length);
         assert.equal(_this.requests[1].url, 'api2/posts?where=%7B%22author%22:%7B%22%3D%3D%22:%22John%22%7D%7D');
-        assert.equal(_this.requests[1].method, 'delete');
+        assert.equal(_this.requests[1].method, 'DELETE');
         _this.requests[1].respond(204);
       }, 10);
     }).catch(function (err) {
@@ -35,7 +35,7 @@ describe('DSHttpAdapter.destroyAll(resourceConfig, params, options)', function (
     setTimeout(function () {
       assert.equal(1, _this.requests.length);
       assert.equal(_this.requests[0].url, 'api/posts');
-      assert.equal(_this.requests[0].method, 'delete');
+      assert.equal(_this.requests[0].method, 'DELETE');
       _this.requests[0].respond(204);
     }, 10);
   });

test/destroyAll.spec.js

@@ -18,7 +18,7 @@ describe('DSHttpAdapter.find(resourceConfig, id, options)', function () {
       setTimeout(function () {
         assert.equal(2, _this.requests.length);
         assert.equal(_this.requests[1].url, 'api2/posts/1');
-        assert.equal(_this.requests[1].method, 'get');
+        assert.equal(_this.requests[1].method, 'GET');
         _this.requests[1].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify(p1));
       }, 10);
     }).catch(function (err) {
@@ -29,7 +29,7 @@ describe('DSHttpAdapter.find(resourceConfig, id, options)', function () {
     setTimeout(function () {
       assert.equal(1, _this.requests.length);
       assert.equal(_this.requests[0].url, 'api/posts/1');
-      assert.equal(_this.requests[0].method, 'get');
+      assert.equal(_this.requests[0].method, 'GET');
       _this.requests[0].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify(p1));
     }, 10);
   });
@@ -54,7 +54,7 @@ describe('DSHttpAdapter.find(resourceConfig, id, options)', function () {
     setTimeout(function () {
       assert.equal(1, _this.requests.length);
       assert.equal(_this.requests[0].url, 'api/posts/1?test=test');
-      assert.equal(_this.requests[0].method, 'get');
+      assert.equal(_this.requests[0].method, 'GET');
       assert.deepEqual({
         Authorization: 'test',
         Accept: 'application/json, text/plain, */*'
@@ -83,7 +83,7 @@ describe('DSHttpAdapter.find(resourceConfig, id, options)', function () {
       try {
         assert.equal(1, _this.requests.length);
         assert.equal(_this.requests[0].url, 'api/posts/1');
-        assert.equal(_this.requests[0].method, 'get');
+        assert.equal(_this.requests[0].method, 'GET');
       } catch (err) {
         done(err);
       }

test/find.spec.js

@@ -24,7 +24,7 @@ describe('dsHttpAdapter.findAll(resourceConfig, params, options)', function () {
       setTimeout(function () {
         assert.equal(2, _this.requests.length);
         assert.equal(_this.requests[1].url, 'api2/posts?where=%7B%22author%22:%7B%22%3D%3D%22:%22John%22%7D%7D');
-        assert.equal(_this.requests[1].method, 'get');
+        assert.equal(_this.requests[1].method, 'GET');
         _this.requests[1].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify([p1]));
       }, 10);
     }).catch(function (err) {
@@ -35,7 +35,7 @@ describe('dsHttpAdapter.findAll(resourceConfig, params, options)', function () {
     setTimeout(function () {
       assert.equal(1, _this.requests.length);
       assert.equal(_this.requests[0].url, 'api/posts');
-      assert.equal(_this.requests[0].method, 'get');
+      assert.equal(_this.requests[0].method, 'GET');
       _this.requests[0].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify([p1]));
     }, 10);
   });

test/findAll.spec.js

@@ -18,7 +18,7 @@ describe('DSHttpAdapter.update(resourceConfig, id, attrs, options)', function ()
       setTimeout(function () {
         assert.equal(2, _this.requests.length);
         assert.equal(_this.requests[1].url, 'api2/posts/1');
-        assert.equal(_this.requests[1].method, 'put');
+        assert.equal(_this.requests[1].method, 'PUT');
         assert.equal(_this.requests[1].requestBody, JSON.stringify({ author: 'John', age: 30 }));
         _this.requests[1].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify(p1));
       }, 10);
@@ -30,7 +30,7 @@ describe('DSHttpAdapter.update(resourceConfig, id, attrs, options)', function ()
     setTimeout(function () {
       assert.equal(1, _this.requests.length);
       assert.equal(_this.requests[0].url, 'api/posts/1');
-      assert.equal(_this.requests[0].method, 'put');
+      assert.equal(_this.requests[0].method, 'PUT');
       assert.equal(_this.requests[0].requestBody, JSON.stringify({ author: 'John', age: 30 }));
       _this.requests[0].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify(p1));
     }, 10);