Minor refactor / cleanup on S3 API:

Have all ASIS3Request subclasses parse the xml response in request finished - cuts out quite a bit of duplication
Service and bucket requests now correctly parse error message xml
Fixes to query string generation for bucket requests
Keep track of the current element stack so we can correctly parse common prefixes
Fix a couple of leaked objects
Add new tests for issues raised by Tom Andersen in his patch + email

@@ -23,7 +23,7 @@
 
 
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.6.1-6 2010-04-12";
+NSString *ASIHTTPRequestVersion = @"v1.6.1-8 2010-04-12";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 

@@ -20,6 +20,7 @@
 
 
 - (void)dealloc
 - (void)dealloc
 {
 {
+	[bucket release];
 	[key release];
 	[key release];
 	[lastModified release];
 	[lastModified release];
 	[ETag release];
 	[ETag release];

@@ -29,12 +29,15 @@
 	NSString *delimiter;
 	NSString *delimiter;
 	
 	
 	// Internally used while parsing the response
 	// Internally used while parsing the response
-	NSString *currentContent;
-	NSString *currentElement;
 	ASIS3BucketObject *currentObject;
 	ASIS3BucketObject *currentObject;
+	
+	// Returns an array of ASIS3BucketObjects created from the XML response
 	NSMutableArray *objects;	
 	NSMutableArray *objects;	
 	
 	
-	NSMutableArray* foundFolders;
+	// Will be populated with a list of 'folders' when a delimiter is set
+	NSMutableArray *commonPrefixes;
+	
+	// Will be true if this request did not return all the results matching the query (use maxResultCount to configure the number of results to return)
 	BOOL isTruncated;
 	BOOL isTruncated;
 }
 }
 
 
@@ -57,12 +60,6 @@
 // Use for deleting buckets - they must be empty for this to succeed
 // Use for deleting buckets - they must be empty for this to succeed
 + (id)DELETERequestWithBucket:(NSString *)bucket;
 + (id)DELETERequestWithBucket:(NSString *)bucket;
 
 
-// Returns an array of ASIS3BucketObjects created from the XML response
-- (NSArray *)bucketObjects;
-
-// prefixes are like folders - get them by setting a delimiter string (usually always @"/")
--(NSArray*)commonPrefixes;
-
 //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;
 
 
@@ -72,5 +69,7 @@
 @property (retain) NSString *marker;
 @property (retain) NSString *marker;
 @property (assign) int maxResultCount;
 @property (assign) int maxResultCount;
 @property (retain) NSString *delimiter;	
 @property (retain) NSString *delimiter;	
-@property (readonly) BOOL isTruncated;
+@property (retain, readonly) NSMutableArray *objects;
+@property (retain, readonly) NSMutableArray *commonPrefixes;
+@property (assign, readonly) BOOL isTruncated;
 @end
 @end

@@ -12,16 +12,24 @@
 
 
 // Private stuff
 // Private stuff
 @interface ASIS3BucketRequest ()
 @interface ASIS3BucketRequest ()
-@property (retain, nonatomic) NSString *currentContent;
-@property (retain, nonatomic) NSString *currentElement;
 @property (retain, nonatomic) ASIS3BucketObject *currentObject;
 @property (retain, nonatomic) ASIS3BucketObject *currentObject;
-@property (retain, nonatomic) NSMutableArray *objects;
-@property (retain, nonatomic) NSMutableArray *foundFolders;
-@property (readwrite) BOOL isTruncated;
+@property (retain, nonatomic) NSString *currentXMLElementContent;
+@property (retain, nonatomic) NSMutableArray *currentXMLElementStack;
+@property (retain) NSMutableArray *objects;
+@property (retain) NSMutableArray *commonPrefixes;
+@property (assign) BOOL isTruncated;
 @end
 @end
 
 
 @implementation ASIS3BucketRequest
 @implementation ASIS3BucketRequest
 
 
