Add new methods to allow ASIFormDataRequests to send multiple values for the same key

@@ -19,10 +19,10 @@ typedef enum _ASIPostFormat {
 @interface ASIFormDataRequest : ASIHTTPRequest <NSCopying> {
 @interface ASIFormDataRequest : ASIHTTPRequest <NSCopying> {
 
 
 	// Parameters that will be POSTed to the url
 	// Parameters that will be POSTed to the url
-	NSMutableDictionary *postData;
+	NSMutableArray *postData;
 	
 	
 	// Files that will be POSTed to the url
 	// Files that will be POSTed to the url
-	NSMutableDictionary *fileData;
+	NSMutableArray *fileData;
 	
 	
 	ASIPostFormat postFormat;
 	ASIPostFormat postFormat;
 	
 	
@@ -41,15 +41,30 @@ typedef enum _ASIPostFormat {
 #pragma mark setup request
 #pragma mark setup request
 
 
 // Add a POST variable to the request
 // Add a POST variable to the request
+- (void)addPostValue:(id <NSObject>)value forKey:(NSString *)key;
+
+// Set a POST variable for this request, clearing any others with the same key
 - (void)setPostValue:(id <NSObject>)value forKey:(NSString *)key;
 - (void)setPostValue:(id <NSObject>)value forKey:(NSString *)key;
 
 
 // Add the contents of a local file to the request
 // Add the contents of a local file to the request
+- (void)addFile:(NSString *)filePath forKey:(NSString *)key;
+
+// Same as above, but you can specify the content-type and file name
+- (void)addFile:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key;
+
+// Add the contents of a local file to the request, clearing any others with the same key
 - (void)setFile:(NSString *)filePath forKey:(NSString *)key;
 - (void)setFile:(NSString *)filePath forKey:(NSString *)key;
 
 
 // Same as above, but you can specify the content-type and file name
 // Same as above, but you can specify the content-type and file name
 - (void)setFile:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key;
 - (void)setFile:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key;
 
 
 // Add the contents of an NSData object to the request
 // Add the contents of an NSData object to the request
+- (void)addData:(NSData *)data forKey:(NSString *)key;
+
+// Same as above, but you can specify the content-type and file name
+- (void)addData:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key;
+
+// Add the contents of an NSData object to the request, clearing any others with the same key
 - (void)setData:(NSData *)data forKey:(NSString *)key;
 - (void)setData:(NSData *)data forKey:(NSString *)key;
 
 
 // Same as above, but you can specify the content-type and file name
 // Same as above, but you can specify the content-type and file name

@@ -15,8 +15,8 @@
 - (void)buildURLEncodedPostBody;
 - (void)buildURLEncodedPostBody;
 - (void)appendPostString:(NSString *)string;
 - (void)appendPostString:(NSString *)string;
 
 
-@property (retain) NSMutableDictionary *postData;
-@property (retain) NSMutableDictionary *fileData;
+@property (retain) NSMutableArray *postData;
+@property (retain) NSMutableArray *fileData;
 
 
 #if DEBUG_FORM_DATA_REQUEST
 #if DEBUG_FORM_DATA_REQUEST
 - (void)addToDebugBody:(NSString *)string;
 - (void)addToDebugBody:(NSString *)string;
@@ -65,23 +65,38 @@
 
 
 #pragma mark setup request
 #pragma mark setup request
 
 
-- (void)setPostValue:(id <NSObject>)value forKey:(NSString *)key
+- (void)addPostValue:(id <NSObject>)value forKey:(NSString *)key
 {
 {
 	if (![self postData]) {
 	if (![self postData]) {
-		[self setPostData:[NSMutableDictionary dictionary]];
+		[self setPostData:[NSMutableArray array]];
 	}
 	}
-	[[self postData] setValue:[value description] forKey:key];
+	[[self postData] addObject:[NSDictionary dictionaryWithObjectsAndKeys:[value description],@"value",key,@"key",nil]];
 }
 }
 
 
-- (void)setFile:(NSString *)filePath forKey:(NSString *)key
+- (void)setPostValue:(id <NSObject>)value forKey:(NSString *)key
 {
 {
-	[self setFile:filePath withFileName:nil andContentType:nil forKey:key];
+	// Remove any existing value
+	NSUInteger i;
+	for (i=0; i<[[self postData] count]; i++) {
+		NSDictionary *val = [[self postData] objectAtIndex:i];
+		if ([[val objectForKey:@"key"] isEqualToString:key]) {
+			[[self postData] removeObjectAtIndex:i];
+			i--;
+		}
+	}
+	[self addPostValue:value forKey:key];
 }
 }
 
 
-- (void)setFile:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key
+
+- (void)addFile:(NSString *)filePath forKey:(NSString *)key
+{
+	[self addFile:filePath withFileName:nil andContentType:nil forKey:key];
+}
+
+- (void)addFile:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key
 {
 {
 	if (![self fileData]) {
 	if (![self fileData]) {
-		[self setFileData:[NSMutableDictionary dictionary]];
+		[self setFileData:[NSMutableArray array]];
 	}
 	}
 	
 	
 	// If data is a path to a local file
 	// If data is a path to a local file
@@ -96,33 +111,72 @@
 		if (!fileName) {
 		if (!fileName) {
 			fileName = [(NSString *)data lastPathComponent];
 			fileName = [(NSString *)data lastPathComponent];
 		}
 		}
-	
+
 		// If we were given the path to a file, and the user didn't specify a mime type, we can detect it from the file extension
 		// If we were given the path to a file, and the user didn't specify a mime type, we can detect it from the file extension
 		if (!contentType) {
 		if (!contentType) {
 			contentType = [ASIHTTPRequest mimeTypeForFileAtPath:data];
 			contentType = [ASIHTTPRequest mimeTypeForFileAtPath:data];
 		}
 		}
 	}
 	}
 	
 	
-	NSDictionary *fileInfo = [NSDictionary dictionaryWithObjectsAndKeys:data, @"data", contentType, @"contentType", fileName, @"fileName", nil];
-	[[self fileData] setObject:fileInfo forKey:key];
+	NSDictionary *fileInfo = [NSDictionary dictionaryWithObjectsAndKeys:data, @"data", contentType, @"contentType", fileName, @"fileName", key, @"key", nil];
+	[[self fileData] addObject:fileInfo];
 }
 }
 
 
-- (void)setData:(NSData *)data forKey:(NSString *)key
+
+- (void)setFile:(NSString *)filePath forKey:(NSString *)key
 {
 {
-	[self setData:data withFileName:@"file" andContentType:nil forKey:key];
+	[self setFile:filePath withFileName:nil andContentType:nil forKey:key];
 }
 }
 
 
-- (void)setData:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key
+- (void)setFile:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key
+{
+	// Remove any existing value
+	NSUInteger i;
+	for (i=0; i<[[self fileData] count]; i++) {
+		NSDictionary *val = [[self fileData] objectAtIndex:i];
+		if ([[val objectForKey:@"key"] isEqualToString:key]) {
+			[[self fileData] removeObjectAtIndex:i];
+			i--;
+		}
+	}
+	[self addFile:data withFileName:fileName andContentType:contentType forKey:key];
+}
+
+- (void)addData:(NSData *)data forKey:(NSString *)key
+{
+	[self addData:data withFileName:@"file" andContentType:nil forKey:key];
+}
+
+- (void)addData:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key
 {
 {
 	if (![self fileData]) {
 	if (![self fileData]) {
-		[self setFileData:[NSMutableDictionary dictionary]];
+		[self setFileData:[NSMutableArray array]];
 	}
 	}
 	if (!contentType) {
 	if (!contentType) {
 		contentType = @"application/octet-stream";
 		contentType = @"application/octet-stream";
 	}
 	}
 	
 	
-	NSDictionary *fileInfo = [NSDictionary dictionaryWithObjectsAndKeys:data, @"data", contentType, @"contentType", fileName, @"fileName", nil];
-	[[self fileData] setObject:fileInfo forKey:key];
+	NSDictionary *fileInfo = [NSDictionary dictionaryWithObjectsAndKeys:data, @"data", contentType, @"contentType", fileName, @"fileName", key, @"key", nil];
+	[[self fileData] addObject:fileInfo];
+}
+
+- (void)setData:(NSData *)data forKey:(NSString *)key
+{
+	[self setData:data withFileName:@"file" andContentType:nil forKey:key];
+}
+
+- (void)setData:(id)data withFileName:(NSString *)fileName andContentType:(NSString *)contentType forKey:(NSString *)key
+{
+	// Remove any existing value
+	NSUInteger i;
+	for (i=0; i<[[self fileData] count]; i++) {
+		NSDictionary *val = [[self fileData] objectAtIndex:i];
+		if ([[val objectForKey:@"key"] isEqualToString:key]) {
+			[[self fileData] removeObjectAtIndex:i];
+			i--;
+		}
+	}
+	[self addData:data withFileName:fileName andContentType:contentType forKey:key];
 }
 }
 
 
 - (void)buildPostBody
 - (void)buildPostBody
@@ -178,12 +232,10 @@
 	
 	
 	// Adds post data
 	// Adds post data
 	NSString *endItemBoundary = [NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary];
 	NSString *endItemBoundary = [NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary];
-	NSEnumerator *e = [[self postData] keyEnumerator];
-	NSString *key;
 	NSUInteger i=0;
 	NSUInteger i=0;
-	while (key = [e nextObject]) {
-		[self appendPostString:[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",key]];
-		[self appendPostString:[[self postData] objectForKey:key]];
+	for (NSDictionary *val in [self postData]) {
+		[self appendPostString:[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",[val objectForKey:@"key"]]];
+		[self appendPostString:[val objectForKey:@"value"]];
 		i++;
 		i++;
 		if (i != [[self postData] count] || [[self fileData] count] > 0) { //Only add the boundary if this is not the last item in the post body
 		if (i != [[self postData] count] || [[self fileData] count] > 0) { //Only add the boundary if this is not the last item in the post body
 			[self appendPostString:endItemBoundary];
 			[self appendPostString:endItemBoundary];
@@ -191,21 +243,17 @@
 	}
 	}
 	
 	
 	// Adds files to upload
 	// Adds files to upload
-	e = [fileData keyEnumerator];
 	i=0;
 	i=0;
-	while (key = [e nextObject]) {
-		NSDictionary *fileInfo = [[self fileData] objectForKey:key];
-		id file = [fileInfo objectForKey:@"data"];
-		NSString *contentType = [fileInfo objectForKey:@"contentType"];
-		NSString *fileName = [fileInfo objectForKey:@"fileName"];
-		
-		[self appendPostString:[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", key, fileName]];
-		[self appendPostString:[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", contentType]];
+	for (NSDictionary *val in [self fileData]) {
+
+		[self appendPostString:[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", [val objectForKey:@"key"], [val objectForKey:@"fileName"]]];
+		[self appendPostString:[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", [val objectForKey:@"contentType"]]];
 		
 		
-		if ([file isKindOfClass:[NSString class]]) {
-			[self appendPostDataFromFile:file];
+		id data = [val objectForKey:@"data"];
+		if ([data isKindOfClass:[NSString class]]) {
+			[self appendPostDataFromFile:data];
 		} else {
 		} else {
-			[self appendPostData:file];
+			[self appendPostData:data];
 		}
 		}
 		i++;
 		i++;
 		// Only add the boundary if this is not the last item in the post body
 		// Only add the boundary if this is not the last item in the post body
@@ -241,12 +289,10 @@
 	[self addRequestHeader:@"Content-Type" value:[NSString stringWithFormat:@"application/x-www-form-urlencoded; charset=%@",charset]];
 	[self addRequestHeader:@"Content-Type" value:[NSString stringWithFormat:@"application/x-www-form-urlencoded; charset=%@",charset]];
 
 
 	
 	
-	NSEnumerator *e = [[self postData] keyEnumerator];
-	NSString *key;
 	NSUInteger i=0;
 	NSUInteger i=0;
 	NSUInteger count = [[self postData] count]-1;
 	NSUInteger count = [[self postData] count]-1;
-	while (key = [e nextObject]) {
-        NSString *data = [NSString stringWithFormat:@"%@=%@%@", [self encodeURL:key], [self encodeURL:[[self postData] objectForKey:key]],(i<count ?  @"&" : @"")]; 
+	for (NSDictionary *val in [self postData]) {
+        NSString *data = [NSString stringWithFormat:@"%@=%@%@", [self encodeURL:[val objectForKey:@"key"]], [self encodeURL:[val objectForKey:@"value"]],(i<count ?  @"&" : @"")]; 
 		[self appendPostString:data];
 		[self appendPostString:data];
 		i++;
 		i++;
 	}
 	}

@@ -23,7 +23,7 @@
 
 
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.6.2-8 2010-05-01";
+NSString *ASIHTTPRequestVersion = @"v1.6.2-9 2010-05-10";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 

@@ -227,5 +227,44 @@
 	[request2 release];
 	[request2 release];
 }
 }
 
 
+- (void)testMultipleValuesForASingleKey
+{
+	ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/multiple-values"]];
+	[request addPostValue:@"here" forKey:@"test_value[]"];
+	[request addPostValue:@"are" forKey:@"test_value[]"];
+	[request addPostValue:@"some" forKey:@"test_value[]"];
+	[request addPostValue:@"values" forKey:@"test_value[]"];
+
+	NSString *path1 = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"file1.txt"];
+	NSString *path2 = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"file2.txt"];
+	[@"hello" writeToFile:path1 atomically:NO encoding:NSUTF8StringEncoding error:nil];
+	[@"there" writeToFile:path2 atomically:NO encoding:NSUTF8StringEncoding error:nil];
+	[request addFile:path1 forKey:@"test_file[]"];
+	[request addFile:path2 forKey:@"test_file[]"];
+
+	[request startSynchronous];
+	NSString *expectedOutput = @"here\r\nare\r\nsome\r\nvalues\r\nfile1.txt\r\nfile2.txt\r\n";
+	BOOL success = [[request responseString] isEqualToString:expectedOutput];
+	GHAssertTrue(success,@"Failed to send the correct data");
+
+	// Check data replaces older data
+	request = [ASIFormDataRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/single-values"]];
+	[request addPostValue:@"here" forKey:@"test_value[]"];
+	[request addPostValue:@"are" forKey:@"test_value[]"];
+	[request addPostValue:@"some" forKey:@"test_value[]"];
+	[request addPostValue:@"values" forKey:@"test_value[]"];
+
+	[request setPostValue:@"this is new data" forKey:@"test_value[]"];
+
+	[request addFile:path1 forKey:@"test_file[]"];
+	[request addFile:path2 forKey:@"test_file[]"];
+
+	[request setData:[@"this is new data" dataUsingEncoding:NSUTF8StringEncoding] forKey:@"test_file[]"];
+
+	[request startSynchronous];
+	expectedOutput = @"this is new data\r\nfile\r\n";
+	success = [[request responseString] isEqualToString:expectedOutput];
+	GHAssertTrue(success,@"Failed to send the correct data");
+}
 
 
 @end
 @end