Merge pull request #38 from canjs/major

can-ajax version 2

Author: pYr0x

.gitignore

@@ -29,3 +29,5 @@ node_modules
 
 docs/
 dist/
+/.idea/
+/package-lock.json

.npmignore

@@ -1 +1,7 @@
-!dist/
+!dist/
+/test/
+/.idea/
+/can-ajax-test.js
+/can-ajax-test-result.json
+/can-ajax-test-result.txt
+/test.html

can-ajax-test.js

@@ -514,3 +514,42 @@ QUnit.test("It doesn't stringify FormData", function(assert) {
 		done();
 	});
 });
+
+QUnit.test("beforsend", function (assert) {
+	var done = assert.async();
+	var headers = {},
+	    restore = makeFixture(function () {
+		    this.open = function (type, url) {};
+
+		    this.send = function () {
+			    this.readyState = 4;
+			    this.status = 204;
+			    this.responseText = '';
+			    this.onreadystatechange();
+		    };
+
+		    this.setRequestHeader = function (header, value) {
+			    headers[header] = value;
+		    };
+	    });
+
+	ajax({
+		type: "post",
+		url: "/foo",
+		data: {
+			id: "qux"
+		},
+		dataType: "json",
+		beforeSend: function (xhr){
+			xhr.setRequestHeader("Authorization", "Bearer 123");
+		}
+	}).then(function (value) {
+		assert.ok(headers.hasOwnProperty('Authorization'), "custom header set");
+	}, function (reason) {
+		assert.notOk(reason, "request failed with reason = ", reason);
+	}).then(function () {
+		// restore original values
+		restore();
+		done();
+	});
+});

can-ajax.js

@@ -38,6 +38,7 @@ var param = require("can-param");
  *      - __dataType__ `{String}` Type of data. _Default is `json`_.
  *      - __crossDomain__ `{Boolean}` If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true. This allows, for example, server-side redirection to another domain. Default: `false` for same-domain requests, `true` for cross-domain requests.
  *      - __xhrFields__ `{Object}` Any fields to be set directly on the xhr request, [https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest] such as the withCredentials attribute that indicates whether or not cross-site Access-Control requests should be made using credentials such as cookies or authorization headers.
+ *      - __beforeSend__ `{callback}` A pre-request callback function that can be used to modify the XHR object before it is sent. Use this to set custom headers, etc. The XHR and settings objects are passed as arguments.
  *
  *    @return {Promise} A Promise that resolves to the data. The Promise instance is abortable and exposes an `abort` method. Invoking abort on the Promise instance indirectly rejects it.
  *
@@ -101,19 +102,26 @@ var contentTypes = {
 };
 
 var _xhrResp = function (xhr, options) {
-	switch (options.dataType || xhr.getResponseHeader("Content-Type").split(";")[0]) {
-		case "text/xml":
-		case "xml":
-			return xhr.responseXML;
-		case "text/json":
-		case "application/json":
-		case "text/javascript":
-		case "application/javascript":
-		case "application/x-javascript":
-		case "json":
-			return xhr.responseText && JSON.parse(xhr.responseText);
-		default:
-			return xhr.responseText;
+	var type = (options.dataType || xhr.getResponseHeader("Content-Type").split(";")[0]);
+	
+	if(type && (xhr.responseText || xhr.responseXML)){
+		
+		switch (type) {
+			case "text/xml":
+			case "xml":
+				return xhr.responseXML;
+			case "text/json":
+			case "application/json":
+			case "text/javascript":
+			case "application/javascript":
+			case "application/x-javascript":
+			case "json":
+				return xhr.responseText && JSON.parse(xhr.responseText);
+			default:
+				return xhr.responseText;
+		}
+	} else {
+		return xhr;
 	}
 };
 
@@ -186,7 +194,7 @@ function ajax(o) {
 				if (xhr.status >= 200 && xhr.status < 300) {
 					deferred.resolve( _xhrResp(xhr, o) );
 				} else {
-					deferred.reject( xhr );
+					deferred.reject( _xhrResp(xhr, o) );
 				}
 			}
 			else if (o.progress) {
@@ -232,11 +240,15 @@ function ajax(o) {
 		xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
 	}
 
-        if (o.xhrFields) {
-            for (var f in o.xhrFields) {
-                xhr[f] = o.xhrFields[f];
-            }
-        }
+	if(o.beforeSend){
+		o.beforeSend.call( o, xhr, o );
+	}
+
+	if (o.xhrFields) {
+		for (var f in o.xhrFields) {
+			xhr[f] = o.xhrFields[f];
+		}
+	}
 
 	xhr.send(data);
 	return promise;

index.html

@@ -24,7 +24,6 @@
     "release:minor": "npm version minor && npm publish",
     "release:major": "npm version major && npm publish",
     "build": "node build.js",
-    "develop": "done-serve --static --develop --port 8080",
     "detect-cycle": "detect-cyclic-packages --ignore done-serve"
   },
   "main": "dist/cjs/can-ajax",
@@ -37,13 +36,8 @@
   ],
   "steal": {
     "main": "can-ajax",
-    "configDependencies": [
-      "live-reload"
-    ],
     "npmIgnore": [
       "testee",
-      "generator-donejs",
-      "donejs-cli",
       "steal-tools"
     ]
   },
@@ -52,18 +46,15 @@
     "can-namespace": "^1.0.0",
     "can-param": "^1.0.1",
     "can-parse-uri": "^1.0.0",
-    "can-reflect": "^1.4.5"
+    "can-reflect": "^1.16.3"
   },
   "devDependencies": {
     "can-make-map": "^1.0.0",
     "detect-cyclic-packages": "^1.1.0",
-    "done-serve": "^1.0.0",
-    "donejs-cli": "^1.0.0",
-    "generator-donejs": "^1.0.0",
     "jshint": "^2.9.1",
-    "steal": "^1.5.10",
+    "steal": "^1.11.8",
     "steal-qunit": "^1.0.1",
-    "steal-tools": "^1.2.0",
-    "testee": "^0.7.0"
+    "steal-tools": "^1.11.9",
+    "testee": "^0.8.0"
   }
 }