evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor code formatting

Browse source
This commit is contained in:
Mattt Thompson 2012-03-09 14:08:24 -08:00
parent 749fe6ce77
commit 3c33b744f7
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
AFNetworking/AFHTTPClient.m
View file

@ -99,7 +99,7 @@ NSString * AFURLEncodedStringFromStringWithEncoding(NSString *string, NSStringEn
static NSString * const kAFLegalCharactersToBeEscaped = @"?!@#$^&%*+,:;='\"`<>()[]{}/\\|~ "; static NSString * const kAFLegalCharactersToBeEscaped = @"?!@#$^&%*+,:;='\"`<>()[]{}/\\|~ ";
/* /*
The documentation for `CFURLCreateStringByAddingPercentEscapes` suggests that one should "pre-process" URL strings with unpredictable sequences that may already contain percent escapes. However, if the string contains an unescaped sequence with '%' appearing without an escape code (such as when representing percentages like "42%"), `stringByReplacingPercentEscapesUsingEncoding` will return `nil`. Thus, the string is only unescaped if there are no invalid percent-escaped sequences. The documentation for `CFURLCreateStringByAddingPercentEscapes` suggests that one should "pre-process" URL strings with unpredictable sequences that may already contain percent escapes. However, if the string contains an unescaped sequence with '%' appearing without an escape code (such as when representing percentages like "42%"), `stringByReplacingPercentEscapesUsingEncoding` will return `nil`. Thus, the string is only unescaped if there are no invalid percent-escaped sequences.
*/ */
NSString *unescapedString = [string stringByReplacingPercentEscapesUsingEncoding:encoding]; NSString *unescapedString = [string stringByReplacingPercentEscapesUsingEncoding:encoding];
if (unescapedString) { if (unescapedString) {
@ -116,64 +116,60 @@ extern NSDictionary * AFQueryStringComponentFromParameterAtBaseKeyWithEncoding(i
NSString * AFQueryStringFromParametersWithEncoding(NSDictionary *parameters, NSStringEncoding encoding) { NSString * AFQueryStringFromParametersWithEncoding(NSDictionary *parameters, NSStringEncoding encoding) {
NSMutableString *mutableQueryString = [NSMutableString string]; NSMutableString *mutableQueryString = [NSMutableString string];
[AFQueryParametersFromParametersAtBaseKeyWithEncoding(parameters,nil) enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
[AFQueryParametersFromParametersAtBaseKeyWithEncoding(parameters, nil) enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
[mutableQueryString appendFormat:@"%@=%@", AFURLEncodedStringFromStringWithEncoding([key description], encoding), AFURLEncodedStringFromStringWithEncoding([obj description], encoding)]; [mutableQueryString appendFormat:@"%@=%@", AFURLEncodedStringFromStringWithEncoding([key description], encoding), AFURLEncodedStringFromStringWithEncoding([obj description], encoding)];
}]; }];
return mutableQueryString; return mutableQueryString;
} }
NSDictionary * AFQueryParametersFromParametersAtBaseKeyWithEncoding(id parameters, NSString *baseKey) NSDictionary * AFQueryParametersFromParametersAtBaseKeyWithEncoding(id parameters, NSString *baseKey) {
{
NSMutableDictionary *mutableParameterComponents = [NSMutableDictionary dictionary]; NSMutableDictionary *mutableParameterComponents = [NSMutableDictionary dictionary];
if([parameters isKindOfClass:[NSDictionary class]]) { if([parameters isKindOfClass:[NSDictionary class]]) {
[mutableParameterComponents addEntriesFromDictionary:AFQueryParametersFromParametersDictionaryAtBaseKeyWithEncoding(parameters,baseKey)]; [mutableParameterComponents addEntriesFromDictionary:AFQueryParametersFromParametersDictionaryAtBaseKeyWithEncoding(parameters, baseKey)];
} } else if([parameters isKindOfClass:[NSArray class]]) {
else if([parameters isKindOfClass:[NSArray class]]) { [mutableParameterComponents addEntriesFromDictionary:AFQueryParametersFromParametersArrayAtBaseKeyWithEncoding(parameters, baseKey)];
[mutableParameterComponents addEntriesFromDictionary:AFQueryParametersFromParametersArrayAtBaseKeyWithEncoding(parameters,baseKey)]; } else {
} [mutableParameterComponents addEntriesFromDictionary:AFQueryStringComponentFromParameterAtBaseKeyWithEncoding(parameters, baseKey)];
else {
[mutableParameterComponents addEntriesFromDictionary:AFQueryStringComponentFromParameterAtBaseKeyWithEncoding(parameters,baseKey)];
} }
return mutableParameterComponents; return mutableParameterComponents;
} }
NSDictionary * AFQueryParametersFromParametersDictionaryAtBaseKeyWithEncoding(NSDictionary *parameters, NSString *baseKey) NSDictionary * AFQueryParametersFromParametersDictionaryAtBaseKeyWithEncoding(NSDictionary *parameters, NSString *baseKey){
{
NSMutableDictionary *mutableParameterComponents = [NSMutableDictionary dictionary]; NSMutableDictionary *mutableParameterComponents = [NSMutableDictionary dictionary];
id key = nil; id key = nil;
NSEnumerator *enumerator = [parameters keyEnumerator]; NSEnumerator *enumerator = [parameters keyEnumerator];
while ((key = [enumerator nextObject])) { while ((key = [enumerator nextObject])) {
NSString *newKey = baseKey?[NSString stringWithFormat:@"%@[%@]",baseKey,key]:key; NSString *nextKey = baseKey ? [NSString stringWithFormat:@"%@[%@]", baseKey, key] : key;
[mutableParameterComponents addEntriesFromDictionary:AFQueryParametersFromParametersAtBaseKeyWithEncoding([parameters valueForKey:key],newKey)]; [mutableParameterComponents addEntriesFromDictionary:AFQueryParametersFromParametersAtBaseKeyWithEncoding([parameters valueForKey:key], nextKey)];
} }
return mutableParameterComponents; return mutableParameterComponents;
} }
NSDictionary * AFQueryParametersFromParametersArrayAtBaseKeyWithEncoding(NSArray *parameters, NSString *baseKey) NSDictionary * AFQueryParametersFromParametersArrayAtBaseKeyWithEncoding(NSArray *parameters, NSString *baseKey) {
{
NSMutableDictionary *mutableParameterComponents = [NSMutableDictionary dictionary]; NSMutableDictionary *mutableParameterComponents = [NSMutableDictionary dictionary];
for (id value in parameters) { for (id value in parameters) {
NSString* newKey = [NSString stringWithFormat:@"%@[]",baseKey]; NSString *nextKey = [NSString stringWithFormat:@"%@[]", baseKey];
[mutableParameterComponents addEntriesFromDictionary:AFQueryParametersFromParametersAtBaseKeyWithEncoding(value,newKey)]; [mutableParameterComponents addEntriesFromDictionary:AFQueryParametersFromParametersAtBaseKeyWithEncoding(value, nextKey)];
} }
return mutableParameterComponents; return mutableParameterComponents;
} }
NSDictionary * AFQueryStringComponentFromParameterAtBaseKeyWithEncoding(id parameter, NSString *key) NSDictionary * AFQueryStringComponentFromParameterAtBaseKeyWithEncoding(id parameter, NSString *key) {
{
return [NSDictionary dictionaryWithObject:parameter forKey:key]; return [NSDictionary dictionaryWithObject:parameter forKey:key];
} }
static NSString * AFJSONStringFromParameters(NSDictionary *parameters) { static NSString * AFJSONStringFromParameters(NSDictionary *parameters) {
NSError *error = nil; NSError *error = nil;
NSData *JSONData = AFJSONEncode(parameters, &error); NSData *JSONData = AFJSONEncode(parameters, &error);
if (!error) { if (!error) {
return [[[NSString alloc] initWithData:JSONData encoding:NSUTF8StringEncoding] autorelease]; return [[[NSString alloc] initWithData:JSONData encoding:NSUTF8StringEncoding] autorelease];
} else { } else {