Added support for complex relative urls i.e. './api/products' or '../api/products'

Author: jonsamwell

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-http-batcher",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Enables transparent HTTP batch requests with Angular",
   "main": "dist/angular-http-batch.js",
   "keywords": [

dist/ChangeLog.txt

@@ -1,3 +1,6 @@
+15/07/2015 V1.10.0
+Added support for complex relative urls i.e. './api/products' or '../api/products'
+
 15/07/2015 V1.9.0
 A function can now be added to the config object to override the default mechanism used to determine if a call should be batched.
 Add a canBatchRequest function to the config object which takes in a url and http method type and return true if the call can be batched.

dist/angular-http-batch.js

@@ -1,5 +1,5 @@
 /*
- * angular-http-batcher - v1.9.0 - 2015-07-15
+ * angular-http-batcher - v1.10.0 - 2015-07-15
  * https://github.com/jonsamwell/angular-http-batcher
  * Copyright (c) 2015 Jon Samwell
  */
@@ -440,6 +440,13 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                         protocolEndIndex,
                         urlParts;
 
+                    if (url.indexOf('./') > -1 || url.indexOf('../') > -1) {
+                        // we have a complex relative url i.e. './api/products' or '../api/products
+                        var parser = document.createElement('a');
+                        parser.href = url;
+                        url = parser.href;
+                    }
+
                     if (url.indexOf('://') > -1) {
                         protocolEndIndex = url.indexOf('://') + 3;
                         urlParts = url.slice(protocolEndIndex).split(constants.forwardSlash);

dist/angular-http-batch.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-http-batcher",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Enables transparent HTTP batch requests with Angular",
   "main": "angular-http-batcher.min.js",
   "scripts": {

package.json

@@ -266,6 +266,13 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                         protocolEndIndex,
                         urlParts;
 
+                    if (url.indexOf('./') > -1 || url.indexOf('../') > -1) {
+                        // we have a complex relative url i.e. './api/products' or '../api/products
+                        var parser = document.createElement('a');
+                        parser.href = url;
+                        url = parser.href;
+                    }
+
                     if (url.indexOf('://') > -1) {
                         protocolEndIndex = url.indexOf('://') + 3;
                         urlParts = url.slice(protocolEndIndex).split(constants.forwardSlash);

src/services/httpBatcher.js

@@ -9,6 +9,7 @@
 <div ng-controller="mainCtrl">
     <button type="button" ng-click="callSingle();">Call Single API Method</button>
     <button type="button" ng-click="setCookie();">Set Server Cookie</button>
+    <button type="button" ng-click="tryRelativeUrl();">Try Relative Url</button>
 </div>
 
 <script src="../bower_components/angular/angular.js"></script>
@@ -34,9 +35,20 @@
                         'http://localhost:8080',
                         'http://localhost:8080/api/batch', {
                             batchRequestCollectionDelay: 500,
-                            minimumBatchSize: 2,
+                            minimumBatchSize: 1,
                             sendCookies: true
                         });
+                // relative endpoint
+                httpBatchConfigProvider.setAllowedBatchEndpoint(
+                        './',
+                        'http://localhost:60000/api/batch', {
+                            batchRequestCollectionDelay: 500,
+                            minimumBatchSize: 1,
+                            sendCookies: true,
+                            canBatchRequest: function() {
+                                return true;
+                            }
+                        });
             }
     ]);
 
@@ -86,6 +98,15 @@
                 console.log('error 2 - ' + angular.toJson(err));
             });
         };
+
+        $scope.tryRelativeUrl = function() {
+            debugger;
+            $http.get('./api/products').then(function (data) {
+                console.log('success 0 - ' + data.data);
+            }, function (err) {
+                console.log('error 0 - ' + angular.toJson(err));
+            });
+        }
     }]);
 </script>
 

tests/index.html

@@ -125,6 +125,30 @@
                     $httpBackend.flush();
                 });
 
+
+                it('should create the correct http post data for a complex relative url GET request', function () {
+                    var batchConfig = {
+                            batchEndpointUrl: 'api/batch',
+                            batchRequestCollectionDelay: 200,
+                            minimumBatchSize: 1
+                        },
+                        postData = '--some_boundary_mocked\r\nContent-Type: application/http; msgtype=request\r\n\r\nGET /resource HTTP/1.1\r\nHost: localhost:9876\r\n\r\n\r\n--some_boundary_mocked--',
+                        responseData = '';
+
+                    $httpBackend.expectPOST(batchConfig.batchEndpointUrl, postData).respond(404, responseData);
+                    sandbox.stub(httpBatchConfig, 'calculateBoundary').returns('some_boundary_mocked');
+                    sandbox.stub(httpBatchConfig, 'getBatchConfig').returns(batchConfig);
+
+                    httpBatcher.batchRequest({
+                        url: './resource',
+                        method: 'GET',
+                        callback: angular.noop
+                    });
+
+                    $timeout.flush();
+                    $httpBackend.flush();
+                });
+
                 it('should add additional headers to the batch request as defined in the config object', function () {
                     var batchConfig = {
                             batchEndpointUrl: 'http://www.someservice.com/batch',