Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
fix($resource): ignore undefined parameters
Browse files Browse the repository at this point in the history
- $resource should handle multiple params with same name
- ignore slashes of undefined parameters
- fix default parameters issue, mentioned in #875

Closes #875
Closes #782
  • Loading branch information
petrovalex authored and mhevery committed Sep 6, 2012
1 parent a56aaa9 commit d2e52b2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
14 changes: 10 additions & 4 deletions src/ngResource/resource.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,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)"), 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 = [];
Expand All @@ -306,8 +311,9 @@ angular.module('ngResource', ['ng']).

actions = extend({}, DEFAULT_ACTIONS, actions);

function extractParams(data){
function extractParams(data, actionParams){
var ids = {};
paramDefaults = extend(paramDefaults, actionParams);
forEach(paramDefaults || {}, function(value, key){
ids[key] = value.charAt && value.charAt(0) == '@' ? getter(data, value.substr(1)) : value;
});
Expand Down Expand Up @@ -362,7 +368,7 @@ angular.module('ngResource', ['ng']).
var value = this instanceof Resource ? this : (action.isArray ? [] : new Resource(data));
$http({
method: action.method,
url: route.url(extend({}, extractParams(data), action.params || {}, params)),
url: route.url(extend({}, extractParams(data, action.params || {}), params)),
data: data,
headers: extend({}, action.headers || {})
}).then(function(response) {
Expand Down
27 changes: 25 additions & 2 deletions test/ngResource/resourceSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,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});
});


Expand Down Expand Up @@ -123,6 +125,27 @@ describe("resource", function() {
});


it('should build resource with action default param reading the value from instance', function() {
$httpBackend.expect('POST', '/Customer/123').respond();
var R = $resource('/Customer/:id', {}, {post: {method: 'POST', params: {id: '@id'}}});

var inst = new R({id:123});
expect(inst.id).toBe(123);

inst.$post();
});


it('should handle multiple params with same name', function() {
var R = $resource('/:id/:id');

$httpBackend.when('GET').respond('{}');
$httpBackend.expect('GET', '/1/1');

R.get({id:1});
});


it("should create resource", function() {
$httpBackend.expect('POST', '/CreditCard', '{"name":"misko"}').respond({id: 123, name: 'misko'});

Expand Down

0 comments on commit d2e52b2

Please sign in to comment.