kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-05-13 03:29:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unescape URL metadata mapping parameters if route required parameter escaping

Browse Source
This commit is contained in:
Yannick Reifschneider
2013-02-06 11:43:04 +01:00
committed by Blake Watters
parent e805bbc41e
commit 7f5b0fec97
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Code/Support/RKPathMatcher.m
View File

@@ -140,7 +140,14 @@ static NSString *RKEncodeURLString(NSString *unencodedString)
}
NSString *path = [self.socPattern stringFromObject:object withBlock:encoderBlock];
if (interpolatedParameters) {
*interpolatedParameters = [self.socPattern parameterDictionaryFromSourceString:path];
NSMutableDictionary *parsedParameters = [[self.socPattern parameterDictionaryFromSourceString:path] mutableCopy];
if (addEscapes) {
for (NSString *key in [parsedParameters allKeys]) {
NSString *unescapedParameter = [[parsedParameters objectForKey:key] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
[parsedParameters setValue:unescapedParameter forKey:key];
}
}
*interpolatedParameters = parsedParameters;
}
return path;
}

10
Tests/Logic/Support/RKPathMatcherTest.m
View File

@@ -125,6 +125,16 @@
expect(interpolatedPath).to.equal(expectedPath);
}
- (void)testThatEscapedParametersAreUnescapedWhenCreatingPathFromObject
{
NSDictionary *arguments = @{ @"name": @"Blake Watters" };
RKPathMatcher *matcher = [RKPathMatcher pathMatcherWithPattern:@"/names/:name"];
NSDictionary *params = nil;
[matcher pathFromObject:arguments addingEscapes:YES interpolatedParameters:&params];
expect(params).notTo.beNil();
expect([params objectForKey:@"name"]).to.equal(@"Blake Watters");
}
- (void)testMatchingPathWithTrailingSlashAndQuery
{
RKPathMatcher *pathMatcher = [RKPathMatcher pathMatcherWithPattern:@"/api/v1/organizations/"];