Adding arraybuffer xhr responseType support

doc/operators/ajax.md

@@ -19,7 +19,7 @@ OR
     - `method` *(String)*: Method of the request, such as GET, POST, PUT, PATCH, DELETE. The default is GET.
     - `password` *(String)*: The password for the request.
     - `progressObserver` *(Observer)*: An optional `Observer` which listen to XHR2 progress events or error timeout values.
-    - `responseType` *(String)*: The response type. Either can be 'json', 'text' or 'blob'. The default is 'text'
+    - `responseType` *(String)*: The response type. Either can be 'json', 'text', 'blob' or 'arraybuffer'. The default is 'text'
     - `timeout`: `Number` - a number representing the number of milliseconds a request can take before automatically being terminated. A value of 0 (which is the default) means there is no timeout.
     - `url` *(String)*: URL of the request
     - `user` *(String)*: The user for the request.

src/ajax/ajax.js

@@ -35,9 +35,9 @@
     }
   }
 
-  function normalizeAjaxSuccessEvent(e, xhr, settings) {
+  function normalizeAjaxSuccessEvent(e, xhr) {
     var response = ('response' in xhr) ? xhr.response : xhr.responseText;
-    response = settings.responseType === 'json' ? JSON.parse(response) : response;
+    response = xhr.responseType === 'json' && response && typeof response === 'string' ? JSON.parse(response) : response;
     return {
       response: response,
       status: xhr.status,
@@ -74,7 +74,7 @@
       var processResponse = function(xhr, e){
         var status = xhr.status === 1223 ? 204 : xhr.status;
         if ((status >= 200 && status <= 300) || status === 0 || status === '') {
-          o.onNext(normalizeSuccess(e, xhr, settings));
+          o.onNext(normalizeSuccess(e, xhr));
           o.onCompleted();
         } else {
           o.onError(settings.normalizeError(e, xhr, 'error'));
@@ -95,9 +95,7 @@
           xhr.open(settings.method, settings.url, settings.async);
         }
 
-        if (settings.responseType === 'blob') {
-          xhr.responseType = 'blob';
-        }
+        xhr.responseType = settings.responseType;
 
         var headers = settings.headers;
         for (var header in headers) {

tests/ajax/tests.ajax.js

@@ -235,6 +235,92 @@
     requests[0].respond(500, { 'Content-Type': 'application/json' }, 'error');
   });
 
+  test('ajax arraybuffer success', function () {
+    var source = Rx.DOM.ajax({
+      url: '/products/1/image',
+      method: 'GET',
+      responseType: 'arraybuffer',
+      headers: {
+        'X-Requested-With': 'RxJS',
+        'Accept': 'application/octet-stream'
+      }
+    });
+
+    source.subscribe(
+      function (x) {
+        // Ensure GET by default
+        equal('GET', x.xhr.method);
+
+        // Ensure status
+        equal(200, x.status);
+
+        // Ensure async
+        ok(x.xhr.async);
+
+        //Assert equality for the message
+        ok(x.xhr.response instanceof ArrayBuffer);
+
+        var data = '';
+        var bytes = new Uint8Array(x.xhr.response);
+        for (var i = 0; i < bytes.byteLength; i++) {
+          data += String.fromCharCode(bytes[i]);
+        }
+        equal('a test array buffer', data);
+      },
+      function () {
+        ok(false);
+      },
+      function () {
+        ok(true);
+      }
+    );
+
+    requests[0].respond(200, { 'Content-Type': 'application/octet-stream' }, 'a test array buffer');
+  });
+
+  asyncTest('ajax blob success', function () {
+    var source = Rx.DOM.ajax({
+      url: '/products/2/image',
+      method: 'GET',
+      responseType: 'blob',
+      headers: {
+        'X-Requested-With': 'RxJS',
+        'Accept': 'application/octet-stream'
+      }
+    });
+
+    source.subscribe(
+      function (x) {
+        // Ensure GET by default
+        equal('GET', x.xhr.method);
+
+        // Ensure status
+        equal(200, x.status);
+
+        // Ensure async
+        ok(x.xhr.async);
+
+        //Assert equality for the message
+        ok(x.xhr.response instanceof Blob);
+
+        var blobReader = new FileReader();
+        blobReader.onloadend = function () {
+          start();
+          equal('a test blob', blobReader.result);
+        };
+        blobReader.readAsText(x.xhr.response);
+      },
+      function () {
+        ok(false);
+      },
+      function () {
+        ok(true);
+      }
+    );
+
+    requests[0].respond(200, { 'Content-Type': 'application/octet-stream' }, 'a test blob');
+  });
+
   test('ajax failure settings', function () {
     var source = Rx.DOM.ajax({
       url: '/products',
@@ -442,7 +528,7 @@
       }
     );
 
-    requests[0].respond(500, { 'Content-Type': 'application/json' }, 'error');
+    requests[0].respond(500, { 'Content-Type': 'text/plain' }, 'error');
   });
 
 
@@ -483,7 +569,7 @@
         ok(x.xhr.async);
 
         // Assert equality for the message
-        equal('error', x.xhr.responseText);
+        ok(x.xhr.response.error);
 
         // Assert type of error
         equal('error', x.type);
@@ -493,7 +579,7 @@
       }
     );
 
-    requests[0].respond(500, { 'Content-Type': 'application/json' }, 'error');
+    requests[0].respond(500, { 'Content-Type': 'application/json' }, '{ "error": true }');
   });
 
 }());

tests/rx.dom.compat.html

@@ -9,7 +9,7 @@
 <body>
   <div id="qunit"></div>
   <script src="vendor/qunit-1.9.0.js"></script>
-  <script src="vendor/sinon-1.7.3.js"></script>
+  <script src="vendor/sinon-1.17.3.js"></script>
   <script src="../node_modules/rx/dist/rx.lite.compat.js"></script>
   <script src="../node_modules/rx/dist/rx.virtualtime.js"></script>
   <script src="../node_modules/rx/dist/rx.testing.js"></script>

tests/rx.dom.html

@@ -85,7 +85,7 @@
     }
   </script>
   <script src="vendor/qunit-1.9.0.js"></script>
-  <script src="vendor/sinon-1.7.3.js"></script>
+  <script src="vendor/sinon-1.17.3.js"></script>
   <script src="../node_modules/rx/dist/rx.lite.js"></script>
   <script src="../node_modules/rx/dist/rx.virtualtime.js"></script>
   <script src="../node_modules/rx/dist/rx.testing.js"></script>