covered the situation when undefined parameters are not the end of the url

Author: petrovalex

src/ngResource/resource.js

@@ -279,12 +279,17 @@ angular.module('ngResource', ['ng']).
       url: function(params) {
         var self = this,
             url = this.template,
+            val,
             encodedVal;
 
         params = params || {};
         forEach(this.urlParams, function(_, urlParam){
-          encodedVal = encodeUriSegment(params[urlParam] || self.defaults[urlParam] || "");
-          url = url.replace(new RegExp(":" + urlParam + "(\\W)", "g"), encodedVal + "$1");
+          if (val = (params[urlParam] || self.defaults[urlParam])) {
+            encodedVal = encodeUriSegment(val);
+            url = url.replace(new RegExp(":" + urlParam + "(\\W)", "g"), encodedVal + "$1");
+          } else {
+            url = url.replace(new RegExp("/?:" + urlParam + "(\\W)", "g"), '$1');
+          }
         });
         url = url.replace(/\/?#$/, '');
         var query = [];

test/ngResource/resourceSpec.js

@@ -48,12 +48,14 @@ describe("resource", function() {
     $httpBackend.expect('GET', '/Path');
     $httpBackend.expect('GET', '/Path/1');
     $httpBackend.expect('GET', '/Path/2/3');
-    $httpBackend.expect('GET', '/Path/4/5/6');
+    $httpBackend.expect('GET', '/Path/4/5');
+    $httpBackend.expect('GET', '/Path/6/7/8');
 
     R.get({});
     R.get({a:1});
     R.get({a:2, b:3});
-    R.get({a:4, b:5, c:6});
+    R.get({a:4, c:5});
+    R.get({a:6, b:7, c:8});
   });