Tweaks to S3 stuff

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.6-5 2010-03-16";
+NSString *ASIHTTPRequestVersion = @"v1.6-6 2010-03-16";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 

@@ -56,7 +56,6 @@
 //Builds a query string out of the list parameters we supplied
 //Builds a query string out of the list parameters we supplied
 - (void)createQueryString;
 - (void)createQueryString;
 
 
-
 // Returns a date formatter than can be used to parse a date from S3
 // Returns a date formatter than can be used to parse a date from S3
 + (NSDateFormatter *)dateFormatter;
 + (NSDateFormatter *)dateFormatter;
 
 

@@ -149,7 +149,7 @@ static NSDateFormatter *dateFormatter = nil;
 	} else if ([elementName isEqualToString:@"Key"]) {
 	} else if ([elementName isEqualToString:@"Key"]) {
 		[[self currentObject] setKey:[self currentContent]];
 		[[self currentObject] setKey:[self currentContent]];
 	} else if ([elementName isEqualToString:@"LastModified"]) {
 	} else if ([elementName isEqualToString:@"LastModified"]) {
-		[[self currentObject] setLastModified:[dateFormatter dateFromString:[self currentContent]]];
+		[[self currentObject] setLastModified:[[ASIS3BucketRequest dateFormatter] dateFromString:[self currentContent]]];
 	} else if ([elementName isEqualToString:@"ETag"]) {
 	} else if ([elementName isEqualToString:@"ETag"]) {
 		[[self currentObject] setETag:[self currentContent]];
 		[[self currentObject] setETag:[self currentContent]];
 	} else if ([elementName isEqualToString:@"Size"]) {
 	} else if ([elementName isEqualToString:@"Size"]) {

@@ -42,7 +42,6 @@
 // See the S3 REST API docs for more information about the parameters you can pass
 // See the S3 REST API docs for more information about the parameters you can pass
 + (id)requestWithBucket:(NSString *)bucket key:(NSString *)key subResource:(NSString *)subResource;
 + (id)requestWithBucket:(NSString *)bucket key:(NSString *)key subResource:(NSString *)subResource;
 
 
-
 // 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 key:(NSString *)key;
 + (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)bucket key:(NSString *)key;
 
 

@@ -36,14 +36,14 @@ static NSString *bucket = @"";
 
 
 @implementation ASIS3RequestTests
 @implementation ASIS3RequestTests
 
 
+
 - (void)testASIS3ServiceRequest
 - (void)testASIS3ServiceRequest
 {
 {
-//	ASIS3ServiceRequest *request = [ASIS3ServiceRequest serviceRequest];
-//	[request setSecretAccessKey:secretAccessKey];
-//	[request setAccessKey:accessKey];
-//	[request startSynchronous];
-//	NSLog(@"%@",[request responseString]);
-//	GHAssertNil([request error],@"Failed to fetch the list of buckets from S3");	
+	ASIS3ServiceRequest *request = [ASIS3ServiceRequest serviceRequest];
+	[request setSecretAccessKey:secretAccessKey];
+	[request setAccessKey:accessKey];
+	[request startSynchronous];
+	GHAssertNil([request error],@"Failed to fetch the list of buckets from S3");	
 }
 }
 
 
 // All these tests are based on Amazon's examples at: http://docs.amazonwebservices.com/AmazonS3/2006-03-01/
 // All these tests are based on Amazon's examples at: http://docs.amazonwebservices.com/AmazonS3/2006-03-01/
@@ -150,6 +150,7 @@ static NSString *bucket = @"";
 	
 	
 }
 }
 
 
+
 // To run this test, uncomment and fill in your S3 access details
 // To run this test, uncomment and fill in your S3 access details
 - (void)testREST
 - (void)testREST
 {
 {
@@ -204,9 +205,8 @@ static NSString *bucket = @"";
 	success = [[request responseString] isEqualToString:@""];
 	success = [[request responseString] isEqualToString:@""];
 	GHAssertTrue(success,@"Got a response body for a HEAD request");
 	GHAssertTrue(success,@"Got a response body for a HEAD request");
 	
 	
-	// Get a list of files
+	// Test listing the objects in this bucket
 	ASIS3BucketRequest *listRequest = [ASIS3BucketRequest requestWithBucket:bucket];
 	ASIS3BucketRequest *listRequest = [ASIS3BucketRequest requestWithBucket:bucket];
-	[listRequest setPrefix:@"test"];
 	[listRequest setSecretAccessKey:secretAccessKey];
 	[listRequest setSecretAccessKey:secretAccessKey];
 	[listRequest setAccessKey:accessKey];
 	[listRequest setAccessKey:accessKey];
 	[listRequest startSynchronous];
 	[listRequest startSynchronous];
@@ -214,6 +214,16 @@ static NSString *bucket = @"";
 	success = [[listRequest bucketObjects] count];
 	success = [[listRequest bucketObjects] count];
 	GHAssertTrue(success,@"The file didn't show up in the list");	
 	GHAssertTrue(success,@"The file didn't show up in the list");	
 
 
+	// Test again with a prefix query
+	listRequest = [ASIS3BucketRequest requestWithBucket:bucket];
+	[listRequest setPrefix:@"test"];
+	[listRequest setSecretAccessKey:secretAccessKey];
+	[listRequest setAccessKey:accessKey];
+	[listRequest startSynchronous];
+	GHAssertNil([listRequest error],@"Failed to download a list from S3");
+	success = [[listRequest bucketObjects] count];
+	GHAssertTrue(success,@"The file didn't show up in the list");
+	
 	// DELETE the file
 	// DELETE the file
 	request = [ASIS3ObjectRequest requestWithBucket:bucket key:key];
 	request = [ASIS3ObjectRequest requestWithBucket:bucket key:key];
 	[request setSecretAccessKey:secretAccessKey];
 	[request setSecretAccessKey:secretAccessKey];