Added PUTRequestForData:etc to ASIS3Request

Closes gh-14.

Also fixed unit tests for S3 on Mac, continued fallout from that setDoubleValue: debacle

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.2-23 2009-12-18";
+NSString *ASIHTTPRequestVersion = @"v1.2-24 2009-12-18";
 
 
 // We use our own custom run loop mode as CoreAnimation seems to want to hijack our threads otherwise
 // We use our own custom run loop mode as CoreAnimation seems to want to hijack our threads otherwise
 static CFStringRef ASIHTTPRequestRunMode = CFSTR("ASIHTTPRequest");
 static CFStringRef ASIHTTPRequestRunMode = CFSTR("ASIHTTPRequest");

@@ -69,6 +69,9 @@ typedef enum _ASIS3ErrorType {
 // Create a PUT request using the file at filePath as the body
 // Create a PUT request using the file at filePath as the body
 + (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)bucket path:(NSString *)path;
 + (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)bucket path:(NSString *)path;
 
 
+// Create a PUT request using the supplied NSData as the body (set the mime-type manually with setMimeType: if necessary)
++ (id)PUTRequestForData:(NSData *)data withBucket:(NSString *)bucket path:(NSString *)path;
+	
 // Create a DELETE request for the object at path
 // Create a DELETE request for the object at path
 + (id)DELETERequestWithBucket:(NSString *)bucket path:(NSString *)path;
 + (id)DELETERequestWithBucket:(NSString *)bucket path:(NSString *)path;
 
 

@@ -37,6 +37,14 @@ static NSString *sharedSecretAccessKey = nil;
 	return request;
 	return request;
 }
 }
 
 
++ (id)PUTRequestForData:(NSData *)data withBucket:(NSString *)bucket path:(NSString *)path
+{
+	ASIS3Request *request = [self requestWithBucket:bucket path:path];
+	[request appendPostData:data];
+	[request setRequestMethod:@"PUT"];
+	return request;
+}
+
 + (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)bucket path:(NSString *)path
 + (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)bucket path:(NSString *)path
 {
 {
 	ASIS3Request *request = [self requestWithBucket:bucket path:path];
 	ASIS3Request *request = [self requestWithBucket:bucket path:path];

@@ -220,6 +220,35 @@ static NSString *bucket = @"";
 	
 	
 	success = [[[request error] localizedDescription] isEqualToString:@"The specified key does not exist."];
 	success = [[[request error] localizedDescription] isEqualToString:@"The specified key does not exist."];
 	GHAssertTrue(success, @"Got the wrong error message");	
 	GHAssertTrue(success, @"Got the wrong error message");	
+	
+	// PUT some data
+	NSData *data = [@"Hello" dataUsingEncoding:NSUTF8StringEncoding];
+	request = [ASIS3Request PUTRequestForData:data withBucket:bucket path:path];
+	[request setMimeType:@"text/plain"];
+	[request setSecretAccessKey:secretAccessKey];
+	[request setAccessKey:accessKey];
+	[request start];
+	success = [[request responseString] isEqualToString:@""];
+	GHAssertTrue(success,@"Failed to PUT data to S3");
+	
+	// GET the data to check it uploaded properly
+	request = [ASIS3Request requestWithBucket:bucket path:path];
+	[request setSecretAccessKey:secretAccessKey];
+	[request setAccessKey:accessKey];
+	[request start];
+	success = [[request responseString] isEqualToString:@"Hello"];
+	GHAssertTrue(success,@"Failed to GET the correct data from S3");	
+	
+	// clean up (Delete it)
+	request = [ASIS3Request requestWithBucket:bucket path:path];
+	[request setSecretAccessKey:secretAccessKey];
+	[request setRequestMethod:@"DELETE"];
+	[request setAccessKey:accessKey];
+	[request start];
+	success = [[request responseString] isEqualToString:@""];
+	GHAssertTrue(success,@"Failed to DELETE the file from S3");	
+	
+	
 }
 }
 
 
 // Will upload a file to S3, gzipping it before uploading
 // Will upload a file to S3, gzipping it before uploading
@@ -463,7 +492,13 @@ static NSString *bucket = @"";
 	[[self networkQueue] go];
 	[[self networkQueue] go];
 
 
 }
 }
-	 
+	
+// Will be called on Mac OS
+- (void)setDoubleValue:(double)newProgress;
+{
+	progress = (float)newProgress;
+}
+
  - (void)setProgress:(float)newProgress;
  - (void)setProgress:(float)newProgress;
 {
 {
 	progress = newProgress;
 	progress = newProgress;