axios - npm Package Compare versions

Comparing version 0.8.1 to 0.9.0

CHANGELOG.md

 # Changelog
 
+### 0.9.0 (Jan 18, 2016)
+
+- Adding support for custom adapters
+- Fixing Content-Type header being removed when data is false ([#195](https://github.com/mzabriskie/axios/pull/195))
+- Improving XDomainRequest implementation ([#185](https://github.com/mzabriskie/axios/pull/185))
+- Improving config merging and order of precedence ([#183](https://github.com/mzabriskie/axios/pull/183))
+- Fixing XDomainRequest support for only <= IE9 ([#182](https://github.com/mzabriskie/axios/pull/182))
+
 ### 0.8.1 (Dec 14, 2015)
@@ -4,0 +12,0 @@

dist/axios.js

@@ -1,2 +0,2 @@
-/* axios v0.8.0 | (c) 2015 by Matt Zabriskie */
+/* axios v0.9.0 | (c) 2016 by Matt Zabriskie */
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -73,11 +73,6 @@ if(typeof exports === 'object' && typeof module === 'object')
 	var bind = __webpack_require__(15);
+	var transformData = __webpack_require__(8);
 	
 	function Axios(defaultConfig) {
-	  this.defaultConfig = utils.merge({
-	    headers: {},
-	    timeout: defaults.timeout,
-	    transformRequest: defaults.transformRequest,
-	    transformResponse: defaults.transformResponse
-	  }, defaultConfig);
-	
+	  this.defaults = utils.merge({}, defaultConfig);
 	  this.interceptors = {
@@ -98,4 +93,5 @@ request: new InterceptorManager(),
 	
-	  config = utils.merge(this.defaultConfig, { method: 'get' }, config);
+	  config = utils.merge(defaults, this.defaults, { method: 'get' }, config);
 	
+	  // Support baseURL config
 	  if (config.baseURL && !isAbsoluteURL(config.url)) {
@@ -106,4 +102,25 @@ config.url = combineURLs(config.baseURL, config.url);
 	  // Don't allow overriding defaults.withCredentials
-	  config.withCredentials = config.withCredentials || defaults.withCredentials;
+	  config.withCredentials = config.withCredentials || this.defaults.withCredentials;
 	
+	  // Transform request data
+	  config.data = transformData(
+	    config.data,
+	    config.headers,
+	    config.transformRequest
+	  );
+	
+	  // Flatten headers
+	  config.headers = utils.merge(
+	    config.headers.common || {},
+	    config.headers[config.method] || {},
+	    config.headers || {}
+	  );
+	
+	  utils.forEach(
+	    ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'],
+	    function cleanHeaderConfig(method) {
+	      delete config.headers[method];
+	    }
+	  );
+	
 	  // Hook up interceptors middleware
@@ -128,4 +145,3 @@ var chain = [dispatchRequest, undefined];
 	
-	var defaultInstance = new Axios();
-	
+	var defaultInstance = new Axios(defaults);
 	var axios = module.exports = bind(Axios.prototype.request, defaultInstance);
@@ -138,3 +154,3 @@
 	// Expose defaults
-	axios.defaults = defaults;
+	axios.defaults = defaultInstance.defaults;
 	
@@ -462,3 +478,7 @@ // Expose all/spread
 	  function assignValue(val, key) {
-	    result[key] = val;
+	    if (typeof result[key] === 'object' && typeof val === 'object') {
+	      result[key] = merge(result[key], val);
+	    } else {
+	      result[key] = val;
+	    }
 	  }
@@ -507,9 +527,18 @@
 	    try {
-	      if ((typeof XMLHttpRequest !== 'undefined') || (typeof ActiveXObject !== 'undefined')) {
+	      var adapter;
+	
+	      if (typeof config.adapter === 'function') {
+	        // For custom adapter support
+	        adapter = config.adapter;
+	      } else if (typeof XMLHttpRequest !== 'undefined') {
 	        // For browsers use XHR adapter
-	        __webpack_require__(5)(resolve, reject, config);
+	        adapter = __webpack_require__(5);
 	      } else if (typeof process !== 'undefined') {
 	        // For node use HTTP adapter
-	        __webpack_require__(5)(resolve, reject, config);
+	        adapter = __webpack_require__(5);
 	      }
+	
+	      if (typeof adapter === 'function') {
+	        adapter(resolve, reject, config);
+	      }
 	    } catch (e) {
@@ -529,5 +558,2 @@ reject(e);
 	
-	/*global ActiveXObject:true*/
-	
-	var defaults = __webpack_require__(2);
 	var utils = __webpack_require__(3);
@@ -541,29 +567,15 @@ var buildURL = __webpack_require__(6);
 	module.exports = function xhrAdapter(resolve, reject, config) {
-	  // Transform request data
-	  var data = transformData(
-	    config.data,
-	    config.headers,
-	    config.transformRequest
-	  );
+	  var requestData = config.data;
+	  var requestHeaders = config.headers;
 	
-	  // Merge headers
-	  var requestHeaders = utils.merge(
-	    defaults.headers.common,
-	    defaults.headers[config.method] || {},
-	    config.headers || {}
-	  );
-	
-	  if (utils.isFormData(data)) {
+	  if (utils.isFormData(requestData)) {
 	    delete requestHeaders['Content-Type']; // Let the browser set it
 	  }
 	
-	  var Adapter = (XMLHttpRequest || ActiveXObject);
-	  var loadEvent = 'onreadystatechange';
-	  var xDomain = false;
+	  var request = new XMLHttpRequest();
 	
 	  // For IE 8/9 CORS support
-	  if (!isURLSameOrigin(config.url) && window.XDomainRequest) {
-	    Adapter = window.XDomainRequest;
-	    loadEvent = 'onload';
-	    xDomain = true;
+	  // Only supports POST and GET calls and doesn't returns the response headers.
+	  if (window.XDomainRequest && !('withCredentials' in request) && !isURLSameOrigin(config.url)) {
+	    request = new window.XDomainRequest();
 	  }
@@ -578,4 +590,2 @@
 	
-	  // Create the request
-	  var request = new Adapter('Microsoft.XMLHTTP');
 	  request.open(config.method.toUpperCase(), buildURL(config.url, config.params, config.paramsSerializer), true);
@@ -587,26 +597,27 @@
 	  // Listen for ready state
-	  request[loadEvent] = function handleReadyState() {
-	    if (request && (request.readyState === 4 || xDomain)) {
-	      // Prepare the response
-	      var responseHeaders = xDomain ? null : parseHeaders(request.getAllResponseHeaders());
-	      var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
-	      var response = {
-	        data: transformData(
-	          responseData,
-	          responseHeaders,
-	          config.transformResponse
-	        ),
-	        status: request.status,
-	        statusText: request.statusText,
-	        headers: responseHeaders,
-	        config: config
-	      };
-	      // Resolve or reject the Promise based on the status
-	      ((request.status >= 200 && request.status < 300) || (xDomain && request.responseText) ?
-	        resolve :
-	        reject)(response);
+	  request.onload = function handleLoad() {
+	    if (!request) {
+	      return;
+	    }
+	    // Prepare the response
+	    var responseHeaders = 'getAllResponseHeaders' in request ? parseHeaders(request.getAllResponseHeaders()) : null;
+	    var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
+	    var response = {
+	      data: transformData(
+	        responseData,
+	        responseHeaders,
+	        config.transformResponse
+	      ),
+	      status: request.status,
+	      statusText: request.statusText,
+	      headers: responseHeaders,
+	      config: config
+	    };
+	    // Resolve or reject the Promise based on the status
+	    ((request.status >= 200 && request.status < 300) || (!('status' in request) && request.responseText) ?
+	      resolve :
+	      reject)(response);
 	
-	      // Clean up request
-	      request = null;
-	    }
+	    // Clean up request
+	    request = null;
 	  };
@@ -621,8 +632,8 @@
 	    // Add xsrf header
-	    var xsrfValue =  config.withCredentials || isURLSameOrigin(config.url) ?
-	        cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
+	    var xsrfValue = config.withCredentials || isURLSameOrigin(config.url) ?
+	        cookies.read(config.xsrfCookieName) :
 	        undefined;
 	
 	    if (xsrfValue) {
-	      requestHeaders[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
+	      requestHeaders[config.xsrfHeaderName] = xsrfValue;
 	    }
@@ -632,5 +643,5 @@ }
 	  // Add headers to the request
-	  if (!xDomain) {
+	  if ('setRequestHeader' in request) {
 	    utils.forEach(requestHeaders, function setRequestHeader(val, key) {
-	      if (!data && key.toLowerCase() === 'content-type') {
+	      if (typeof requestData === 'undefined' && key.toLowerCase() === 'content-type') {
 	        // Remove Content-Type if data is undefined
@@ -661,8 +672,8 @@ delete requestHeaders[key];
 	
-	  if (utils.isArrayBuffer(data)) {
-	    data = new DataView(data);
+	  if (utils.isArrayBuffer(requestData)) {
+	    requestData = new DataView(requestData);
 	  }
 	
 	  // Send the request
-	  request.send(data);
+	  request.send(requestData);
 	};
@@ -669,0 +680,0 @@

dist/axios.min.js

@@ -1,3 +0,3 @@
-/* axios v0.8.0 | (c) 2015 by Matt Zabriskie */
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.axios=t():e.axios=t()}(this,function(){return function(e){function t(n){if(r[n])return r[n].exports;var o=r[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var r={};return t.m=e,t.c=r,t.p="",t(0)}([function(e,t,r){e.exports=r(1)},function(e,t,r){"use strict";function n(e){this.defaultConfig=i.merge({headers:{},timeout:o.timeout,transformRequest:o.transformRequest,transformResponse:o.transformResponse},e),this.interceptors={request:new u,response:new u}}var o=r(2),i=r(3),s=r(4),u=r(12),a=r(13),c=r(14),f=r(15);n.prototype.request=function(e){"string"==typeof e&&(e=i.merge({url:arguments[0]},arguments[1])),e=i.merge(this.defaultConfig,{method:"get"},e),e.baseURL&&!a(e.url)&&(e.url=c(e.baseURL,e.url)),e.withCredentials=e.withCredentials||o.withCredentials;var t=[s,void 0],r=Promise.resolve(e);for(this.interceptors.request.forEach(function(e){t.unshift(e.fulfilled,e.rejected)}),this.interceptors.response.forEach(function(e){t.push(e.fulfilled,e.rejected)});t.length;)r=r.then(t.shift(),t.shift());return r};var p=new n,l=e.exports=f(n.prototype.request,p);l.create=function(e){return new n(e)},l.defaults=o,l.all=function(e){return Promise.all(e)},l.spread=r(16),l.interceptors=p.interceptors,i.forEach(["delete","get","head"],function(e){n.prototype[e]=function(t,r){return this.request(i.merge(r||{},{method:e,url:t}))},l[e]=f(n.prototype[e],p)}),i.forEach(["post","put","patch"],function(e){n.prototype[e]=function(t,r,n){return this.request(i.merge(n||{},{method:e,url:t,data:r}))},l[e]=f(n.prototype[e],p)})},function(e,t,r){"use strict";var n=r(3),o=/^\)\]\}',?\n/,i={"Content-Type":"application/x-www-form-urlencoded"};e.exports={transformRequest:[function(e,t){return n.isFormData(e)?e:n.isArrayBuffer(e)?e:n.isArrayBufferView(e)?e.buffer:!n.isObject(e)||n.isFile(e)||n.isBlob(e)?e:(n.isUndefined(t)||(n.forEach(t,function(e,r){"content-type"===r.toLowerCase()&&(t["Content-Type"]=e)}),n.isUndefined(t["Content-Type"])&&(t["Content-Type"]="application/json;charset=utf-8")),JSON.stringify(e))}],transformResponse:[function(e){if("string"==typeof e){e=e.replace(o,"");try{e=JSON.parse(e)}catch(t){}}return e}],headers:{common:{Accept:"application/json, text/plain, */*"},patch:n.merge(i),post:n.merge(i),put:n.merge(i)},timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN"}},function(e,t){"use strict";function r(e){return"[object Array]"===g.call(e)}function n(e){return"[object ArrayBuffer]"===g.call(e)}function o(e){return"[object FormData]"===g.call(e)}function i(e){var t;return t="undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(e):e&&e.buffer&&e.buffer instanceof ArrayBuffer}function s(e){return"string"==typeof e}function u(e){return"number"==typeof e}function a(e){return"undefined"==typeof e}function c(e){return null!==e&&"object"==typeof e}function f(e){return"[object Date]"===g.call(e)}function p(e){return"[object File]"===g.call(e)}function l(e){return"[object Blob]"===g.call(e)}function d(e){return e.replace(/^\s*/,"").replace(/\s*$/,"")}function h(){return"undefined"!=typeof window&&"undefined"!=typeof document&&"function"==typeof document.createElement}function m(e,t){if(null!==e&&"undefined"!=typeof e)if("object"==typeof e||r(e)||(e=[e]),r(e))for(var n=0,o=e.length;o>n;n++)t.call(null,e[n],n,e);else for(var i in e)e.hasOwnProperty(i)&&t.call(null,e[i],i,e)}function y(){function e(e,r){t[r]=e}for(var t={},r=0,n=arguments.length;n>r;r++)m(arguments[r],e);return t}var g=Object.prototype.toString;e.exports={isArray:r,isArrayBuffer:n,isFormData:o,isArrayBufferView:i,isString:s,isNumber:u,isObject:c,isUndefined:a,isDate:f,isFile:p,isBlob:l,isStandardBrowserEnv:h,forEach:m,merge:y,trim:d}},function(e,t,r){"use strict";e.exports=function(e){return new Promise(function(t,n){try{"undefined"!=typeof XMLHttpRequest||"undefined"!=typeof ActiveXObject?r(5)(t,n,e):"undefined"!=typeof process&&r(5)(t,n,e)}catch(o){n(o)}})}},function(e,t,r){"use strict";var n=r(2),o=r(3),i=r(6),s=r(7),u=r(8),a=r(9),c=window.btoa||r(10);e.exports=function(e,t,f){var p=u(f.data,f.headers,f.transformRequest),l=o.merge(n.headers.common,n.headers[f.method]||{},f.headers||{});o.isFormData(p)&&delete l["Content-Type"];var d=XMLHttpRequest||ActiveXObject,h="onreadystatechange",m=!1;if(!a(f.url)&&window.XDomainRequest&&(d=window.XDomainRequest,h="onload",m=!0),f.auth){var y=f.auth.username||"",g=f.auth.password||"";l.Authorization="Basic "+c(y+":"+g)}var w=new d("Microsoft.XMLHTTP");if(w.open(f.method.toUpperCase(),i(f.url,f.params,f.paramsSerializer),!0),w.timeout=f.timeout,w[h]=function(){if(w&&(4===w.readyState||m)){var r=m?null:s(w.getAllResponseHeaders()),n=-1!==["text",""].indexOf(f.responseType||"")?w.responseText:w.response,o={data:u(n,r,f.transformResponse),status:w.status,statusText:w.statusText,headers:r,config:f};(w.status>=200&&w.status<300||m&&w.responseText?e:t)(o),w=null}},o.isStandardBrowserEnv()){var v=r(11),x=f.withCredentials||a(f.url)?v.read(f.xsrfCookieName||n.xsrfCookieName):void 0;x&&(l[f.xsrfHeaderName||n.xsrfHeaderName]=x)}if(m||o.forEach(l,function(e,t){p||"content-type"!==t.toLowerCase()?w.setRequestHeader(t,e):delete l[t]}),f.withCredentials&&(w.withCredentials=!0),f.responseType)try{w.responseType=f.responseType}catch(b){if("json"!==w.responseType)throw b}o.isArrayBuffer(p)&&(p=new DataView(p)),w.send(p)}},function(e,t,r){"use strict";function n(e){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}var o=r(3);e.exports=function(e,t,r){if(!t)return e;var i;if(r)i=r(t);else{var s=[];o.forEach(t,function(e,t){null!==e&&"undefined"!=typeof e&&(o.isArray(e)&&(t+="[]"),o.isArray(e)||(e=[e]),o.forEach(e,function(e){o.isDate(e)?e=e.toISOString():o.isObject(e)&&(e=JSON.stringify(e)),s.push(n(t)+"="+n(e))}))}),i=s.join("&")}return i&&(e+=(-1===e.indexOf("?")?"?":"&")+i),e}},function(e,t,r){"use strict";var n=r(3);e.exports=function(e){var t,r,o,i={};return e?(n.forEach(e.split("\n"),function(e){o=e.indexOf(":"),t=n.trim(e.substr(0,o)).toLowerCase(),r=n.trim(e.substr(o+1)),t&&(i[t]=i[t]?i[t]+", "+r:r)}),i):i}},function(e,t,r){"use strict";var n=r(3);e.exports=function(e,t,r){return n.forEach(r,function(r){e=r(e,t)}),e}},function(e,t,r){"use strict";var n=r(3);e.exports=n.isStandardBrowserEnv()?function(){function e(e){var t=e;return r&&(o.setAttribute("href",t),t=o.href),o.setAttribute("href",t),{href:o.href,protocol:o.protocol?o.protocol.replace(/:$/,""):"",host:o.host,search:o.search?o.search.replace(/^\?/,""):"",hash:o.hash?o.hash.replace(/^#/,""):"",hostname:o.hostname,port:o.port,pathname:"/"===o.pathname.charAt(0)?o.pathname:"/"+o.pathname}}var t,r=/(msie|trident)/i.test(navigator.userAgent),o=document.createElement("a");return t=e(window.location.href),function(r){var o=n.isString(r)?e(r):r;return o.protocol===t.protocol&&o.host===t.host}}():function(){return function(){return!0}}()},function(e,t){"use strict";function r(e){this.message=e}function n(e){for(var t,n,i=String(e),s="",u=0,a=o;i.charAt(0|u)||(a="=",u%1);s+=a.charAt(63&t>>8-u%1*8)){if(n=i.charCodeAt(u+=.75),n>255)throw new r("INVALID_CHARACTER_ERR: DOM Exception 5");t=t<<8|n}return s}var o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";r.prototype=new Error,r.prototype.code=5,r.prototype.name="InvalidCharacterError",e.exports=n},function(e,t,r){"use strict";var n=r(3);e.exports=n.isStandardBrowserEnv()?function(){return{write:function(e,t,r,o,i,s){var u=[];u.push(e+"="+encodeURIComponent(t)),n.isNumber(r)&&u.push("expires="+new Date(r).toGMTString()),n.isString(o)&&u.push("path="+o),n.isString(i)&&u.push("domain="+i),s===!0&&u.push("secure"),document.cookie=u.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}}():function(){return{write:function(){},read:function(){return null},remove:function(){}}}()},function(e,t,r){"use strict";function n(){this.handlers=[]}var o=r(3);n.prototype.use=function(e,t){return this.handlers.push({fulfilled:e,rejected:t}),this.handlers.length-1},n.prototype.eject=function(e){this.handlers[e]&&(this.handlers[e]=null)},n.prototype.forEach=function(e){o.forEach(this.handlers,function(t){null!==t&&e(t)})},e.exports=n},function(e,t){"use strict";e.exports=function(e){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(e)}},function(e,t){"use strict";e.exports=function(e,t){return e.replace(/\/+$/,"")+"/"+t.replace(/^\/+/,"")}},function(e,t){"use strict";e.exports=function(e,t){return function(){for(var r=new Array(arguments.length),n=0;n<r.length;n++)r[n]=arguments[n];return e.apply(t,r)}}},function(e,t){"use strict";e.exports=function(e){return function(t){return e.apply(null,t)}}}])});
+/* axios v0.9.0 | (c) 2016 by Matt Zabriskie */
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.axios=t():e.axios=t()}(this,function(){return function(e){function t(n){if(r[n])return r[n].exports;var o=r[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var r={};return t.m=e,t.c=r,t.p="",t(0)}([function(e,t,r){e.exports=r(1)},function(e,t,r){"use strict";function n(e){this.defaults=i.merge({},e),this.interceptors={request:new u,response:new u}}var o=r(2),i=r(3),s=r(4),u=r(12),a=r(13),c=r(14),f=r(15),p=r(8);n.prototype.request=function(e){"string"==typeof e&&(e=i.merge({url:arguments[0]},arguments[1])),e=i.merge(o,this.defaults,{method:"get"},e),e.baseURL&&!a(e.url)&&(e.url=c(e.baseURL,e.url)),e.withCredentials=e.withCredentials||this.defaults.withCredentials,e.data=p(e.data,e.headers,e.transformRequest),e.headers=i.merge(e.headers.common||{},e.headers[e.method]||{},e.headers||{}),i.forEach(["delete","get","head","post","put","patch","common"],function(t){delete e.headers[t]});var t=[s,void 0],r=Promise.resolve(e);for(this.interceptors.request.forEach(function(e){t.unshift(e.fulfilled,e.rejected)}),this.interceptors.response.forEach(function(e){t.push(e.fulfilled,e.rejected)});t.length;)r=r.then(t.shift(),t.shift());return r};var l=new n(o),d=e.exports=f(n.prototype.request,l);d.create=function(e){return new n(e)},d.defaults=l.defaults,d.all=function(e){return Promise.all(e)},d.spread=r(16),d.interceptors=l.interceptors,i.forEach(["delete","get","head"],function(e){n.prototype[e]=function(t,r){return this.request(i.merge(r||{},{method:e,url:t}))},d[e]=f(n.prototype[e],l)}),i.forEach(["post","put","patch"],function(e){n.prototype[e]=function(t,r,n){return this.request(i.merge(n||{},{method:e,url:t,data:r}))},d[e]=f(n.prototype[e],l)})},function(e,t,r){"use strict";var n=r(3),o=/^\)\]\}',?\n/,i={"Content-Type":"application/x-www-form-urlencoded"};e.exports={transformRequest:[function(e,t){return n.isFormData(e)?e:n.isArrayBuffer(e)?e:n.isArrayBufferView(e)?e.buffer:!n.isObject(e)||n.isFile(e)||n.isBlob(e)?e:(n.isUndefined(t)||(n.forEach(t,function(e,r){"content-type"===r.toLowerCase()&&(t["Content-Type"]=e)}),n.isUndefined(t["Content-Type"])&&(t["Content-Type"]="application/json;charset=utf-8")),JSON.stringify(e))}],transformResponse:[function(e){if("string"==typeof e){e=e.replace(o,"");try{e=JSON.parse(e)}catch(t){}}return e}],headers:{common:{Accept:"application/json, text/plain, */*"},patch:n.merge(i),post:n.merge(i),put:n.merge(i)},timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN"}},function(e,t){"use strict";function r(e){return"[object Array]"===w.call(e)}function n(e){return"[object ArrayBuffer]"===w.call(e)}function o(e){return"[object FormData]"===w.call(e)}function i(e){var t;return t="undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(e):e&&e.buffer&&e.buffer instanceof ArrayBuffer}function s(e){return"string"==typeof e}function u(e){return"number"==typeof e}function a(e){return"undefined"==typeof e}function c(e){return null!==e&&"object"==typeof e}function f(e){return"[object Date]"===w.call(e)}function p(e){return"[object File]"===w.call(e)}function l(e){return"[object Blob]"===w.call(e)}function d(e){return e.replace(/^\s*/,"").replace(/\s*$/,"")}function h(){return"undefined"!=typeof window&&"undefined"!=typeof document&&"function"==typeof document.createElement}function m(e,t){if(null!==e&&"undefined"!=typeof e)if("object"==typeof e||r(e)||(e=[e]),r(e))for(var n=0,o=e.length;o>n;n++)t.call(null,e[n],n,e);else for(var i in e)e.hasOwnProperty(i)&&t.call(null,e[i],i,e)}function y(){function e(e,r){"object"==typeof t[r]&&"object"==typeof e?t[r]=y(t[r],e):t[r]=e}for(var t={},r=0,n=arguments.length;n>r;r++)m(arguments[r],e);return t}var w=Object.prototype.toString;e.exports={isArray:r,isArrayBuffer:n,isFormData:o,isArrayBufferView:i,isString:s,isNumber:u,isObject:c,isUndefined:a,isDate:f,isFile:p,isBlob:l,isStandardBrowserEnv:h,forEach:m,merge:y,trim:d}},function(e,t,r){"use strict";e.exports=function(e){return new Promise(function(t,n){try{var o;"function"==typeof e.adapter?o=e.adapter:"undefined"!=typeof XMLHttpRequest?o=r(5):"undefined"!=typeof process&&(o=r(5)),"function"==typeof o&&o(t,n,e)}catch(i){n(i)}})}},function(e,t,r){"use strict";var n=r(3),o=r(6),i=r(7),s=r(8),u=r(9),a=window.btoa||r(10);e.exports=function(e,t,c){var f=c.data,p=c.headers;n.isFormData(f)&&delete p["Content-Type"];var l=new XMLHttpRequest;if(!window.XDomainRequest||"withCredentials"in l||u(c.url)||(l=new window.XDomainRequest),c.auth){var d=c.auth.username||"",h=c.auth.password||"";p.Authorization="Basic "+a(d+":"+h)}if(l.open(c.method.toUpperCase(),o(c.url,c.params,c.paramsSerializer),!0),l.timeout=c.timeout,l.onload=function(){if(l){var r="getAllResponseHeaders"in l?i(l.getAllResponseHeaders()):null,n=-1!==["text",""].indexOf(c.responseType||"")?l.responseText:l.response,o={data:s(n,r,c.transformResponse),status:l.status,statusText:l.statusText,headers:r,config:c};(l.status>=200&&l.status<300||!("status"in l)&&l.responseText?e:t)(o),l=null}},n.isStandardBrowserEnv()){var m=r(11),y=c.withCredentials||u(c.url)?m.read(c.xsrfCookieName):void 0;y&&(p[c.xsrfHeaderName]=y)}if("setRequestHeader"in l&&n.forEach(p,function(e,t){"undefined"==typeof f&&"content-type"===t.toLowerCase()?delete p[t]:l.setRequestHeader(t,e)}),c.withCredentials&&(l.withCredentials=!0),c.responseType)try{l.responseType=c.responseType}catch(w){if("json"!==l.responseType)throw w}n.isArrayBuffer(f)&&(f=new DataView(f)),l.send(f)}},function(e,t,r){"use strict";function n(e){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}var o=r(3);e.exports=function(e,t,r){if(!t)return e;var i;if(r)i=r(t);else{var s=[];o.forEach(t,function(e,t){null!==e&&"undefined"!=typeof e&&(o.isArray(e)&&(t+="[]"),o.isArray(e)||(e=[e]),o.forEach(e,function(e){o.isDate(e)?e=e.toISOString():o.isObject(e)&&(e=JSON.stringify(e)),s.push(n(t)+"="+n(e))}))}),i=s.join("&")}return i&&(e+=(-1===e.indexOf("?")?"?":"&")+i),e}},function(e,t,r){"use strict";var n=r(3);e.exports=function(e){var t,r,o,i={};return e?(n.forEach(e.split("\n"),function(e){o=e.indexOf(":"),t=n.trim(e.substr(0,o)).toLowerCase(),r=n.trim(e.substr(o+1)),t&&(i[t]=i[t]?i[t]+", "+r:r)}),i):i}},function(e,t,r){"use strict";var n=r(3);e.exports=function(e,t,r){return n.forEach(r,function(r){e=r(e,t)}),e}},function(e,t,r){"use strict";var n=r(3);e.exports=n.isStandardBrowserEnv()?function(){function e(e){var t=e;return r&&(o.setAttribute("href",t),t=o.href),o.setAttribute("href",t),{href:o.href,protocol:o.protocol?o.protocol.replace(/:$/,""):"",host:o.host,search:o.search?o.search.replace(/^\?/,""):"",hash:o.hash?o.hash.replace(/^#/,""):"",hostname:o.hostname,port:o.port,pathname:"/"===o.pathname.charAt(0)?o.pathname:"/"+o.pathname}}var t,r=/(msie|trident)/i.test(navigator.userAgent),o=document.createElement("a");return t=e(window.location.href),function(r){var o=n.isString(r)?e(r):r;return o.protocol===t.protocol&&o.host===t.host}}():function(){return function(){return!0}}()},function(e,t){"use strict";function r(e){this.message=e}function n(e){for(var t,n,i=String(e),s="",u=0,a=o;i.charAt(0|u)||(a="=",u%1);s+=a.charAt(63&t>>8-u%1*8)){if(n=i.charCodeAt(u+=.75),n>255)throw new r("INVALID_CHARACTER_ERR: DOM Exception 5");t=t<<8|n}return s}var o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";r.prototype=new Error,r.prototype.code=5,r.prototype.name="InvalidCharacterError",e.exports=n},function(e,t,r){"use strict";var n=r(3);e.exports=n.isStandardBrowserEnv()?function(){return{write:function(e,t,r,o,i,s){var u=[];u.push(e+"="+encodeURIComponent(t)),n.isNumber(r)&&u.push("expires="+new Date(r).toGMTString()),n.isString(o)&&u.push("path="+o),n.isString(i)&&u.push("domain="+i),s===!0&&u.push("secure"),document.cookie=u.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}}():function(){return{write:function(){},read:function(){return null},remove:function(){}}}()},function(e,t,r){"use strict";function n(){this.handlers=[]}var o=r(3);n.prototype.use=function(e,t){return this.handlers.push({fulfilled:e,rejected:t}),this.handlers.length-1},n.prototype.eject=function(e){this.handlers[e]&&(this.handlers[e]=null)},n.prototype.forEach=function(e){o.forEach(this.handlers,function(t){null!==t&&e(t)})},e.exports=n},function(e,t){"use strict";e.exports=function(e){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(e)}},function(e,t){"use strict";e.exports=function(e,t){return e.replace(/\/+$/,"")+"/"+t.replace(/^\/+/,"")}},function(e,t){"use strict";e.exports=function(e,t){return function(){for(var r=new Array(arguments.length),n=0;n<r.length;n++)r[n]=arguments[n];return e.apply(t,r)}}},function(e,t){"use strict";e.exports=function(e){return function(t){return e.apply(null,t)}}}])});
 //# sourceMappingURL=axios.min.map

lib/adapters/http.js

 'use strict';
 
-var defaults = require('./../defaults');
 var utils = require('./../utils');
@@ -15,16 +14,5 @@ var buildURL = require('./../helpers/buildURL');
 module.exports = function httpAdapter(resolve, reject, config) {
-  // Transform request data
-  var data = transformData(
-    config.data,
-    config.headers,
-    config.transformRequest
-  );
+  var data = config.data;
+  var headers = config.headers;
 
-  // Merge headers
-  var headers = utils.merge(
-    defaults.headers.common,
-    defaults.headers[config.method] || {},
-    config.headers || {}
-  );
-
   // Set User-Agent (required by some servers)
@@ -31,0 +19,0 @@ // Only set header if it hasn't been set in config

lib/adapters/xhr.js

 'use strict';
 
-/*global ActiveXObject:true*/
-
-var defaults = require('./../defaults');
 var utils = require('./../utils');
@@ -14,29 +11,15 @@ var buildURL = require('./../helpers/buildURL');
 module.exports = function xhrAdapter(resolve, reject, config) {
-  // Transform request data
-  var data = transformData(
-    config.data,
-    config.headers,
-    config.transformRequest
-  );
+  var requestData = config.data;
+  var requestHeaders = config.headers;
 
-  // Merge headers
-  var requestHeaders = utils.merge(
-    defaults.headers.common,
-    defaults.headers[config.method] || {},
-    config.headers || {}
-  );
-
-  if (utils.isFormData(data)) {
+  if (utils.isFormData(requestData)) {
     delete requestHeaders['Content-Type']; // Let the browser set it
   }
 
-  var Adapter = (XMLHttpRequest || ActiveXObject);
-  var loadEvent = 'onreadystatechange';
-  var xDomain = false;
+  var request = new XMLHttpRequest();
 
   // For IE 8/9 CORS support
-  if (!isURLSameOrigin(config.url) && window.XDomainRequest) {
-    Adapter = window.XDomainRequest;
-    loadEvent = 'onload';
-    xDomain = true;
+  // Only supports POST and GET calls and doesn't returns the response headers.
+  if (window.XDomainRequest && !('withCredentials' in request) && !isURLSameOrigin(config.url)) {
+    request = new window.XDomainRequest();
   }
@@ -51,4 +34,2 @@
 
-  // Create the request
-  var request = new Adapter('Microsoft.XMLHTTP');
   request.open(config.method.toUpperCase(), buildURL(config.url, config.params, config.paramsSerializer), true);
@@ -60,26 +41,27 @@
   // Listen for ready state
-  request[loadEvent] = function handleReadyState() {
-    if (request && (request.readyState === 4 || xDomain)) {
-      // Prepare the response
-      var responseHeaders = xDomain ? null : parseHeaders(request.getAllResponseHeaders());
-      var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
-      var response = {
-        data: transformData(
-          responseData,
-          responseHeaders,
-          config.transformResponse
-        ),
-        status: request.status,
-        statusText: request.statusText,
-        headers: responseHeaders,
-        config: config
-      };
-      // Resolve or reject the Promise based on the status
-      ((request.status >= 200 && request.status < 300) || (xDomain && request.responseText) ?
-        resolve :
-        reject)(response);
+  request.onload = function handleLoad() {
+    if (!request) {
+      return;
+    }
+    // Prepare the response
+    var responseHeaders = 'getAllResponseHeaders' in request ? parseHeaders(request.getAllResponseHeaders()) : null;
+    var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
+    var response = {
+      data: transformData(
+        responseData,
+        responseHeaders,
+        config.transformResponse
+      ),
+      status: request.status,
+      statusText: request.statusText,
+      headers: responseHeaders,
+      config: config
+    };
+    // Resolve or reject the Promise based on the status
+    ((request.status >= 200 && request.status < 300) || (!('status' in request) && request.responseText) ?
+      resolve :
+      reject)(response);
 
-      // Clean up request
-      request = null;
-    }
+    // Clean up request
+    request = null;
   };
@@ -94,8 +76,8 @@
     // Add xsrf header
-    var xsrfValue =  config.withCredentials || isURLSameOrigin(config.url) ?
-        cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
+    var xsrfValue = config.withCredentials || isURLSameOrigin(config.url) ?
+        cookies.read(config.xsrfCookieName) :
         undefined;
 
     if (xsrfValue) {
-      requestHeaders[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
+      requestHeaders[config.xsrfHeaderName] = xsrfValue;
     }
@@ -105,5 +87,5 @@ }
   // Add headers to the request
-  if (!xDomain) {
+  if ('setRequestHeader' in request) {
     utils.forEach(requestHeaders, function setRequestHeader(val, key) {
-      if (!data && key.toLowerCase() === 'content-type') {
+      if (typeof requestData === 'undefined' && key.toLowerCase() === 'content-type') {
         // Remove Content-Type if data is undefined
@@ -134,8 +116,8 @@ delete requestHeaders[key];
 
-  if (utils.isArrayBuffer(data)) {
-    data = new DataView(data);
+  if (utils.isArrayBuffer(requestData)) {
+    requestData = new DataView(requestData);
   }
 
   // Send the request
-  request.send(data);
+  request.send(requestData);
 };

lib/axios.js

@@ -10,11 +10,6 @@ 'use strict';
 var bind = require('./helpers/bind');
+var transformData = require('./helpers/transformData');
 
 function Axios(defaultConfig) {
-  this.defaultConfig = utils.merge({
-    headers: {},
-    timeout: defaults.timeout,
-    transformRequest: defaults.transformRequest,
-    transformResponse: defaults.transformResponse
-  }, defaultConfig);
-
+  this.defaults = utils.merge({}, defaultConfig);
   this.interceptors = {
@@ -35,4 +30,5 @@ request: new InterceptorManager(),
 
-  config = utils.merge(this.defaultConfig, { method: 'get' }, config);
+  config = utils.merge(defaults, this.defaults, { method: 'get' }, config);
 
+  // Support baseURL config
   if (config.baseURL && !isAbsoluteURL(config.url)) {
@@ -43,4 +39,25 @@ config.url = combineURLs(config.baseURL, config.url);
   // Don't allow overriding defaults.withCredentials
-  config.withCredentials = config.withCredentials || defaults.withCredentials;
+  config.withCredentials = config.withCredentials || this.defaults.withCredentials;
 
+  // Transform request data
+  config.data = transformData(
+    config.data,
+    config.headers,
+    config.transformRequest
+  );
+
+  // Flatten headers
+  config.headers = utils.merge(
+    config.headers.common || {},
+    config.headers[config.method] || {},
+    config.headers || {}
+  );
+
+  utils.forEach(
+    ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'],
+    function cleanHeaderConfig(method) {
+      delete config.headers[method];
+    }
+  );
+
   // Hook up interceptors middleware
@@ -65,4 +82,3 @@ var chain = [dispatchRequest, undefined];
 
-var defaultInstance = new Axios();
-
+var defaultInstance = new Axios(defaults);
 var axios = module.exports = bind(Axios.prototype.request, defaultInstance);
@@ -75,3 +91,3 @@
 // Expose defaults
-axios.defaults = defaults;
+axios.defaults = defaultInstance.defaults;
 
@@ -78,0 +94,0 @@ // Expose all/spread

lib/core/dispatchRequest.js

@@ -13,9 +13,18 @@ 'use strict';
     try {
-      if ((typeof XMLHttpRequest !== 'undefined') || (typeof ActiveXObject !== 'undefined')) {
+      var adapter;
+
+      if (typeof config.adapter === 'function') {
+        // For custom adapter support
+        adapter = config.adapter;
+      } else if (typeof XMLHttpRequest !== 'undefined') {
         // For browsers use XHR adapter
-        require('../adapters/xhr')(resolve, reject, config);
+        adapter = require('../adapters/xhr');
       } else if (typeof process !== 'undefined') {
         // For node use HTTP adapter
-        require('../adapters/http')(resolve, reject, config);
+        adapter = require('../adapters/http');
       }
+
+      if (typeof adapter === 'function') {
+        adapter(resolve, reject, config);
+      }
     } catch (e) {
@@ -22,0 +31,0 @@ reject(e);

lib/utils.js

@@ -215,3 +215,7 @@ 'use strict';
   function assignValue(val, key) {
-    result[key] = val;
+    if (typeof result[key] === 'object' && typeof val === 'object') {
+      result[key] = merge(result[key], val);
+    } else {
+      result[key] = val;
+    }
   }
@@ -218,0 +222,0 @@

package.json

 {
   "name": "axios",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Promise based HTTP client for the browser and node.js",
@@ -31,30 +31,30 @@ "main": "index.js",
   "devDependencies": {
-    "coveralls": "2.11.4",
+    "coveralls": "2.11.6",
     "es6-promise": "3.0.2",
     "grunt": "0.4.5",
-    "grunt-banner": "0.5.0",
+    "grunt-banner": "0.6.0",
     "grunt-cli": "0.1.13",
-    "grunt-contrib-clean": "0.6.0",
+    "grunt-contrib-clean": "0.7.0",
     "grunt-contrib-nodeunit": "0.4.1",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-eslint": "17.2.0",
+    "grunt-eslint": "17.3.1",
     "grunt-karma": "0.12.1",
-    "grunt-ts": "5.0.0-beta.5",
-    "grunt-update-json": "0.2.1",
+    "grunt-ts": "5.3.2",
+    "grunt-update-json": "0.2.2",
     "grunt-webpack": "1.0.11",
     "istanbul-instrumenter-loader": "^0.1.3",
-    "jasmine-core": "2.3.4",
-    "karma": "0.13.10",
-    "karma-coverage": "0.5.2",
+    "jasmine-core": "2.4.1",
+    "karma": "0.13.19",
+    "karma-coverage": "0.5.3",
     "karma-jasmine": "0.3.6",
     "karma-jasmine-ajax": "0.1.13",
-    "karma-phantomjs-launcher": "0.2.1",
+    "karma-phantomjs-launcher": "0.2.3",
     "karma-sinon": "1.0.4",
-    "karma-sourcemap-loader": "0.3.5",
+    "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "1.7.0",
-    "load-grunt-tasks": "3.3.0",
+    "load-grunt-tasks": "3.4.0",
     "minimist": "1.2.0",
-    "phantomjs": "1.9.18",
-    "webpack": "1.12.2",
-    "webpack-dev-server": "1.12.0"
+    "phantomjs": "1.9.19",
+    "webpack": "1.12.11",
+    "webpack-dev-server": "1.14.1"
   },
@@ -61,0 +61,0 @@ "browser": {

README.md

@@ -170,2 +170,5 @@ # axios
   
+  // `method` is the request method to be used when making the request
+  method: 'get', // default
+
   // `baseURL` will be prepended to `url` unless `url` is absolute. 
@@ -176,5 +179,2 @@ // It can be convenient to set `baseURL` for an instance of axios to pass relative URLs
 
-  // `method` is the request method to be used when making the request
-  method: 'get', // default
-
   // `transformRequest` allows changes to the request data before it is sent to the server
@@ -226,2 +226,8 @@ // This is only applicable for request methods 'PUT', 'POST', and 'PATCH'
 
+  // `adapter` allows custom handling of requests which makes testing easier.
+  // Call `resolve` or `reject` and supply a valid response (see [response docs](#response-api)).
+  adapter: function (resolve, reject, config) {
+    /* ... */
+  },
+
   // `auth` indicates that HTTP Basic auth should be used, and supplies credentials.
@@ -228,0 +234,0 @@ // This will set an `Authorization` header, overwriting any existing

No alert changes

Improved metrics

Total package byte prevSize

206750

increased by1.38%

Number of package files

31

increased by3.33%

Lines of code

2013

increased by0.55%

Number of lines in readme file

367

increased by1.66%

No dependency changes