Fixed issue with parsing the response string into a json object with …

…having more than two dashes '--' in the returned data.
jonsamwell · Mar 16, 2015 · fc735f5 · fc735f5
1 parent bd99662
commit fc735f5
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 32 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-http-batcher",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Enables transparent HTTP batch requests with Angular",
   "main": "dist/angular-http-batch.min.js",
   "keywords": [

diff --git a/dist/ChangeLog.txt b/dist/ChangeLog.txt
@@ -1,3 +1,6 @@
+16/03/2015 V1.6.0
+Fixed issue with parsing the response string into a json object with having more than two dashes '--' in the returned data.
+
 19/11/2014 V1.5.0
 When batching requests that have request bodies, such as "POST" requests, the standard angular request transforms convert objects into json strings.
 When angular-http-batcher calls angular.toJson again, we end up with a single json string, instead of a json encoding of the object in the batched request.

diff --git a/dist/angular-http-batch.js b/dist/angular-http-batch.js
@@ -1,7 +1,7 @@
 /*
- * angular-http-batcher - v1.5.0 - 2014-11-19
+ * angular-http-batcher - v1.6.0 - 2015-03-16
  * https://github.com/jonsamwell/angular-http-batcher
- * Copyright (c) 2014 Jon Samwell
+ * Copyright (c) 2015 Jon Samwell
  */
 (function (window, angular) {
         'use strict';
@@ -170,9 +170,10 @@ angular.module(window.ahb.name).factory('httpBatcher', [
 
             currentBatchedRequests = {},
 
-            BatchRequestPartParser = function (part, request) {
+            BatchRequestPartParser = function (part, request, boundaryToken) {
                 this.part = part;
                 this.request = request;
+                this.boundaryToken = boundaryToken;
             },
 
             BatchRequestManager = function (config, sendCallback) {
@@ -277,7 +278,7 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                             // need to get all the lines left apart from the last multipart seperator.
                             result.data = '';
                             j = 1;
-                            regex = new RegExp('--.*--', 'i');
+                            regex = new RegExp('--' + this.boundaryToken + '--', 'i');
                             while (regex.test(responsePart) === false && ((i + j) <= responseParts.length)) {
                                 result.data += responsePart;
                                 responsePart = responseParts[i + j];
@@ -337,7 +338,6 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                         batchBody.push(constants.emptyString);
 
                         if (request.data) {
-                            //batchBody.push(angular.toJson(request.data));
                             batchBody.push(request.data);
                         }
 
@@ -363,7 +363,7 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                         for (i = 0; i < parts.length; i += 1) {
                             part = parts[i];
                             if (part !== constants.emptyString) {
-                                responseParser = new BatchRequestPartParser(part, self.requests[responseCount]);
+                                responseParser = new BatchRequestPartParser(part, self.requests[responseCount], boundaryToken);
                                 responseParser.process();
                                 responseCount += 1;
                             }

diff --git a/dist/angular-http-batch.min.js b/dist/angular-http-batch.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-http-batcher",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Enables transparent HTTP batch requests with Angular",
   "main": "angular-http-batcher.min.js",
   "scripts": {

diff --git a/servers/WebApi2/WebApiHttpBatchServer.v12.suo b/servers/WebApi2/WebApiHttpBatchServer.v12.suo
diff --git a/src/services/httpBatcher.js b/src/services/httpBatcher.js
@@ -18,9 +18,10 @@ angular.module(window.ahb.name).factory('httpBatcher', [
 
             currentBatchedRequests = {},
 
-            BatchRequestPartParser = function (part, request) {
+            BatchRequestPartParser = function (part, request, boundaryToken) {
                 this.part = part;
                 this.request = request;
+                this.boundaryToken = boundaryToken;
             },
 
             BatchRequestManager = function (config, sendCallback) {
@@ -125,7 +126,7 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                             // need to get all the lines left apart from the last multipart seperator.
                             result.data = '';
                             j = 1;
-                            regex = new RegExp('--.*--', 'i');
+                            regex = new RegExp('--' + this.boundaryToken + '--', 'i');
                             while (regex.test(responsePart) === false && ((i + j) <= responseParts.length)) {
                                 result.data += responsePart;
                                 responsePart = responseParts[i + j];
@@ -185,7 +186,6 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                         batchBody.push(constants.emptyString);
 
                         if (request.data) {
-                            //batchBody.push(angular.toJson(request.data));
                             batchBody.push(request.data);
                         }
 
@@ -211,7 +211,7 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                         for (i = 0; i < parts.length; i += 1) {
                             part = parts[i];
                             if (part !== constants.emptyString) {
-                                responseParser = new BatchRequestPartParser(part, self.requests[responseCount]);
+                                responseParser = new BatchRequestPartParser(part, self.requests[responseCount], boundaryToken);
                                 responseParser.process();
                                 responseCount += 1;
                             }

diff --git a/tests/index.html b/tests/index.html
@@ -39,26 +39,35 @@
         '$http',
     function ($scope, $http) {
         $scope.callSingle = function () {
-            $http.get('http://fsatnav:8080/api/products', { cache: true }).then(function (data) {
-                console.log('success 0 - ' + data.data);
+//            $http.get('http://localhost:8080/api/products', { cache: true }).then(function (data) {
+//                console.log('success 0 - ' + data.data);
+//            }, function (err) {
+//                console.log('error 0 - ' + err);
+//            });
+
+            $http.get('http://localhost:8080/api/products/2').then(function (data) {
+                console.log('success 1 - ' + data.data);
             }, function (err) {
-                console.log('error 0 - ' + err);
+                console.log('error 1 - ' + err);
             });
 
-//            $http.get('http://fsatnav:8080/api/products/2').then(function (data) {
-//                console.log('success 1 - ' + data.data);
-//            }, function (err) {
-//                console.log('error 1 - ' + err);
-//            });
-//
-//            $http.put('http://fsatnav:8080/api/products', {
-//                Name: 'Product X',
-//                StockQuantity: 300
-//            }).then(function (data) {
-//                console.log('success 2 - ' + data.data);
-//            }, function (err) {
-//                console.log('error 2 - ' + angular.fromJson(err));
-//            });
+            var promise = $http.put('http://localhost:8080/api/products', {
+                Name: 'Product X',
+                StockQuantity: 300
+            });
+
+            debugger;
+
+            promise.catch(function (data) {
+                debugger;
+                console.log('balls');
+            });
+
+            promise.then(function (data) {
+                console.log('success 2 - ' + data.data);
+            }, function (err) {
+                console.log('error 2 - ' + angular.fromJson(err));
+            });
         };
     }]);
 </script>