+- (id)initWithURL:(NSURL *)newURL
+{
+	self = [super initWithURL:newURL];
+	[self setObjects:[[[NSMutableArray alloc] init] autorelease]];
+	[self setCommonPrefixes:[[[NSMutableArray alloc] init] autorelease]];
+	return self;
+}
+
 + (id)requestWithBucket:(NSString *)bucket
 + (id)requestWithBucket:(NSString *)bucket
 {
 {
 	ASIS3ObjectRequest *request = [[[self alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.s3.amazonaws.com",bucket]]] autorelease];
 	ASIS3ObjectRequest *request = [[[self alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.s3.amazonaws.com",bucket]]] autorelease];
@@ -56,10 +64,8 @@
 - (void)dealloc
 - (void)dealloc
 {
 {
 	[currentObject release];
 	[currentObject release];
-	[currentElement release];
-	[currentContent release];
 	[objects release];
 	[objects release];
-	[foundFolders release];
+	[commonPrefixes release];
 	[prefix release];
 	[prefix release];
 	[marker release];
 	[marker release];
 	[delimiter release];
 	[delimiter release];
@@ -83,19 +89,20 @@
 		[queryParts addObject:[NSString stringWithFormat:@"prefix=%@",[[self prefix] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 		[queryParts addObject:[NSString stringWithFormat:@"prefix=%@",[[self prefix] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	}
 	}
 	if ([self marker]) {
 	if ([self marker]) {
-		[queryParts addObject:[NSString stringWithFormat:@"marker=%@",[[self marker] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
+		[queryParts addObject:[NSString stringWithFormat:@"key-marker=%@",[[self marker] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	}
 	}
 	if ([self delimiter]) {
 	if ([self delimiter]) {
 		[queryParts addObject:[NSString stringWithFormat:@"delimiter=%@",[[self delimiter] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 		[queryParts addObject:[NSString stringWithFormat:@"delimiter=%@",[[self delimiter] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	}
 	}
 	if ([self maxResultCount] > 0) {
 	if ([self maxResultCount] > 0) {
-		[queryParts addObject:[NSString stringWithFormat:@"delimiter=%hi",[self maxResultCount]]];
+		[queryParts addObject:[NSString stringWithFormat:@"max-keys=%hi",[self maxResultCount]]];
 	}
 	}
 	if ([queryParts count]) 
 	if ([queryParts count]) 
     {
     {
 		NSString* template = @"%@?%@";
 		NSString* template = @"%@?%@";
-		if ([self.subResource length] > 0)
-				template = @"%@&%@";
+		if ([[self subResource] length] > 0) {
+			template = @"%@&%@";
+		}
 		[self setURL:[NSURL URLWithString:[NSString stringWithFormat:template,[[self url] absoluteString],[queryParts componentsJoinedByString:@"&"]]]];
 		[self setURL:[NSURL URLWithString:[NSString stringWithFormat:template,[[self url] absoluteString],[queryParts componentsJoinedByString:@"&"]]]];
 	}
 	}
 }
 }
@@ -106,44 +113,12 @@
 	[super main];
 	[super main];
 }
 }
 
 
--(void)makeBucketsAndPrefixes;
-{
-	[self setObjects:[[[NSMutableArray alloc] init] autorelease]];
-	[self setFoundFolders:[[[NSMutableArray alloc] init] autorelease]];
-	NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:[self responseData]] autorelease];
-	[parser setDelegate:self];
-	[parser setShouldProcessNamespaces:NO];
-	[parser setShouldReportNamespacePrefixes:NO];
-	[parser setShouldResolveExternalEntities:NO];
-	[parser parse];
-}
-
-- (NSArray *)bucketObjects
-{
-	if ([self objects]) {
-		return [self objects];
-	}
-	[self makeBucketsAndPrefixes];
-	return [self objects];
-}
-
--(NSArray*)commonPrefixes;
-{
-	if ([self foundFolders]) {
-		return [self foundFolders];
-	}
-	[self makeBucketsAndPrefixes];
-	return [self foundFolders];
-}
-
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 {
 {
-	[self setCurrentElement:elementName];
-	
 	if ([elementName isEqualToString:@"Contents"]) {
 	if ([elementName isEqualToString:@"Contents"]) {
 		[self setCurrentObject:[ASIS3BucketObject objectWithBucket:[self bucket]]];
 		[self setCurrentObject:[ASIS3BucketObject objectWithBucket:[self bucket]]];
 	}
 	}
-	[self setCurrentContent:@""];
+	[super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qName attributes:attributeDict];
 }
 }
 
 
 - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
 - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
@@ -152,27 +127,27 @@
 		[objects addObject:currentObject];
 		[objects addObject:currentObject];
 		[self setCurrentObject:nil];
 		[self setCurrentObject:nil];
 	} else if ([elementName isEqualToString:@"Key"]) {
 	} else if ([elementName isEqualToString:@"Key"]) {
-		[[self currentObject] setKey:[self currentContent]];
+		[[self currentObject] setKey:[self currentXMLElementContent]];
 	} else if ([elementName isEqualToString:@"LastModified"]) {
 	} else if ([elementName isEqualToString:@"LastModified"]) {
-		[[self currentObject] setLastModified:[[ASIS3Request dateFormatter] dateFromString:[self currentContent]]];
+		[[self currentObject] setLastModified:[[ASIS3Request dateFormatter] dateFromString:[self currentXMLElementContent]]];
 	} else if ([elementName isEqualToString:@"ETag"]) {
 	} else if ([elementName isEqualToString:@"ETag"]) {
-		[[self currentObject] setETag:[self currentContent]];
+		[[self currentObject] setETag:[self currentXMLElementContent]];
 	} else if ([elementName isEqualToString:@"Size"]) {
 	} else if ([elementName isEqualToString:@"Size"]) {
-		[[self currentObject] setSize:(unsigned long long)[[self currentContent] longLongValue]];
+		[[self currentObject] setSize:(unsigned long long)[[self currentXMLElementContent] longLongValue]];
 	} else if ([elementName isEqualToString:@"ID"]) {
 	} else if ([elementName isEqualToString:@"ID"]) {
-		[[self currentObject] setOwnerID:[self currentContent]];
+		[[self currentObject] setOwnerID:[self currentXMLElementContent]];
 	} else if ([elementName isEqualToString:@"DisplayName"]) {
 	} else if ([elementName isEqualToString:@"DisplayName"]) {
-		[[self currentObject] setOwnerName:[self currentContent]];
-	} else if ([elementName isEqualToString:@"Prefix"]) {
-		[foundFolders addObject:[NSString stringWithString:[self currentContent]]];
+		[[self currentObject] setOwnerName:[self currentXMLElementContent]];
+	} else if ([elementName isEqualToString:@"Prefix"] && [[self currentXMLElementStack] count] > 2 && [[[self currentXMLElementStack] objectAtIndex:[[self currentXMLElementStack] count]-2] isEqualToString:@"CommonPrefixes"]) {
+		[[self commonPrefixes] addObject:[self currentXMLElementContent]];
 	} else if ([elementName isEqualToString:@"IsTruncated"]) {
 	} else if ([elementName isEqualToString:@"IsTruncated"]) {
-		self.isTruncated = [[NSString stringWithString:[self currentContent]] boolValue];
+		[self setIsTruncated:[[self currentXMLElementContent] isEqualToString:@"true"]];
+	} else {
+		// Let ASIS3Request look for error messages
+		[super parser:parser didEndElement:elementName namespaceURI:namespaceURI qualifiedName:qName];
 	}
 	}
 }
 }
-- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
-{
-	[self setCurrentContent:[[self currentContent] stringByAppendingString:string]];
-}
+
 
 
 #pragma mark NSCopying
 #pragma mark NSCopying
 
 
@@ -188,17 +163,19 @@
 	return newRequest;
 	return newRequest;
 }
 }
 
 
+
+
+
 @synthesize bucket;
 @synthesize bucket;
 @synthesize subResource;
 @synthesize subResource;
-@synthesize currentContent;
-@synthesize currentElement;
 @synthesize currentObject;
 @synthesize currentObject;
 @synthesize objects;
 @synthesize objects;
-@synthesize foundFolders;
+@synthesize commonPrefixes;
 @synthesize prefix;
 @synthesize prefix;
 @synthesize marker;
 @synthesize marker;
 @synthesize maxResultCount;
 @synthesize maxResultCount;
 @synthesize delimiter;
 @synthesize delimiter;
 @synthesize isTruncated;
 @synthesize isTruncated;
-
+@synthesize currentXMLElementContent;
+@synthesize currentXMLElementStack;
 @end
 @end

@@ -112,16 +112,6 @@
 	}
 	}
 }
 }
 
 
-- (void)requestFinished
-{
-	// COPY requests return a 200 whether they succeed or fail, so we need to look at the XML to see if we were successful.
-	if ([self responseStatusCode] == 200 && [self sourceKey] && [self sourceBucket]) {
-		[self parseResponseXML];
-		return;
-	}
-	[super requestFinished];
-}
-
 - (NSString *)canonicalizedResource
 - (NSString *)canonicalizedResource
 {
 {
 	return [NSString stringWithFormat:@"/%@%@",[self bucket],[ASIS3Request stringByURLEncodingForS3Path:[self key]]];
 	return [NSString stringWithFormat:@"/%@%@",[self bucket],[ASIS3Request stringByURLEncodingForS3Path:[self key]]];
@@ -147,6 +137,7 @@
 }
 }
 
 
 
 
+
 @synthesize bucket;
 @synthesize bucket;
 @synthesize key;
 @synthesize key;
 @synthesize sourceBucket;
 @synthesize sourceBucket;

@@ -42,7 +42,8 @@ typedef enum _ASIS3ErrorType {
 	NSString *accessPolicy;
 	NSString *accessPolicy;
 
 
 	// Internally used while parsing errors
 	// Internally used while parsing errors
-	NSString *currentErrorString;
+	NSString *currentXMLElementContent;
+	NSMutableArray *currentXMLElementStack;
 }
 }
 
 
 // Uses the supplied date to create a Date header string
 // Uses the supplied date to create a Date header string
@@ -77,7 +78,6 @@ typedef enum _ASIS3ErrorType {
 + (NSString *)stringByURLEncodingForS3Path:(NSString *)key;
 + (NSString *)stringByURLEncodingForS3Path:(NSString *)key;
 
 
 
 
-	
 @property (retain) NSString *dateString;
 @property (retain) NSString *dateString;
 @property (retain) NSString *accessKey;
 @property (retain) NSString *accessKey;
 @property (retain) NSString *secretAccessKey;
 @property (retain) NSString *secretAccessKey;

@@ -19,12 +19,11 @@ static NSString *sharedSecretAccessKey = nil;
 
 
 static NSDateFormatter *dateFormatter = nil;
 static NSDateFormatter *dateFormatter = nil;
 
 
-
-
 // Private stuff
 // Private stuff
 @interface ASIS3Request ()
 @interface ASIS3Request ()
 	+ (NSData *)HMACSHA1withKey:(NSString *)key forString:(NSString *)string;
 	+ (NSData *)HMACSHA1withKey:(NSString *)key forString:(NSString *)string;
-	@property (retain, nonatomic) NSString *currentErrorString;
+	@property (retain, nonatomic) NSString *currentXMLElementContent;
+	@property (retain, nonatomic) NSMutableArray *currentXMLElementStack;
 @end
 @end
 
 
 @implementation ASIS3Request
 @implementation ASIS3Request
@@ -40,6 +39,8 @@ static NSDateFormatter *dateFormatter = nil;
 
 
 - (void)dealloc
 - (void)dealloc
 {
 {
+	[currentXMLElementContent release];
+	[currentXMLElementStack release];
 	[dateString release];
 	[dateString release];
 	[accessKey release];
 	[accessKey release];
 	[secretAccessKey release];
 	[secretAccessKey release];
@@ -123,11 +124,12 @@ static NSDateFormatter *dateFormatter = nil;
 
 
 - (void)requestFinished
 - (void)requestFinished
 {
 {
-	if ([self responseStatusCode] < 207) {
+	if ([[[self responseHeaders] objectForKey:@"Content-Type"] isEqualToString:@"application/xml"]) {
+		[self parseResponseXML];
+	}
+	if (![self error]) {
 		[super requestFinished];
 		[super requestFinished];
-		return;
 	}
 	}
-	[self parseResponseXML];
 }
 }
 
 
 #pragma mark Error XML parsing
 #pragma mark Error XML parsing
@@ -135,6 +137,7 @@ static NSDateFormatter *dateFormatter = nil;
 - (void)parseResponseXML
 - (void)parseResponseXML
 {
 {
 	NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:[self responseData]] autorelease];
 	NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:[self responseData]] autorelease];
+	[self setCurrentXMLElementStack:[NSMutableArray array]];
 	[parser setDelegate:self];
 	[parser setDelegate:self];
 	[parser setShouldProcessNamespaces:NO];
 	[parser setShouldProcessNamespaces:NO];
 	[parser setShouldReportNamespacePrefixes:NO];
 	[parser setShouldReportNamespacePrefixes:NO];
@@ -150,16 +153,18 @@ static NSDateFormatter *dateFormatter = nil;
 
 
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 {
 {
-	[self setCurrentErrorString:@""];
+	[self setCurrentXMLElementContent:@""];
+	[[self currentXMLElementStack] addObject:elementName];
 }
 }
 
 
 - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
 - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
 {
 {
+	[[self currentXMLElementStack] removeLastObject];
 	if ([elementName isEqualToString:@"Message"]) {
 	if ([elementName isEqualToString:@"Message"]) {
-		[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIS3ResponseErrorType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[self currentErrorString],NSLocalizedDescriptionKey,nil]]];
+		[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIS3ResponseErrorType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[self currentXMLElementContent],NSLocalizedDescriptionKey,nil]]];
 	// Handle S3 connection expiry errors
 	// Handle S3 connection expiry errors
 	} else if ([elementName isEqualToString:@"Code"]) {
 	} else if ([elementName isEqualToString:@"Code"]) {
-		if ([[self currentErrorString] isEqualToString:@"RequestTimeout"]) {
+		if ([[self currentXMLElementContent] isEqualToString:@"RequestTimeout"]) {
 			if ([self retryUsingNewConnection]) {
 			if ([self retryUsingNewConnection]) {
 				[parser abortParsing];
 				[parser abortParsing];
 				return;
 				return;
@@ -170,7 +175,7 @@ static NSDateFormatter *dateFormatter = nil;
 
 
 - (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
 - (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
 {
 {
-	[self setCurrentErrorString:[[self currentErrorString] stringByAppendingString:string]];
+	[self setCurrentXMLElementContent:[[self currentXMLElementContent] stringByAppendingString:string]];
 }
 }
 
 
 - (id)copyWithZone:(NSZone *)zone
 - (id)copyWithZone:(NSZone *)zone
@@ -255,6 +260,7 @@ static NSDateFormatter *dateFormatter = nil;
 @synthesize dateString;
 @synthesize dateString;
 @synthesize accessKey;
 @synthesize accessKey;
 @synthesize secretAccessKey;
 @synthesize secretAccessKey;
-@synthesize currentErrorString;
+@synthesize currentXMLElementContent;
+@synthesize currentXMLElementStack;
 @synthesize accessPolicy;
 @synthesize accessPolicy;
 @end
 @end

@@ -15,19 +15,17 @@
 @interface ASIS3ServiceRequest : ASIS3Request {
 @interface ASIS3ServiceRequest : ASIS3Request {
 	
 	
 	// Internally used while parsing the response
 	// Internally used while parsing the response
-	NSString *currentContent;
-	NSString *currentElement;
 	ASIS3Bucket *currentBucket;
 	ASIS3Bucket *currentBucket;
-	NSMutableArray *buckets;	
 	NSString *ownerName;
 	NSString *ownerName;
 	NSString *ownerID;
 	NSString *ownerID;
+	
+	// A list of the buckets stored on S3 for this account
+	NSMutableArray *buckets;
 }
 }
 
 
 // Perform a GET request on the S3 service
 // Perform a GET request on the S3 service
 // This will fetch a list of the buckets attached to the S3 account
 // This will fetch a list of the buckets attached to the S3 account
 + (id)serviceRequest;
 + (id)serviceRequest;
 
 
-// Parse the XML response from S3, and return an array of ASIS3Bucket objects
-- (NSArray *)allBuckets;
-
+@property (retain, readonly) NSMutableArray *buckets;
 @end
 @end

@@ -11,12 +11,13 @@
 
 
 // Private stuff
 // Private stuff
 @interface ASIS3ServiceRequest ()
 @interface ASIS3ServiceRequest ()
-@property (retain, nonatomic) NSMutableArray *buckets;
-@property (retain, nonatomic) NSString *currentContent;
-@property (retain, nonatomic) NSString *currentElement;
+@property (retain) NSMutableArray *buckets;
 @property (retain, nonatomic) ASIS3Bucket *currentBucket;
 @property (retain, nonatomic) ASIS3Bucket *currentBucket;
 @property (retain, nonatomic) NSString *ownerID;
 @property (retain, nonatomic) NSString *ownerID;
 @property (retain, nonatomic) NSString *ownerName;
 @property (retain, nonatomic) NSString *ownerName;
+
+@property (retain, nonatomic) NSMutableArray *currentXMLElementStack;
+@property (retain, nonatomic) NSString *currentXMLElementContent;
 @end
 @end
 
 
 @implementation ASIS3ServiceRequest
 @implementation ASIS3ServiceRequest
@@ -26,40 +27,30 @@
 	return [[[self alloc] initWithURL:[NSURL URLWithString:@"http://s3.amazonaws.com"]] autorelease];
 	return [[[self alloc] initWithURL:[NSURL URLWithString:@"http://s3.amazonaws.com"]] autorelease];
 }
 }
 
 
+
+- (id)initWithURL:(NSURL *)newURL
+{
+	self = [super initWithURL:newURL];
+	[self setBuckets:[[[NSMutableArray alloc] init] autorelease]];
+	return self;
+}
+
+
 - (void)dealloc
 - (void)dealloc
 {
 {
 	[buckets release];
 	[buckets release];
-	[currentContent release];
-	[currentElement release];
 	[currentBucket release];
 	[currentBucket release];
 	[ownerID release];
 	[ownerID release];
 	[ownerName release];
 	[ownerName release];
 	[super dealloc];
 	[super dealloc];
 }
 }
 
 
-- (NSArray *)allBuckets
-{
-	if ([self buckets]) {
-		return [self buckets];
-	}
-	[self setBuckets:[[[NSMutableArray alloc] init] autorelease]];
-	NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:[self responseData]] autorelease];
-	[parser setDelegate:self];
-	[parser setShouldProcessNamespaces:NO];
-	[parser setShouldReportNamespacePrefixes:NO];
-	[parser setShouldResolveExternalEntities:NO];
-	[parser parse];
-	return [self buckets];
-}
-
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 {
 {
-	[self setCurrentElement:elementName];
-	
 	if ([elementName isEqualToString:@"Bucket"]) {
 	if ([elementName isEqualToString:@"Bucket"]) {
 		[self setCurrentBucket:[ASIS3Bucket bucketWithOwnerID:[self ownerID] ownerName:[self ownerName]]];
 		[self setCurrentBucket:[ASIS3Bucket bucketWithOwnerID:[self ownerID] ownerName:[self ownerName]]];
 	}
 	}
-	[self setCurrentContent:@""];
+	[super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qName attributes:attributeDict];
 }
 }
 
 
 - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
 - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
@@ -68,24 +59,22 @@
 		[[self buckets] addObject:[self currentBucket]];
 		[[self buckets] addObject:[self currentBucket]];
 		[self setCurrentBucket:nil];
 		[self setCurrentBucket:nil];
 	} else if ([elementName isEqualToString:@"Name"]) {
 	} else if ([elementName isEqualToString:@"Name"]) {
-		[[self currentBucket] setName:[self currentContent]];
+		[[self currentBucket] setName:[self currentXMLElementContent]];
 	} else if ([elementName isEqualToString:@"CreationDate"]) {
 	} else if ([elementName isEqualToString:@"CreationDate"]) {
-		[[self currentBucket] setCreationDate:[[ASIS3Request dateFormatter] dateFromString:[self currentContent]]];
+		[[self currentBucket] setCreationDate:[[ASIS3Request dateFormatter] dateFromString:[self currentXMLElementContent]]];
 	} else if ([elementName isEqualToString:@"ID"]) {
 	} else if ([elementName isEqualToString:@"ID"]) {
-		[self setOwnerID:[self currentContent]];
+		[self setOwnerID:[self currentXMLElementContent]];
 	} else if ([elementName isEqualToString:@"DisplayName"]) {
 	} else if ([elementName isEqualToString:@"DisplayName"]) {
-		[self setOwnerName:[self currentContent]];
+		[self setOwnerName:[self currentXMLElementContent]];
+	} else {
+		// Let ASIS3Request look for error messages
+		[super parser:parser didEndElement:elementName namespaceURI:namespaceURI qualifiedName:qName];
 	}
 	}
 }
 }
 
 
-- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
-{
-	[self setCurrentContent:[[self currentContent] stringByAppendingString:string]];
-}
-
 @synthesize buckets;
 @synthesize buckets;
-@synthesize currentContent;
-@synthesize currentElement;
+@synthesize currentXMLElementContent;
+@synthesize currentXMLElementStack;
 @synthesize currentBucket;
 @synthesize currentBucket;
 @synthesize ownerID;
 @synthesize ownerID;
 @synthesize ownerName;
 @synthesize ownerName;

@@ -118,8 +118,6 @@ static NSString *bucket = @"";
 
 
 - (void)testFailure
 - (void)testFailure
 {
 {
-	[self createTestBucket];
-	
 	// Needs expanding to cover more failure states - this is just a test to ensure Amazon's error description is being added to the error
 	// Needs expanding to cover more failure states - this is just a test to ensure Amazon's error description is being added to the error
 	
 	
 	// We're actually going to try with the Amazon example details, but the request will fail because the date is old
 	// We're actually going to try with the Amazon example details, but the request will fail because the date is old
@@ -141,6 +139,33 @@ static NSString *bucket = @"";
 	success = ([[[request error] localizedDescription] isEqualToString:@"The difference between the request time and the current time is too large."]);
 	success = ([[[request error] localizedDescription] isEqualToString:@"The difference between the request time and the current time is too large."]);
 	GHAssertTrue(success,@"Generated error had the wrong description");	
 	GHAssertTrue(success,@"Generated error had the wrong description");	
 	
 	
+	// Ensure a bucket request will correctly parse an error from S3
+	request = [ASIS3BucketRequest requestWithBucket:exampleBucket];
+	[request setDateString:dateString];
+	[request setSecretAccessKey:exampleSecretAccessKey];
+	[request setAccessKey:exampleAccessKey];
+	[request startSynchronous];
+	GHAssertNotNil([request error],@"Failed to generate an error when the request was not correctly signed");	
+	
+	success = ([[request error] code] == ASIS3ResponseErrorType);
+	GHAssertTrue(success,@"Generated error had the wrong error code");	
+	
+	success = ([[[request error] localizedDescription] isEqualToString:@"The difference between the request time and the current time is too large."]);
+	GHAssertTrue(success,@"Generated error had the wrong description");
+	
+	// Ensure a service request will correctly parse an error from S3
+	request = [ASIS3ServiceRequest serviceRequest];
+	[request setDateString:dateString];
+	[request setSecretAccessKey:exampleSecretAccessKey];
+	[request setAccessKey:exampleAccessKey];
+	[request startSynchronous];
+	GHAssertNotNil([request error],@"Failed to generate an error when the request was not correctly signed");	
+	
+	success = ([[request error] code] == ASIS3ResponseErrorType);
+	GHAssertTrue(success,@"Generated error had the wrong error code");	
+	
+	success = ([[[request error] localizedDescription] isEqualToString:@"The difference between the request time and the current time is too large."]);
+	GHAssertTrue(success,@"Generated error had the wrong description");		
 }
 }
 
 
 - (void)createTestBucket
 - (void)createTestBucket
@@ -176,7 +201,7 @@ static NSString *bucket = @"";
 	GHAssertNil([serviceRequest error],@"Failed to fetch the list of buckets from S3");
 	GHAssertNil([serviceRequest error],@"Failed to fetch the list of buckets from S3");
 	
 	
 	BOOL foundBucket = NO;
 	BOOL foundBucket = NO;
-	for (ASIS3Bucket *theBucket in [serviceRequest allBuckets]) {
+	for (ASIS3Bucket *theBucket in [serviceRequest buckets]) {
 		if ([[theBucket name] isEqualToString:bucket]) {
 		if ([[theBucket name] isEqualToString:bucket]) {
 			foundBucket = YES;
 			foundBucket = YES;
 			break;
 			break;
@@ -236,7 +261,7 @@ static NSString *bucket = @"";
 	[listRequest setAccessKey:accessKey];
 	[listRequest setAccessKey:accessKey];
 	[listRequest startSynchronous];
 	[listRequest startSynchronous];
 	GHAssertNil([listRequest error],@"Failed to download a list from S3");
 	GHAssertNil([listRequest error],@"Failed to download a list from S3");
-	success = [[listRequest bucketObjects] count];
+	success = [[listRequest objects] 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
 	// Test again with a prefix query
@@ -246,7 +271,7 @@ static NSString *bucket = @"";
 	[listRequest setAccessKey:accessKey];
 	[listRequest setAccessKey:accessKey];
 	[listRequest startSynchronous];
 	[listRequest startSynchronous];
 	GHAssertNil([listRequest error],@"Failed to download a list from S3");
 	GHAssertNil([listRequest error],@"Failed to download a list from S3");
-	success = [[listRequest bucketObjects] count];
+	success = [[listRequest objects] count];
 	GHAssertTrue(success,@"The file didn't show up in the list");
 	GHAssertTrue(success,@"The file didn't show up in the list");
 	
 	
 	// DELETE the file
 	// DELETE the file
@@ -309,7 +334,7 @@ static NSString *bucket = @"";
 	[bucketRequest setSecretAccessKey:secretAccessKey];
 	[bucketRequest setSecretAccessKey:secretAccessKey];
 	[bucketRequest setAccessKey:accessKey];
 	[bucketRequest setAccessKey:accessKey];
 	[bucketRequest startSynchronous];
 	[bucketRequest startSynchronous];
-	GHAssertNil([bucketRequest error],@"Failed to create a bucket");
+	GHAssertNil([bucketRequest error],@"Failed to delete a bucket");
 	
 	
 	
 	
 }
 }
@@ -387,14 +412,52 @@ static NSString *bucket = @"";
 		GHAssertNil([request error],@"Give up on list request test - failed to upload a file");	
 		GHAssertNil([request error],@"Give up on list request test - failed to upload a file");	
 	}
 	}
 	
 	
-	// Now get a list of the files
+	// Test common prefixes
 	ASIS3BucketRequest *listRequest = [ASIS3BucketRequest requestWithBucket:bucket];
 	ASIS3BucketRequest *listRequest = [ASIS3BucketRequest requestWithBucket:bucket];
+	[listRequest setSecretAccessKey:secretAccessKey];
+	[listRequest setAccessKey:accessKey];
+	[listRequest setDelimiter:@"/"];
+	[listRequest startSynchronous];
+	GHAssertNil([listRequest error],@"Failed to download a list from S3");
+	success = NO;
+	for (NSString *prefix in [listRequest commonPrefixes]) {
+		if ([prefix isEqualToString:@"test-file/"]) {
+			success = YES;
+		}
+	}
+	GHAssertTrue(success,@"Failed to obtain a list of common prefixes");
+	
+	
+	// Test truncation
+	listRequest = [ASIS3BucketRequest requestWithBucket:bucket];
+	[listRequest setSecretAccessKey:secretAccessKey];
+	[listRequest setAccessKey:accessKey];
+	[listRequest setMaxResultCount:1];
+	[listRequest startSynchronous];
+	GHAssertTrue([listRequest isTruncated],@"Failed to identify what should be a truncated list of results");
+	
+	// Test urls are built correctly when requesting a subresource
+	listRequest = [ASIS3BucketRequest requestWithBucket:bucket subResource:@"acl"];
+	[listRequest setSecretAccessKey:secretAccessKey];
+	[listRequest setAccessKey:accessKey];
+	[listRequest setDelimiter:@"/"];
+	[listRequest setPrefix:@"foo"];
+	[listRequest setMarker:@"bar"];
+	[listRequest setMaxResultCount:5];
+	[listRequest createQueryString];
+	NSString *expectedURL = [NSString stringWithFormat:@"http://%@.s3.amazonaws.com/?acl&prefix=foo&key-marker=bar&delimiter=/&max-keys=5",bucket];
+	success = ([[[listRequest url] absoluteString] isEqualToString:expectedURL]);
+	GHAssertTrue(success,@"Generated the wrong url when requesting a subresource");
+	
+	
+	// Now get a list of the files
+	listRequest = [ASIS3BucketRequest requestWithBucket:bucket];
 	[listRequest setPrefix:@"test-file"];
 	[listRequest setPrefix:@"test-file"];
 	[listRequest setSecretAccessKey:secretAccessKey];
 	[listRequest setSecretAccessKey:secretAccessKey];
 	[listRequest setAccessKey:accessKey];
 	[listRequest setAccessKey:accessKey];
 	[listRequest startSynchronous];
 	[listRequest startSynchronous];
 	GHAssertNil([listRequest error],@"Failed to download a list from S3");
 	GHAssertNil([listRequest error],@"Failed to download a list from S3");
-	success = ([[listRequest bucketObjects] count] == 5);
+	success = ([[listRequest objects] count] == 5);
 	GHAssertTrue(success,@"List did not contain all files");
 	GHAssertTrue(success,@"List did not contain all files");
 	
 	
 	// Please don't use an autoreleased operation queue with waitUntilAllOperationsAreFinished in your own code unless you're writing a test like this one
 	// Please don't use an autoreleased operation queue with waitUntilAllOperationsAreFinished in your own code unless you're writing a test like this one
@@ -405,7 +468,7 @@ static NSString *bucket = @"";
 	[queue setRequestDidFinishSelector:@selector(GETRequestDone:)];
 	[queue setRequestDidFinishSelector:@selector(GETRequestDone:)];
 	[queue setRequestDidFailSelector:@selector(GETRequestFailed:)];
 	[queue setRequestDidFailSelector:@selector(GETRequestFailed:)];
 	[queue setDelegate:self];
 	[queue setDelegate:self];
-	for (ASIS3BucketObject *object in [listRequest bucketObjects]) {
+	for (ASIS3BucketObject *object in [listRequest objects]) {
 		ASIS3ObjectRequest *request = [object GETRequest];
 		ASIS3ObjectRequest *request = [object GETRequest];
 		[request setAccessKey:accessKey];
 		[request setAccessKey:accessKey];
 		[request setSecretAccessKey:secretAccessKey];
 		[request setSecretAccessKey:secretAccessKey];
@@ -421,7 +484,7 @@ static NSString *bucket = @"";
 	[queue setDelegate:self];
 	[queue setDelegate:self];
 	i=0;
 	i=0;
 	// For each one, we'll just upload the same content again
 	// For each one, we'll just upload the same content again
-	for (ASIS3BucketObject *object in [listRequest bucketObjects]) {
+	for (ASIS3BucketObject *object in [listRequest objects]) {
 		NSString *oldFilePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:[NSString stringWithFormat:@"%hi.txt",i]];;
 		NSString *oldFilePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:[NSString stringWithFormat:@"%hi.txt",i]];;
 		ASIS3Request *request = [object PUTRequestWithFile:oldFilePath];
 		ASIS3Request *request = [object PUTRequestWithFile:oldFilePath];
 		[request setAccessKey:accessKey];
 		[request setAccessKey:accessKey];
@@ -439,7 +502,7 @@ static NSString *bucket = @"";
 	[queue setDelegate:self];
 	[queue setDelegate:self];
 	i=0;
 	i=0;
 
 
-	for (ASIS3BucketObject *object in [listRequest bucketObjects]) {
+	for (ASIS3BucketObject *object in [listRequest objects]) {
 		ASIS3ObjectRequest *request = [object DELETERequest];
 		ASIS3ObjectRequest *request = [object DELETERequest];
 		[request setAccessKey:accessKey];
 		[request setAccessKey:accessKey];
 		[request setSecretAccessKey:secretAccessKey];
 		[request setSecretAccessKey:secretAccessKey];
@@ -456,7 +519,7 @@ static NSString *bucket = @"";
 	[listRequest setAccessKey:accessKey];
 	[listRequest setAccessKey:accessKey];
 	[listRequest startSynchronous];
 	[listRequest startSynchronous];
 	GHAssertNil([listRequest error],@"Failed to download a list from S3");
 	GHAssertNil([listRequest error],@"Failed to download a list from S3");
-	success = ([[listRequest bucketObjects] count] == 0);
+	success = ([[listRequest objects] count] == 0);
 	GHAssertTrue(success,@"List contained files that should have been deleted");
 	GHAssertTrue(success,@"List contained files that should have been deleted");
 	
 	
 }
 }
@@ -685,6 +748,8 @@ static NSString *bucket = @"";
 	[bucketObject2 release];
 	[bucketObject2 release];
 }
 }
 
 
+
+
 @synthesize networkQueue;
 @synthesize networkQueue;
 
 
 @end
 @end