Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding URLDecode, a complementary function for URLEncode. Updated NSString related unit tests. #253

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/TapkuLibrary/NSString+TKCategory.h
Expand Up @@ -45,6 +45,8 @@
*/
- (NSString*) URLEncode;

- (NSString*) URLDecode;

/** Returns a `NSString` that properly replaces HTML specific character sequences.
@return An escaped HTML string.
*/
Expand Down
16 changes: 9 additions & 7 deletions src/TapkuLibrary/NSString+TKCategory.m
Expand Up @@ -63,6 +63,15 @@ - (NSString*) URLEncode{

}

- (NSString*) URLDecode{

NSString *decodedString = (__bridge_transfer NSString *)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(
NULL,
(__bridge CFStringRef)self,
CFSTR(""),
kCFStringEncodingUTF8);
return decodedString;
}

- (NSString *) escapeHTML{
NSMutableString *s = [NSMutableString string];
Expand Down Expand Up @@ -92,9 +101,6 @@ - (NSString *) escapeHTML{
case '"':
[s appendString:@"""];
break;
// case '…':
// [s appendString:@"…"];
// break;
case '&':
[s appendString:@"&"];
break;
Expand Down Expand Up @@ -176,10 +182,6 @@ - (BOOL) hasString:(NSString*)substring{
return !([self rangeOfString:substring].location == NSNotFound);
}





- (NSString*) formattedPhoneNumberWithLastCharacterRemoved:(BOOL)deleteLastChar{
if(self.length<1) return @"";

Expand Down
8 changes: 8 additions & 0 deletions src/Tests/NSStringTests.m
Expand Up @@ -57,6 +57,14 @@ - (void) testURLEncode{
STAssertEqualObjects([@"\"Aardvarks lurk, OK?\"" URLEncode], @"%22Aardvarks%20lurk%2C%20OK%3F%22", nil);
}

- (void) testURLDecode {
NSString * originalString = @"?test ;";
NSString* encoded = [originalString URLEncode];

STAssertEqualObjects(@"%3Ftest%20%3B", encoded, @"encode should work");
STAssertEqualObjects(originalString, [encoded URLDecode], @"decode should work");
}


- (void) testHasString{

Expand Down