From b7e1fb0515798e1b4f3f2426f6b050951bee2617 Mon Sep 17 00:00:00 2001
From: Fredrik Bonander <carl.fredrik.bonander>
Date: Wed, 23 Jan 2013 10:53:49 +0100
Subject: [PATCH] fix(resource): Update RegExp to allow urlParams with out
 leading slash

Will allow reoucese to be loaded from a relative path
Example:
var R = $resource(':path');
R.get({ path : 'data.json' });

Example usage:
Load resources in applications not using webserver, ie local webapp in
on a tablet.
---
 src/ngResource/resource.js      |  2 +-
 test/ngResource/resourceSpec.js | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
index 81b57f43ae13..484e9b01c92e 100644
--- a/src/ngResource/resource.js
+++ b/src/ngResource/resource.js
@@ -308,7 +308,7 @@ angular.module('ngResource', ['ng']).
       this.defaults = defaults || {};
       var urlParams = this.urlParams = {};
       forEach(template.split(/\W/), function(param){
-        if (param && template.match(new RegExp("[^\\\\]:" + param + "\\W"))) {
+        if (param && (new RegExp("(^|[^\\\\]):" + param + "\\W").test(template))) {
           urlParams[param] = true;
         }
       });
diff --git a/test/ngResource/resourceSpec.js b/test/ngResource/resourceSpec.js
index d0bcbefc69ff..1edb5a959b6f 100644
--- a/test/ngResource/resourceSpec.js
+++ b/test/ngResource/resourceSpec.js
@@ -129,6 +129,18 @@ describe("resource", function() {
     R.get({a: 'doh@fo o', ':bar': '$baz@1', '!do&h': 'g=a h'});
   });
 
+  it('should allow relative paths in resource url', function () {
+    var R = $resource(':relativePath');
+    $httpBackend.expect('GET', 'data.json').respond('{}');
+    R.get({ relativePath: 'data.json' });
+  });
+
+  it('should handle + in url params', function () {
+    var R = $resource('/api/myapp/:myresource?from=:from&to=:to&histlen=:histlen');
+    $httpBackend.expect('GET', '/api/myapp/pear+apple?from=2012-04-01&to=2012-04-29&histlen=3').respond('{}');
+    R.get({ myresource: 'pear+apple', from : '2012-04-01', to : '2012-04-29', histlen : 3  });
+  });
+
 
   it('should encode & in url params', function() {
     var R = $resource('/Path/:a');