Add empty string as default parameter value when returning the available resources instead of undefined.

Author: guylabs

src/angular-spring-data-rest-provider.js

@@ -151,6 +151,13 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
                             }
                         }
 
+                        // remove parameters which have an empty string as value
+                        angular.forEach(parameters, function (value, key) {
+                            if (value === "") {
+                                delete parameters[key];
+                            }
+                        });
+
                         // process the url and call the resources function with the given parameters
                         return resourcesFunction(getProcessedUrl(data, resourceObject.name), parameters, actions, options);
                     } else if (resourceObject in resources) {

src/angular-spring-data-rest-utils.js

@@ -86,12 +86,12 @@ function removeTemplateParameters(url) {
 }
 
 /**
- * Returns the template parameters of the given url as array. e.g. from this url
- * 'http://localhost:8080/categories{?page,size,sort}' it will return the following array:
- * ['page', 'size', 'sort']
+ * Returns the template parameters of the given url as object. e.g. from this url
+ * 'http://localhost:8080/categories{?page,size,sort}' it will return the following object:
+ * {'page': "", 'size': "", 'sort': ""}
  *
  * @param {string} url the url with the template parameters
- * @returns {object} the array containing the template parameters
+ * @returns {object} the object containing the template parameters
  */
 function extractTemplateParameters(url) {
     var templateParametersObject = {};
@@ -100,7 +100,7 @@ function extractTemplateParameters(url) {
     var templateParametersArray = regexp.exec(url)[1].split(',');
 
     angular.forEach(templateParametersArray, function (value) {
-        templateParametersObject[value] = undefined;
+        templateParametersObject[value] = "";
     });
 
     return templateParametersObject;

test/angular-spring-data-rest-provider.resources.spec.js

@@ -40,6 +40,50 @@ describe("the resources property", function () {
         this.httpBackend.flush();
     });
 
+    it("must call the correct href url with parameters if a resource object with parameters is passed to the $resource method", function () {
+
+        // define the resource object and the correct link href url
+        var resourceObject = {
+            'name': 'self',
+            'parameters': {
+                'parameter1': '1',
+                'parameter2': '2'
+            }
+        };
+        var resourceHref = "http://localhost:8080/categories?parameter1=1&parameter2=2";
+
+        // check if the underlying $resource method is called with the correct href url
+        var expectedResult = {categoryId: '123'};
+        this.httpBackend.whenGET(resourceHref).respond(200, expectedResult);
+        this.httpBackend.expectGET(resourceHref);
+        var result = this.response[this.config.resourcesKey](resourceObject).get(function () {
+            expect(result.categoryId).toEqual(expectedResult.categoryId);
+        });
+        this.httpBackend.flush();
+    });
+
+    it("must call the correct href url without parameters if a resource object with empty parameters is passed to the $resource method", function () {
+
+        // define the resource object and the correct link href url
+        var resourceObject = {
+            'name': 'self',
+            'parameters': {
+                'parameter1': "",
+                'parameter2': ""
+            }
+        };
+        var resourceHref = "http://localhost:8080/categories";
+
+        // check if the underlying $resource method is called with the correct href url
+        var expectedResult = {categoryId: '123'};
+        this.httpBackend.whenGET(resourceHref).respond(200, expectedResult);
+        this.httpBackend.expectGET(resourceHref);
+        var result = this.response[this.config.resourcesKey](resourceObject).get(function () {
+            expect(result.categoryId).toEqual(expectedResult.categoryId);
+        });
+        this.httpBackend.flush();
+    });
+
     it("it must call the overridden resource function with the given resource name", function () {
         var url = undefined, paramDefaults = undefined, actions = undefined, options = undefined;
         var resourcesFunctionConfiguration = {
@@ -184,9 +228,9 @@ describe("the resources property", function () {
                 {
                     name: 'self',
                     parameters: {
-                        page: undefined,
-                        size: undefined,
-                        sort: undefined
+                        page: "",
+                        size: "",
+                        sort: ""
                     }
                 },
                 {
@@ -227,25 +271,25 @@ describe("the resources property", function () {
                 {
                     name: 'users',
                     parameters: {
-                        page: undefined,
-                        size: undefined,
-                        sort: undefined
+                        page: "",
+                        size: "",
+                        sort: ""
                     }
                 },
                 {
                     name: 'categories',
                     parameters: {
-                        page: undefined,
-                        size: undefined,
-                        sort: undefined
+                        page: "",
+                        size: "",
+                        sort: ""
                     }
                 },
                 {
                     name: 'accounts',
                     parameters: {
-                        page: undefined,
-                        size: undefined,
-                        sort: undefined
+                        page: "",
+                        size: "",
+                        sort: ""
                     }
                 }
             ]