axios 0.9.0 → 0.11.1

package/lib/adapters/xhr.js

@@ -5,7 +5,8 @@ var buildURL = require('./../helpers/buildURL');
 var parseHeaders = require('./../helpers/parseHeaders');
 var transformData = require('./../helpers/transformData');
 var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
-var btoa = window.btoa || require('./../helpers/btoa');
+var btoa = (typeof window !== 'undefined' && window.btoa) || require('./../helpers/btoa');
+var settle = require('../helpers/settle');
 
 module.exports = function xhrAdapter(resolve, reject, config) {
   var requestData = config.data;
@@ -16,11 +17,18 @@ module.exports = function xhrAdapter(resolve, reject, config) {
   }
 
   var request = new XMLHttpRequest();
+  var loadEvent = 'onreadystatechange';
+  var xDomain = false;
 
   // For IE 8/9 CORS support
   // Only supports POST and GET calls and doesn't returns the response headers.
-  if (window.XDomainRequest && !('withCredentials' in request) && !isURLSameOrigin(config.url)) {
+  // DON'T do this for testing b/c XMLHttpRequest is mocked, not XDomainRequest.
+  if (process.env.NODE_ENV !== 'test' && typeof window !== 'undefined' && window.XDomainRequest && !('withCredentials' in request) && !isURLSameOrigin(config.url)) {
     request = new window.XDomainRequest();
+    loadEvent = 'onload';
+    xDomain = true;
+    request.onprogress = function handleProgress() {};
+    request.ontimeout = function handleTimeout() {};
   }
 
   // HTTP basic authentication
@@ -36,28 +44,56 @@ module.exports = function xhrAdapter(resolve, reject, config) {
   request.timeout = config.timeout;
 
   // Listen for ready state
-  request.onload = function handleLoad() {
-    if (!request) {
+  request[loadEvent] = function handleLoad() {
+    if (!request || (request.readyState !== 4 && !xDomain)) {
       return;
     }
+
+    // The request errored out and we didn't get a response, this will be
+    // handled by onerror instead
+    if (request.status === 0) {
+      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 responseData = !config.responseType || config.responseType === 'text' ? request.responseText : request.response;
     var response = {
       data: transformData(
         responseData,
         responseHeaders,
         config.transformResponse
       ),
-      status: request.status,
-      statusText: request.statusText,
+      // IE sends 1223 instead of 204 (https://github.com/mzabriskie/axios/issues/201)
+      status: request.status === 1223 ? 204 : request.status,
+      statusText: request.status === 1223 ? 'No Content' : request.statusText,
       headers: responseHeaders,
-      config: config
+      config: config,
+      request: request
     };
-    // Resolve or reject the Promise based on the status
-    ((request.status >= 200 && request.status < 300) || (!('status' in request) && request.responseText) ?
-      resolve :
-      reject)(response);
+
+    settle(resolve, reject, response);
+
+    // Clean up request
+    request = null;
+  };
+
+  // Handle low level network errors
+  request.onerror = function handleError() {
+    // Real errors are hidden from us by the browser
+    // onerror should only fire if it's a network error
+    reject(new Error('Network Error'));
+
+    // Clean up request
+    request = null;
+  };
+
+  // Handle timeout
+  request.ontimeout = function handleTimeout() {
+    var err = new Error('timeout of ' + config.timeout + 'ms exceeded');
+    err.timeout = config.timeout;
+    err.code = 'ECONNABORTED';
+    reject(err);
 
     // Clean up request
     request = null;
@@ -108,8 +144,17 @@ module.exports = function xhrAdapter(resolve, reject, config) {
     }
   }
 
-  if (utils.isArrayBuffer(requestData)) {
-    requestData = new DataView(requestData);
+  // Handle progress if needed
+  if (config.progress) {
+    if (config.method === 'post' || config.method === 'put') {
+      request.upload.addEventListener('progress', config.progress);
+    } else if (config.method === 'get') {
+      request.addEventListener('progress', config.progress);
+    }
+  }
+
+  if (requestData === undefined) {
+    requestData = null;
   }
 
   // Send the request

package/lib/axios.js

@@ -78,23 +78,23 @@ Axios.prototype.request = function request(config) {
 
 var defaultInstance = new Axios(defaults);
 var axios = module.exports = bind(Axios.prototype.request, defaultInstance);
+module.exports.Axios = Axios;
 
+// Expose properties from defaultInstance
+axios.defaults = defaultInstance.defaults;
+axios.interceptors = defaultInstance.interceptors;
+
+// Factory for creating new instances
 axios.create = function create(defaultConfig) {
   return new Axios(defaultConfig);
 };
 
-// Expose defaults
-axios.defaults = defaultInstance.defaults;
-
 // Expose all/spread
 axios.all = function all(promises) {
   return Promise.all(promises);
 };
 axios.spread = require('./helpers/spread');
 
-// Expose interceptors
-axios.interceptors = defaultInstance.interceptors;
-
 // Provide aliases for supported request methods
 utils.forEach(['delete', 'get', 'head'], function forEachMethodNoData(method) {
   /*eslint func-names:0*/

package/lib/defaults.js

@@ -8,11 +8,8 @@ var DEFAULT_CONTENT_TYPE = {
 };
 
 module.exports = {
-  transformRequest: [function transformResponseJSON(data, headers) {
-    if (utils.isFormData(data)) {
-      return data;
-    }
-    if (utils.isArrayBuffer(data)) {
+  transformRequest: [function transformRequest(data, headers) {
+    if (utils.isFormData(data) || utils.isArrayBuffer(data) || utils.isStream(data)) {
       return data;
     }
     if (utils.isArrayBufferView(data)) {
@@ -36,7 +33,7 @@ module.exports = {
     return data;
   }],
 
-  transformResponse: [function transformResponseJSON(data) {
+  transformResponse: [function transformResponse(data) {
     /*eslint no-param-reassign:0*/
     if (typeof data === 'string') {
       data = data.replace(PROTECTION_PREFIX, '');
@@ -59,5 +56,11 @@ module.exports = {
   timeout: 0,
 
   xsrfCookieName: 'XSRF-TOKEN',
-  xsrfHeaderName: 'X-XSRF-TOKEN'
+  xsrfHeaderName: 'X-XSRF-TOKEN',
+
+  maxContentLength: -1,
+
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300;
+  }
 };

package/lib/helpers/btoa.js

@@ -4,12 +4,12 @@
 
 var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
-function InvalidCharacterError(message) {
-  this.message = message;
+function E() {
+  this.message = 'String contains an invalid character';
 }
-InvalidCharacterError.prototype = new Error;
-InvalidCharacterError.prototype.code = 5;
-InvalidCharacterError.prototype.name = 'InvalidCharacterError';
+E.prototype = new Error;
+E.prototype.code = 5;
+E.prototype.name = 'InvalidCharacterError';
 
 function btoa(input) {
   var str = String(input);
@@ -26,7 +26,7 @@ function btoa(input) {
   ) {
     charCode = str.charCodeAt(idx += 3 / 4);
     if (charCode > 0xFF) {
-      throw new InvalidCharacterError('INVALID_CHARACTER_ERR: DOM Exception 5');
+      throw new E();
     }
     block = block << 8 | charCode;
   }

package/lib/helpers/settle.js

@@ -0,0 +1,18 @@
+'use strict';
+
+/**
+ * Resolve or reject a Promise based on response status.
+ *
+ * @param {Function} resolve A function that resolves the promise.
+ * @param {Function} reject A function that rejects the promise.
+ * @param {object} response The response.
+ */
+module.exports = function settle(resolve, reject, response) {
+  var validateStatus = response.config.validateStatus;
+  // Note: status is not exposed by XDomainRequest
+  if (!response.status || !validateStatus || validateStatus(response.status)) {
+    resolve(response);
+  } else {
+    reject(response);
+  }
+};

package/lib/utils.js

@@ -33,7 +33,7 @@ function isArrayBuffer(val) {
  * @returns {boolean} True if value is an FormData, otherwise false
  */
 function isFormData(val) {
-  return toString.call(val) === '[object FormData]';
+  return (typeof FormData !== 'undefined') && (val instanceof FormData);
 }
 
 /**
@@ -122,6 +122,26 @@ function isBlob(val) {
   return toString.call(val) === '[object Blob]';
 }
 
+/**
+ * Determine if a value is a Function
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Function, otherwise false
+ */
+function isFunction(val) {
+  return toString.call(val) === '[object Function]';
+}
+
+/**
+ * Determine if a value is a Stream
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Stream, otherwise false
+ */
+function isStream(val) {
+  return isObject(val) && isFunction(val.pipe);
+}
+
 /**
  * Trim excess whitespace off the beginning and end of a string
  *
@@ -237,6 +257,8 @@ module.exports = {
   isDate: isDate,
   isFile: isFile,
   isBlob: isBlob,
+  isFunction: isFunction,
+  isStream: isStream,
   isStandardBrowserEnv: isStandardBrowserEnv,
   forEach: forEach,
   merge: merge,

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "axios",
-  "version": "0.9.0",
+  "version": "0.11.1",
   "description": "Promise based HTTP client for the browser and node.js",
   "main": "index.js",
   "scripts": {
-    "build": "./node_modules/.bin/grunt build",
-    "test": "./node_modules/.bin/grunt test",
+    "test": "grunt test",
     "start": "node ./sandbox/server.js",
+    "build": "NODE_ENV=production grunt build",
+    "preversion": "npm test",
+    "version": "npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json",
+    "postversion": "git push && git push --tags",
     "examples": "node ./examples/server.js",
     "coveralls": "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
   },
@@ -28,33 +31,38 @@
   },
   "homepage": "https://github.com/mzabriskie/axios",
   "devDependencies": {
-    "coveralls": "2.11.6",
-    "es6-promise": "3.0.2",
+    "coveralls": "2.11.8",
+    "es6-promise": "3.1.2",
     "grunt": "0.4.5",
     "grunt-banner": "0.6.0",
     "grunt-cli": "0.1.13",
-    "grunt-contrib-clean": "0.7.0",
-    "grunt-contrib-nodeunit": "0.4.1",
+    "grunt-contrib-clean": "1.0.0",
+    "grunt-contrib-nodeunit": "1.0.0",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-eslint": "17.3.1",
+    "grunt-eslint": "18.0.0",
     "grunt-karma": "0.12.1",
     "grunt-ts": "5.3.2",
-    "grunt-update-json": "0.2.2",
     "grunt-webpack": "1.0.11",
-    "istanbul-instrumenter-loader": "^0.1.3",
+    "istanbul-instrumenter-loader": "^0.2.0",
     "jasmine-core": "2.4.1",
-    "karma": "0.13.19",
-    "karma-coverage": "0.5.3",
-    "karma-jasmine": "0.3.6",
+    "karma": "0.13.21",
+    "karma-chrome-launcher": "^0.2.2",
+    "karma-coverage": "0.5.4",
+    "karma-firefox-launcher": "^0.1.7",
+    "karma-jasmine": "0.3.7",
     "karma-jasmine-ajax": "0.1.13",
-    "karma-phantomjs-launcher": "0.2.3",
+    "karma-opera-launcher": "^0.3.0",
+    "karma-phantomjs-launcher": "1.0.0",
+    "karma-safari-launcher": "^0.1.1",
+    "karma-sauce-launcher": "^0.3.1",
     "karma-sinon": "1.0.4",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "1.7.0",
-    "load-grunt-tasks": "3.4.0",
+    "load-grunt-tasks": "3.4.1",
     "minimist": "1.2.0",
-    "phantomjs": "1.9.19",
-    "webpack": "1.12.11",
+    "phantomjs-prebuilt": "2.1.6",
+    "sinon": "1.17.3",
+    "webpack": "1.12.14",
     "webpack-dev-server": "1.14.1"
   },
   "browser": {