Releasing 0.5.3

CHANGELOG.md

@@ -59,4 +59,8 @@
 
 ### 0.5.2 (Mar 13, 2015)
 
-- Adding support for `statusText` in response ([#46](https://github.com/mzabriskie/axios/issues/46))
+- Adding support for `statusText` in response ([#46](https://github.com/mzabriskie/axios/issues/46))
+
+### 0.5.3 (Apr 07, 2015)
+
+- Using JSON.parse unconditionally when transforming response string ([#55](https://github.com/mzabriskie/axios/issues/55))

bower.json

@@ -1,7 +1,7 @@
 {
 	"name": "axios",
 	"main": "./dist/axios.js",
-	"version": "0.5.2",
+	"version": "0.5.3",
 	"homepage": "https://github.com/mzabriskie/axios",
 	"authors": [
 		"Matt Zabriskie"

dist/axios.amd.js

@@ -50,6 +50,8 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 /* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
 	var defaults = __webpack_require__(2);
 	var utils = __webpack_require__(3);
 	var deprecatedMethod = __webpack_require__(4);
@@ -132,32 +134,33 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	};
 	
 	// Provide aliases for supported request methods
-	createShortMethods('delete', 'get', 'head');
+	(function () {
-	createShortMethodsWithData('post', 'put', 'patch');
+	  function createShortMethods() {
+	    utils.forEach(arguments, function (method) {
+	      axios[method] = function (url, config) {
+	        return axios(utils.merge(config || {}, {
+	          method: method,
+	          url: url
+	        }));
+	      };
+	    });
+	  }
 	
-	function createShortMethods() {
+	  function createShortMethodsWithData() {
-	  utils.forEach(arguments, function (method) {
+	    utils.forEach(arguments, function (method) {
-	    axios[method] = function (url, config) {
+	      axios[method] = function (url, data, config) {
-	      return axios(utils.merge(config || {}, {
+	        return axios(utils.merge(config || {}, {
-	        method: method,
+	          method: method,
-	        url: url
+	          url: url,
-	      }));
+	          data: data
-	    };
+	        }));
-	  });
+	      };
-	}
+	    });
-	
+	  }
-	function createShortMethodsWithData() {
-	  utils.forEach(arguments, function (method) {
-	    axios[method] = function (url, data, config) {
-	      return axios(utils.merge(config || {}, {
-	        method: method,
-	        url: url,
-	        data: data
-	      }));
-	    };
-	  });
-	}
 	
+	  createShortMethods('delete', 'get', 'head');
+	  createShortMethodsWithData('post', 'put', 'patch');
+	})();
 
 
 /***/ },
@@ -168,8 +171,6 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	
 	var utils = __webpack_require__(3);
 	
-	var JSON_START = /^\s*(\[|\{[^\{])/;
-	var JSON_END = /[\}\]]\s*$/;
 	var PROTECTION_PREFIX = /^\)\]\}',?\n/;
 	var DEFAULT_CONTENT_TYPE = {
 	  'Content-Type': 'application/x-www-form-urlencoded'
@@ -196,9 +197,9 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  transformResponse: [function (data) {
 	    if (typeof data === 'string') {
 	      data = data.replace(PROTECTION_PREFIX, '');
-	      if (JSON_START.test(data) && JSON_END.test(data)) {
+	      try {
 	        data = JSON.parse(data);
-	      }
+	      } catch (e) {}
 	    }
 	    return data;
 	  }],
@@ -216,10 +217,15 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  xsrfHeaderName: 'X-XSRF-TOKEN'
 	};
 
+
 /***/ },
 /* 3 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
+	/*global toString:true*/
+	
 	// utils is a library of generic helper functions non-specific to axios
 	
 	var toString = Object.prototype.toString;
@@ -376,7 +382,7 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	
 	  // Iterate over array values
 	  if (isArrayLike) {
-	    for (var i=0, l=obj.length; i<l; i++) {
+	    for (var i = 0, l = obj.length; i < l; i++) {
 	      fn.call(null, obj[i], i, obj);
 	    }
 	  }
@@ -407,7 +413,7 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	 * @param {Object} obj1 Object to merge
 	 * @returns {Object} Result of all merge properties
 	 */
-	function merge(obj1/*, obj2, obj3, ...*/) {
+	function merge(/*obj1, obj2, obj3, ...*/) {
 	  var result = {};
 	  forEach(arguments, function (obj) {
 	    forEach(obj, function (val, key) {
@@ -506,7 +512,7 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	
 	function InterceptorManager() {
 	  this.handlers = [];
-	};
+	}
 	
 	/**
 	 * Add a new interceptor to the stack
@@ -547,18 +553,19 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  utils.forEach(this.handlers, function (h) {
 	    if (h !== null) {
 	      fn(h);
-	    } 
+	    }
 	  });
 	};
 	
 	module.exports = InterceptorManager;
-	
 
 
 /***/ },
 /* 7 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
 	/**
 	 * Syntactic sugar for invoking a function and expanding an array for arguments.
 	 *
@@ -585,10 +592,15 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  };
 	};
 
+
 /***/ },
 /* 8 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
+	/*global ActiveXObject:true*/
+	
 	var defaults = __webpack_require__(2);
 	var utils = __webpack_require__(3);
 	var buildUrl = __webpack_require__(11);
@@ -606,42 +618,42 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  );
 	
 	  // Merge headers
-	  var headers = utils.merge(
+	  var requestHeaders = utils.merge(
 	    defaults.headers.common,
 	    defaults.headers[config.method] || {},
 	    config.headers || {}
 	  );
 	
 	  if (utils.isFormData(data)) {
-	    delete headers['Content-Type']; // Let the browser set it
+	    delete requestHeaders['Content-Type']; // Let the browser set it
 	  }
 	
 	  // Create the request
-	  var request = new(XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
+	  var request = new (XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
 	  request.open(config.method.toUpperCase(), buildUrl(config.url, config.params), true);
 	
 	  // Listen for ready state
 	  request.onreadystatechange = function () {
 	    if (request && request.readyState === 4) {
 	      // Prepare the response
-	      var headers = parseHeaders(request.getAllResponseHeaders());
+	      var responseHeaders = parseHeaders(request.getAllResponseHeaders());
 	      var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
 	      var response = {
 	        data: transformData(
 	          responseData,
-	          headers,
+	          responseHeaders,
 	          config.transformResponse
 	        ),
 	        status: request.status,
 	        statusText: request.statusText,
-	        headers: headers,
+	        headers: responseHeaders,
 	        config: config
 	      };
 	
 	      // Resolve or reject the Promise based on the status
-	      (request.status >= 200 && request.status < 300
+	      (request.status >= 200 && request.status < 300 ?
-	        ? resolve
+	        resolve :
-	        : reject)(response);
+	        reject)(response);
 	
 	      // Clean up request
 	      request = null;
@@ -649,18 +661,18 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  };
 	
 	  // Add xsrf header
-	  var xsrfValue = urlIsSameOrigin(config.url)
+	  var xsrfValue = urlIsSameOrigin(config.url) ?
-	    ? cookies.read(config.xsrfCookieName || defaults.xsrfCookieName)
+	      cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
-	    : undefined;
+	      undefined;
 	  if (xsrfValue) {
-	    headers[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
+	    requestHeaders[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
 	  }
 	
 	  // Add headers to the request
-	  utils.forEach(headers, function (val, key) {
+	  utils.forEach(requestHeaders, function (val, key) {
 	    // Remove Content-Type if data is undefined
 	    if (!data && key.toLowerCase() === 'content-type') {
-	      delete headers[key];
+	      delete requestHeaders[key];
 	    }
 	    // Otherwise add header to the request
 	    else {
@@ -1823,6 +1835,7 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  }
 	};
 
+
 /***/ },
 /* 13 */
 /***/ function(module, exports, __webpack_require__) {
@@ -1847,7 +1860,7 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	module.exports = function parseHeaders(headers) {
 	  var parsed = {}, key, val, i;
 	
-	  if (!headers) return parsed;
+	  if (!headers) { return parsed; }
 	
 	  utils.forEach(headers.split('\n'), function(line) {
 	    i = line.indexOf(':');
@@ -1862,6 +1875,7 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  return parsed;
 	};
 
+
 /***/ },
 /* 14 */
 /***/ function(module, exports, __webpack_require__) {
@@ -1886,16 +1900,17 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	  return data;
 	};
 
+
 /***/ },
 /* 15 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 	
-	var msie = /(msie|trident)/i.test(navigator.userAgent);
 	var utils = __webpack_require__(3);
+	var msie = /(msie|trident)/i.test(navigator.userAgent);
 	var urlParsingNode = document.createElement('a');
-	var originUrl = urlResolve(window.location.href);
+	var originUrl;
 	
 	/**
 	 * Parse a URL to discover it's components
@@ -1923,12 +1938,14 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	    hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
 	    hostname: urlParsingNode.hostname,
 	    port: urlParsingNode.port,
-	    pathname: (urlParsingNode.pathname.charAt(0) === '/')
+	    pathname: (urlParsingNode.pathname.charAt(0) === '/') ?
-	      ? urlParsingNode.pathname
+	              urlParsingNode.pathname :
-	      : '/' + urlParsingNode.pathname
+	              '/' + urlParsingNode.pathname
 	  };
 	}
 	
+	originUrl = urlResolve(window.location.href);
+	
 	/**
 	 * Determine if a URL shares the same origin as the current location
 	 *
@@ -1941,6 +1958,7 @@ define("axios", [], function() { return /******/ (function(modules) { // webpack
 	        parsed.host === originUrl.host);
 	};
 
+
 /***/ },
 /* 16 */
 /***/ function(module, exports, __webpack_require__) {

dist/axios.amd.standalone.js

@@ -50,6 +50,8 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 /* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
 	var defaults = __webpack_require__(3);
 	var utils = __webpack_require__(4);
 	var deprecatedMethod = __webpack_require__(5);
@@ -132,32 +134,33 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	};
 	
 	// Provide aliases for supported request methods
-	createShortMethods('delete', 'get', 'head');
+	(function () {
-	createShortMethodsWithData('post', 'put', 'patch');
+	  function createShortMethods() {
+	    utils.forEach(arguments, function (method) {
+	      axios[method] = function (url, config) {
+	        return axios(utils.merge(config || {}, {
+	          method: method,
+	          url: url
+	        }));
+	      };
+	    });
+	  }
 	
-	function createShortMethods() {
+	  function createShortMethodsWithData() {
-	  utils.forEach(arguments, function (method) {
+	    utils.forEach(arguments, function (method) {
-	    axios[method] = function (url, config) {
+	      axios[method] = function (url, data, config) {
-	      return axios(utils.merge(config || {}, {
+	        return axios(utils.merge(config || {}, {
-	        method: method,
+	          method: method,
-	        url: url
+	          url: url,
-	      }));
+	          data: data
-	    };
+	        }));
-	  });
+	      };
-	}
+	    });
-	
+	  }
-	function createShortMethodsWithData() {
-	  utils.forEach(arguments, function (method) {
-	    axios[method] = function (url, data, config) {
-	      return axios(utils.merge(config || {}, {
-	        method: method,
-	        url: url,
-	        data: data
-	      }));
-	    };
-	  });
-	}
 	
+	  createShortMethods('delete', 'get', 'head');
+	  createShortMethodsWithData('post', 'put', 'patch');
+	})();
 
 
 /***/ },
@@ -174,8 +177,6 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	
 	var utils = __webpack_require__(4);
 	
-	var JSON_START = /^\s*(\[|\{[^\{])/;
-	var JSON_END = /[\}\]]\s*$/;
 	var PROTECTION_PREFIX = /^\)\]\}',?\n/;
 	var DEFAULT_CONTENT_TYPE = {
 	  'Content-Type': 'application/x-www-form-urlencoded'
@@ -202,9 +203,9 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  transformResponse: [function (data) {
 	    if (typeof data === 'string') {
 	      data = data.replace(PROTECTION_PREFIX, '');
-	      if (JSON_START.test(data) && JSON_END.test(data)) {
+	      try {
 	        data = JSON.parse(data);
-	      }
+	      } catch (e) {}
 	    }
 	    return data;
 	  }],
@@ -222,10 +223,15 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  xsrfHeaderName: 'X-XSRF-TOKEN'
 	};
 
+
 /***/ },
 /* 4 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
+	/*global toString:true*/
+	
 	// utils is a library of generic helper functions non-specific to axios
 	
 	var toString = Object.prototype.toString;
@@ -382,7 +388,7 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	
 	  // Iterate over array values
 	  if (isArrayLike) {
-	    for (var i=0, l=obj.length; i<l; i++) {
+	    for (var i = 0, l = obj.length; i < l; i++) {
 	      fn.call(null, obj[i], i, obj);
 	    }
 	  }
@@ -413,7 +419,7 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	 * @param {Object} obj1 Object to merge
 	 * @returns {Object} Result of all merge properties
 	 */
-	function merge(obj1/*, obj2, obj3, ...*/) {
+	function merge(/*obj1, obj2, obj3, ...*/) {
 	  var result = {};
 	  forEach(arguments, function (obj) {
 	    forEach(obj, function (val, key) {
@@ -512,7 +518,7 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	
 	function InterceptorManager() {
 	  this.handlers = [];
-	};
+	}
 	
 	/**
 	 * Add a new interceptor to the stack
@@ -553,18 +559,19 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  utils.forEach(this.handlers, function (h) {
 	    if (h !== null) {
 	      fn(h);
-	    } 
+	    }
 	  });
 	};
 	
 	module.exports = InterceptorManager;
-	
 
 
 /***/ },
 /* 8 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
 	/**
 	 * Syntactic sugar for invoking a function and expanding an array for arguments.
 	 *
@@ -591,10 +598,15 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  };
 	};
 
+
 /***/ },
 /* 9 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
+	/*global ActiveXObject:true*/
+	
 	var defaults = __webpack_require__(3);
 	var utils = __webpack_require__(4);
 	var buildUrl = __webpack_require__(11);
@@ -612,42 +624,42 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  );
 	
 	  // Merge headers
-	  var headers = utils.merge(
+	  var requestHeaders = utils.merge(
 	    defaults.headers.common,
 	    defaults.headers[config.method] || {},
 	    config.headers || {}
 	  );
 	
 	  if (utils.isFormData(data)) {
-	    delete headers['Content-Type']; // Let the browser set it
+	    delete requestHeaders['Content-Type']; // Let the browser set it
 	  }
 	
 	  // Create the request
-	  var request = new(XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
+	  var request = new (XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
 	  request.open(config.method.toUpperCase(), buildUrl(config.url, config.params), true);
 	
 	  // Listen for ready state
 	  request.onreadystatechange = function () {
 	    if (request && request.readyState === 4) {
 	      // Prepare the response
-	      var headers = parseHeaders(request.getAllResponseHeaders());
+	      var responseHeaders = parseHeaders(request.getAllResponseHeaders());
 	      var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
 	      var response = {
 	        data: transformData(
 	          responseData,
-	          headers,
+	          responseHeaders,
 	          config.transformResponse
 	        ),
 	        status: request.status,
 	        statusText: request.statusText,
-	        headers: headers,
+	        headers: responseHeaders,
 	        config: config
 	      };
 	
 	      // Resolve or reject the Promise based on the status
-	      (request.status >= 200 && request.status < 300
+	      (request.status >= 200 && request.status < 300 ?
-	        ? resolve
+	        resolve :
-	        : reject)(response);
+	        reject)(response);
 	
 	      // Clean up request
 	      request = null;
@@ -655,18 +667,18 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  };
 	
 	  // Add xsrf header
-	  var xsrfValue = urlIsSameOrigin(config.url)
+	  var xsrfValue = urlIsSameOrigin(config.url) ?
-	    ? cookies.read(config.xsrfCookieName || defaults.xsrfCookieName)
+	      cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
-	    : undefined;
+	      undefined;
 	  if (xsrfValue) {
-	    headers[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
+	    requestHeaders[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
 	  }
 	
 	  // Add headers to the request
-	  utils.forEach(headers, function (val, key) {
+	  utils.forEach(requestHeaders, function (val, key) {
 	    // Remove Content-Type if data is undefined
 	    if (!data && key.toLowerCase() === 'content-type') {
-	      delete headers[key];
+	      delete requestHeaders[key];
 	    }
 	    // Otherwise add header to the request
 	    else {
@@ -863,6 +875,7 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  }
 	};
 
+
 /***/ },
 /* 13 */
 /***/ function(module, exports, __webpack_require__) {
@@ -887,7 +900,7 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	module.exports = function parseHeaders(headers) {
 	  var parsed = {}, key, val, i;
 	
-	  if (!headers) return parsed;
+	  if (!headers) { return parsed; }
 	
 	  utils.forEach(headers.split('\n'), function(line) {
 	    i = line.indexOf(':');
@@ -902,6 +915,7 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  return parsed;
 	};
 
+
 /***/ },
 /* 14 */
 /***/ function(module, exports, __webpack_require__) {
@@ -926,16 +940,17 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	  return data;
 	};
 
+
 /***/ },
 /* 15 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 	
-	var msie = /(msie|trident)/i.test(navigator.userAgent);
 	var utils = __webpack_require__(4);
+	var msie = /(msie|trident)/i.test(navigator.userAgent);
 	var urlParsingNode = document.createElement('a');
-	var originUrl = urlResolve(window.location.href);
+	var originUrl;
 	
 	/**
 	 * Parse a URL to discover it's components
@@ -963,12 +978,14 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	    hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
 	    hostname: urlParsingNode.hostname,
 	    port: urlParsingNode.port,
-	    pathname: (urlParsingNode.pathname.charAt(0) === '/')
+	    pathname: (urlParsingNode.pathname.charAt(0) === '/') ?
-	      ? urlParsingNode.pathname
+	              urlParsingNode.pathname :
-	      : '/' + urlParsingNode.pathname
+	              '/' + urlParsingNode.pathname
 	  };
 	}
 	
+	originUrl = urlResolve(window.location.href);
+	
 	/**
 	 * Determine if a URL shares the same origin as the current location
 	 *
@@ -981,6 +998,7 @@ define("axios", ["{Promise: Promise}"], function(__WEBPACK_EXTERNAL_MODULE_2__)
 	        parsed.host === originUrl.host);
 	};
 
+
 /***/ }
 /******/ ])});;
 //# sourceMappingURL=axios.amd.standalone.map

dist/axios.js

@@ -51,6 +51,8 @@ var axios =
 /* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
 	var defaults = __webpack_require__(2);
 	var utils = __webpack_require__(3);
 	var deprecatedMethod = __webpack_require__(4);
@@ -133,32 +135,33 @@ var axios =
 	};
 	
 	// Provide aliases for supported request methods
-	createShortMethods('delete', 'get', 'head');
+	(function () {
-	createShortMethodsWithData('post', 'put', 'patch');
+	  function createShortMethods() {
+	    utils.forEach(arguments, function (method) {
+	      axios[method] = function (url, config) {
+	        return axios(utils.merge(config || {}, {
+	          method: method,
+	          url: url
+	        }));
+	      };
+	    });
+	  }
 	
-	function createShortMethods() {
+	  function createShortMethodsWithData() {
-	  utils.forEach(arguments, function (method) {
+	    utils.forEach(arguments, function (method) {
-	    axios[method] = function (url, config) {
+	      axios[method] = function (url, data, config) {
-	      return axios(utils.merge(config || {}, {
+	        return axios(utils.merge(config || {}, {
-	        method: method,
+	          method: method,
-	        url: url
+	          url: url,
-	      }));
+	          data: data
-	    };
+	        }));
-	  });
+	      };
-	}
+	    });
-	
+	  }
-	function createShortMethodsWithData() {
-	  utils.forEach(arguments, function (method) {
-	    axios[method] = function (url, data, config) {
-	      return axios(utils.merge(config || {}, {
-	        method: method,
-	        url: url,
-	        data: data
-	      }));
-	    };
-	  });
-	}
 	
+	  createShortMethods('delete', 'get', 'head');
+	  createShortMethodsWithData('post', 'put', 'patch');
+	})();
 
 
 /***/ },
@@ -169,8 +172,6 @@ var axios =
 	
 	var utils = __webpack_require__(3);
 	
-	var JSON_START = /^\s*(\[|\{[^\{])/;
-	var JSON_END = /[\}\]]\s*$/;
 	var PROTECTION_PREFIX = /^\)\]\}',?\n/;
 	var DEFAULT_CONTENT_TYPE = {
 	  'Content-Type': 'application/x-www-form-urlencoded'
@@ -197,9 +198,9 @@ var axios =
 	  transformResponse: [function (data) {
 	    if (typeof data === 'string') {
 	      data = data.replace(PROTECTION_PREFIX, '');
-	      if (JSON_START.test(data) && JSON_END.test(data)) {
+	      try {
 	        data = JSON.parse(data);
-	      }
+	      } catch (e) {}
 	    }
 	    return data;
 	  }],
@@ -217,10 +218,15 @@ var axios =
 	  xsrfHeaderName: 'X-XSRF-TOKEN'
 	};
 
+
 /***/ },
 /* 3 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
+	/*global toString:true*/
+	
 	// utils is a library of generic helper functions non-specific to axios
 	
 	var toString = Object.prototype.toString;
@@ -377,7 +383,7 @@ var axios =
 	
 	  // Iterate over array values
 	  if (isArrayLike) {
-	    for (var i=0, l=obj.length; i<l; i++) {
+	    for (var i = 0, l = obj.length; i < l; i++) {
 	      fn.call(null, obj[i], i, obj);
 	    }
 	  }
@@ -408,7 +414,7 @@ var axios =
 	 * @param {Object} obj1 Object to merge
 	 * @returns {Object} Result of all merge properties
 	 */
-	function merge(obj1/*, obj2, obj3, ...*/) {
+	function merge(/*obj1, obj2, obj3, ...*/) {
 	  var result = {};
 	  forEach(arguments, function (obj) {
 	    forEach(obj, function (val, key) {
@@ -507,7 +513,7 @@ var axios =
 	
 	function InterceptorManager() {
 	  this.handlers = [];
-	};
+	}
 	
 	/**
 	 * Add a new interceptor to the stack
@@ -548,18 +554,19 @@ var axios =
 	  utils.forEach(this.handlers, function (h) {
 	    if (h !== null) {
 	      fn(h);
-	    } 
+	    }
 	  });
 	};
 	
 	module.exports = InterceptorManager;
-	
 
 
 /***/ },
 /* 7 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
 	/**
 	 * Syntactic sugar for invoking a function and expanding an array for arguments.
 	 *
@@ -586,10 +593,15 @@ var axios =
 	  };
 	};
 
+
 /***/ },
 /* 8 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
+	/*global ActiveXObject:true*/
+	
 	var defaults = __webpack_require__(2);
 	var utils = __webpack_require__(3);
 	var buildUrl = __webpack_require__(11);
@@ -607,42 +619,42 @@ var axios =
 	  );
 	
 	  // Merge headers
-	  var headers = utils.merge(
+	  var requestHeaders = utils.merge(
 	    defaults.headers.common,
 	    defaults.headers[config.method] || {},
 	    config.headers || {}
 	  );
 	
 	  if (utils.isFormData(data)) {
-	    delete headers['Content-Type']; // Let the browser set it
+	    delete requestHeaders['Content-Type']; // Let the browser set it
 	  }
 	
 	  // Create the request
-	  var request = new(XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
+	  var request = new (XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
 	  request.open(config.method.toUpperCase(), buildUrl(config.url, config.params), true);
 	
 	  // Listen for ready state
 	  request.onreadystatechange = function () {
 	    if (request && request.readyState === 4) {
 	      // Prepare the response
-	      var headers = parseHeaders(request.getAllResponseHeaders());
+	      var responseHeaders = parseHeaders(request.getAllResponseHeaders());
 	      var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
 	      var response = {
 	        data: transformData(
 	          responseData,
-	          headers,
+	          responseHeaders,
 	          config.transformResponse
 	        ),
 	        status: request.status,
 	        statusText: request.statusText,
-	        headers: headers,
+	        headers: responseHeaders,
 	        config: config
 	      };
 	
 	      // Resolve or reject the Promise based on the status
-	      (request.status >= 200 && request.status < 300
+	      (request.status >= 200 && request.status < 300 ?
-	        ? resolve
+	        resolve :
-	        : reject)(response);
+	        reject)(response);
 	
 	      // Clean up request
 	      request = null;
@@ -650,18 +662,18 @@ var axios =
 	  };
 	
 	  // Add xsrf header
-	  var xsrfValue = urlIsSameOrigin(config.url)
+	  var xsrfValue = urlIsSameOrigin(config.url) ?
-	    ? cookies.read(config.xsrfCookieName || defaults.xsrfCookieName)
+	      cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
-	    : undefined;
+	      undefined;
 	  if (xsrfValue) {
-	    headers[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
+	    requestHeaders[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
 	  }
 	
 	  // Add headers to the request
-	  utils.forEach(headers, function (val, key) {
+	  utils.forEach(requestHeaders, function (val, key) {
 	    // Remove Content-Type if data is undefined
 	    if (!data && key.toLowerCase() === 'content-type') {
-	      delete headers[key];
+	      delete requestHeaders[key];
 	    }
 	    // Otherwise add header to the request
 	    else {
@@ -1824,6 +1836,7 @@ var axios =
 	  }
 	};
 
+
 /***/ },
 /* 13 */
 /***/ function(module, exports, __webpack_require__) {
@@ -1848,7 +1861,7 @@ var axios =
 	module.exports = function parseHeaders(headers) {
 	  var parsed = {}, key, val, i;
 	
-	  if (!headers) return parsed;
+	  if (!headers) { return parsed; }
 	
 	  utils.forEach(headers.split('\n'), function(line) {
 	    i = line.indexOf(':');
@@ -1863,6 +1876,7 @@ var axios =
 	  return parsed;
 	};
 
+
 /***/ },
 /* 14 */
 /***/ function(module, exports, __webpack_require__) {
@@ -1887,16 +1901,17 @@ var axios =
 	  return data;
 	};
 
+
 /***/ },
 /* 15 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 	
-	var msie = /(msie|trident)/i.test(navigator.userAgent);
 	var utils = __webpack_require__(3);
+	var msie = /(msie|trident)/i.test(navigator.userAgent);
 	var urlParsingNode = document.createElement('a');
-	var originUrl = urlResolve(window.location.href);
+	var originUrl;
 	
 	/**
 	 * Parse a URL to discover it's components
@@ -1924,12 +1939,14 @@ var axios =
 	    hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
 	    hostname: urlParsingNode.hostname,
 	    port: urlParsingNode.port,
-	    pathname: (urlParsingNode.pathname.charAt(0) === '/')
+	    pathname: (urlParsingNode.pathname.charAt(0) === '/') ?
-	      ? urlParsingNode.pathname
+	              urlParsingNode.pathname :
-	      : '/' + urlParsingNode.pathname
+	              '/' + urlParsingNode.pathname
 	  };
 	}
 	
+	originUrl = urlResolve(window.location.href);
+	
 	/**
 	 * Determine if a URL shares the same origin as the current location
 	 *
@@ -1942,6 +1959,7 @@ var axios =
 	        parsed.host === originUrl.host);
 	};
 
+
 /***/ },
 /* 16 */
 /***/ function(module, exports, __webpack_require__) {

dist/axios.standalone.js

@@ -51,6 +51,8 @@ var axios =
 /* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
 	var defaults = __webpack_require__(3);
 	var utils = __webpack_require__(4);
 	var deprecatedMethod = __webpack_require__(5);
@@ -133,32 +135,33 @@ var axios =
 	};
 	
 	// Provide aliases for supported request methods
-	createShortMethods('delete', 'get', 'head');
+	(function () {
-	createShortMethodsWithData('post', 'put', 'patch');
+	  function createShortMethods() {
+	    utils.forEach(arguments, function (method) {
+	      axios[method] = function (url, config) {
+	        return axios(utils.merge(config || {}, {
+	          method: method,
+	          url: url
+	        }));
+	      };
+	    });
+	  }
 	
-	function createShortMethods() {
+	  function createShortMethodsWithData() {
-	  utils.forEach(arguments, function (method) {
+	    utils.forEach(arguments, function (method) {
-	    axios[method] = function (url, config) {
+	      axios[method] = function (url, data, config) {
-	      return axios(utils.merge(config || {}, {
+	        return axios(utils.merge(config || {}, {
-	        method: method,
+	          method: method,
-	        url: url
+	          url: url,
-	      }));
+	          data: data
-	    };
+	        }));
-	  });
+	      };
-	}
+	    });
-	
+	  }
-	function createShortMethodsWithData() {
-	  utils.forEach(arguments, function (method) {
-	    axios[method] = function (url, data, config) {
-	      return axios(utils.merge(config || {}, {
-	        method: method,
-	        url: url,
-	        data: data
-	      }));
-	    };
-	  });
-	}
 	
+	  createShortMethods('delete', 'get', 'head');
+	  createShortMethodsWithData('post', 'put', 'patch');
+	})();
 
 
 /***/ },
@@ -175,8 +178,6 @@ var axios =
 	
 	var utils = __webpack_require__(4);
 	
-	var JSON_START = /^\s*(\[|\{[^\{])/;
-	var JSON_END = /[\}\]]\s*$/;
 	var PROTECTION_PREFIX = /^\)\]\}',?\n/;
 	var DEFAULT_CONTENT_TYPE = {
 	  'Content-Type': 'application/x-www-form-urlencoded'
@@ -203,9 +204,9 @@ var axios =
 	  transformResponse: [function (data) {
 	    if (typeof data === 'string') {
 	      data = data.replace(PROTECTION_PREFIX, '');
-	      if (JSON_START.test(data) && JSON_END.test(data)) {
+	      try {
 	        data = JSON.parse(data);
-	      }
+	      } catch (e) {}
 	    }
 	    return data;
 	  }],
@@ -223,10 +224,15 @@ var axios =
 	  xsrfHeaderName: 'X-XSRF-TOKEN'
 	};
 
+
 /***/ },
 /* 4 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
+	/*global toString:true*/
+	
 	// utils is a library of generic helper functions non-specific to axios
 	
 	var toString = Object.prototype.toString;
@@ -383,7 +389,7 @@ var axios =
 	
 	  // Iterate over array values
 	  if (isArrayLike) {
-	    for (var i=0, l=obj.length; i<l; i++) {
+	    for (var i = 0, l = obj.length; i < l; i++) {
 	      fn.call(null, obj[i], i, obj);
 	    }
 	  }
@@ -414,7 +420,7 @@ var axios =
 	 * @param {Object} obj1 Object to merge
 	 * @returns {Object} Result of all merge properties
 	 */
-	function merge(obj1/*, obj2, obj3, ...*/) {
+	function merge(/*obj1, obj2, obj3, ...*/) {
 	  var result = {};
 	  forEach(arguments, function (obj) {
 	    forEach(obj, function (val, key) {
@@ -513,7 +519,7 @@ var axios =
 	
 	function InterceptorManager() {
 	  this.handlers = [];
-	};
+	}
 	
 	/**
 	 * Add a new interceptor to the stack
@@ -554,18 +560,19 @@ var axios =
 	  utils.forEach(this.handlers, function (h) {
 	    if (h !== null) {
 	      fn(h);
-	    } 
+	    }
 	  });
 	};
 	
 	module.exports = InterceptorManager;
-	
 
 
 /***/ },
 /* 8 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
 	/**
 	 * Syntactic sugar for invoking a function and expanding an array for arguments.
 	 *
@@ -592,10 +599,15 @@ var axios =
 	  };
 	};
 
+
 /***/ },
 /* 9 */
 /***/ function(module, exports, __webpack_require__) {
 
+	'use strict';
+	
+	/*global ActiveXObject:true*/
+	
 	var defaults = __webpack_require__(3);
 	var utils = __webpack_require__(4);
 	var buildUrl = __webpack_require__(11);
@@ -613,42 +625,42 @@ var axios =
 	  );
 	
 	  // Merge headers
-	  var headers = utils.merge(
+	  var requestHeaders = utils.merge(
 	    defaults.headers.common,
 	    defaults.headers[config.method] || {},
 	    config.headers || {}
 	  );
 	
 	  if (utils.isFormData(data)) {
-	    delete headers['Content-Type']; // Let the browser set it
+	    delete requestHeaders['Content-Type']; // Let the browser set it
 	  }
 	
 	  // Create the request
-	  var request = new(XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
+	  var request = new (XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
 	  request.open(config.method.toUpperCase(), buildUrl(config.url, config.params), true);
 	
 	  // Listen for ready state
 	  request.onreadystatechange = function () {
 	    if (request && request.readyState === 4) {
 	      // Prepare the response
-	      var headers = parseHeaders(request.getAllResponseHeaders());
+	      var responseHeaders = parseHeaders(request.getAllResponseHeaders());
 	      var responseData = ['text', ''].indexOf(config.responseType || '') !== -1 ? request.responseText : request.response;
 	      var response = {
 	        data: transformData(
 	          responseData,
-	          headers,
+	          responseHeaders,
 	          config.transformResponse
 	        ),
 	        status: request.status,
 	        statusText: request.statusText,
-	        headers: headers,
+	        headers: responseHeaders,
 	        config: config
 	      };
 	
 	      // Resolve or reject the Promise based on the status
-	      (request.status >= 200 && request.status < 300
+	      (request.status >= 200 && request.status < 300 ?
-	        ? resolve
+	        resolve :
-	        : reject)(response);
+	        reject)(response);
 	
 	      // Clean up request
 	      request = null;
@@ -656,18 +668,18 @@ var axios =
 	  };
 	
 	  // Add xsrf header
-	  var xsrfValue = urlIsSameOrigin(config.url)
+	  var xsrfValue = urlIsSameOrigin(config.url) ?
-	    ? cookies.read(config.xsrfCookieName || defaults.xsrfCookieName)
+	      cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
-	    : undefined;
+	      undefined;
 	  if (xsrfValue) {
-	    headers[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
+	    requestHeaders[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
 	  }
 	
 	  // Add headers to the request
-	  utils.forEach(headers, function (val, key) {
+	  utils.forEach(requestHeaders, function (val, key) {
 	    // Remove Content-Type if data is undefined
 	    if (!data && key.toLowerCase() === 'content-type') {
-	      delete headers[key];
+	      delete requestHeaders[key];
 	    }
 	    // Otherwise add header to the request
 	    else {
@@ -864,6 +876,7 @@ var axios =
 	  }
 	};
 
+
 /***/ },
 /* 13 */
 /***/ function(module, exports, __webpack_require__) {
@@ -888,7 +901,7 @@ var axios =
 	module.exports = function parseHeaders(headers) {
 	  var parsed = {}, key, val, i;
 	
-	  if (!headers) return parsed;
+	  if (!headers) { return parsed; }
 	
 	  utils.forEach(headers.split('\n'), function(line) {
 	    i = line.indexOf(':');
@@ -903,6 +916,7 @@ var axios =
 	  return parsed;
 	};
 
+
 /***/ },
 /* 14 */
 /***/ function(module, exports, __webpack_require__) {
@@ -927,16 +941,17 @@ var axios =
 	  return data;
 	};
 
+
 /***/ },
 /* 15 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 	
-	var msie = /(msie|trident)/i.test(navigator.userAgent);
 	var utils = __webpack_require__(4);
+	var msie = /(msie|trident)/i.test(navigator.userAgent);
 	var urlParsingNode = document.createElement('a');
-	var originUrl = urlResolve(window.location.href);
+	var originUrl;
 	
 	/**
 	 * Parse a URL to discover it's components
@@ -964,12 +979,14 @@ var axios =
 	    hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
 	    hostname: urlParsingNode.hostname,
 	    port: urlParsingNode.port,
-	    pathname: (urlParsingNode.pathname.charAt(0) === '/')
+	    pathname: (urlParsingNode.pathname.charAt(0) === '/') ?
-	      ? urlParsingNode.pathname
+	              urlParsingNode.pathname :
-	      : '/' + urlParsingNode.pathname
+	              '/' + urlParsingNode.pathname
 	  };
 	}
 	
+	originUrl = urlResolve(window.location.href);
+	
 	/**
 	 * Determine if a URL shares the same origin as the current location
 	 *
@@ -982,6 +999,7 @@ var axios =
 	        parsed.host === originUrl.host);
 	};
 
+
 /***/ }
 /******/ ]);
 //# sourceMappingURL=axios.standalone.map

package.json

@@ -1,6 +1,6 @@
 {
   "name": "axios",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Promise based HTTP client for the browser and node.js",
   "main": "index.js",
   "scripts": {