Added ability to put to cloud files from a local file

Authenticate method now returns an NSError if something goes wrong
Change lock mediating access to credentials to recursive

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

@@ -58,6 +58,7 @@
 // The Object can be created with custom metadata via HTTP headers identified with the “X-Object-Meta-” prefix.
 // The Object can be created with custom metadata via HTTP headers identified with the “X-Object-Meta-” prefix.
 + (id)putObjectRequestWithContainer:(NSString *)containerName object:(ASICloudFilesObject *)object;
 + (id)putObjectRequestWithContainer:(NSString *)containerName object:(ASICloudFilesObject *)object;
 + (id)putObjectRequestWithContainer:(NSString *)containerName objectPath:(NSString *)objectPath contentType:(NSString *)contentType objectData:(NSData *)objectData metadata:(NSDictionary *)metadata etag:(NSString *)etag;
 + (id)putObjectRequestWithContainer:(NSString *)containerName objectPath:(NSString *)objectPath contentType:(NSString *)contentType objectData:(NSData *)objectData metadata:(NSDictionary *)metadata etag:(NSString *)etag;
++ (id)putObjectRequestWithContainer:(NSString *)containerName objectPath:(NSString *)objectPath contentType:(NSString *)contentType file:(NSString *)filePath metadata:(NSDictionary *)metadata etag:(NSString *)etag;
 
 
 // POST /<api version>/<account>/<container>/<object>
 // POST /<api version>/<account>/<container>/<object>
 // POST operations against an Object name are used to set and overwrite arbitrary key/value metadata. You cannot use the POST operation to change any of the Object's other headers such as Content-Type, ETag, etc. It is not used to upload storage Objects (see PUT).
 // POST operations against an Object name are used to set and overwrite arbitrary key/value metadata. You cannot use the POST operation to change any of the Object's other headers such as Content-Type, ETag, etc. It is not used to upload storage Objects (see PUT).

@@ -155,7 +155,6 @@
 	
 	
 	ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest storageRequestWithMethod:@"PUT" containerName:containerName objectPath:objectPath];
 	ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest storageRequestWithMethod:@"PUT" containerName:containerName objectPath:objectPath];
 	[request addRequestHeader:@"Content-Type" value:contentType];
 	[request addRequestHeader:@"Content-Type" value:contentType];
-	[request addRequestHeader:@"Content-Length" value:[NSString stringWithFormat:@"%i", objectData.length]];
 
 
 	// add metadata to headers
 	// add metadata to headers
 	if (metadata) {
 	if (metadata) {
@@ -168,6 +167,23 @@
 	return request;
 	return request;
 }
 }
 
 
++ (id)putObjectRequestWithContainer:(NSString *)containerName objectPath:(NSString *)objectPath contentType:(NSString *)contentType file:(NSString *)filePath metadata:(NSDictionary *)metadata etag:(NSString *)etag
+{
+	ASICloudFilesObjectRequest *request = [ASICloudFilesObjectRequest storageRequestWithMethod:@"PUT" containerName:containerName objectPath:objectPath];
+	[request addRequestHeader:@"Content-Type" value:contentType];
+	
+	// add metadata to headers
+	if (metadata) {
+		for (NSString *key in [metadata keyEnumerator]) {
+			[request addRequestHeader:[NSString stringWithFormat:@"X-Object-Meta-%@", key] value:[metadata objectForKey:key]];
+		}
+	}	
+	
+	[request setShouldStreamPostDataFromDisk:YES];
+	[request setPostBodyFilePath:filePath];
+	return request;	
+}
+
 #pragma mark -
 #pragma mark -
 #pragma mark POST - Set Object Metadata
 #pragma mark POST - Set Object Metadata
 
 

@@ -27,7 +27,7 @@
 #pragma mark Rackspace Cloud Authentication
 #pragma mark Rackspace Cloud Authentication
 
 
 + (id)authenticationRequest;
 + (id)authenticationRequest;
-+ (void)authenticate;
++ (NSError *)authenticate;
 + (NSString *)username;
 + (NSString *)username;
 + (void)setUsername:(NSString *)username;
 + (void)setUsername:(NSString *)username;
 + (NSString *)apiKey;
 + (NSString *)apiKey;

@@ -20,14 +20,14 @@ static NSString *storageURL = nil;
 static NSString *cdnManagementURL = nil;
 static NSString *cdnManagementURL = nil;
 static NSString *rackspaceCloudAuthURL = @"https://auth.api.rackspacecloud.com/v1.0";
 static NSString *rackspaceCloudAuthURL = @"https://auth.api.rackspacecloud.com/v1.0";
 
 
-static NSLock *accessDetailsLock = nil;
+static NSRecursiveLock *accessDetailsLock = nil;
 
 
 @implementation ASICloudFilesRequest
 @implementation ASICloudFilesRequest
 
 
 + (void)initialize
 + (void)initialize
 {
 {
 	if (self == [ASICloudFilesRequest class]) {
 	if (self == [ASICloudFilesRequest class]) {
-		accessDetailsLock = [[NSLock alloc] init];
+		accessDetailsLock = [[NSRecursiveLock alloc] init];
 	}
 	}
 }
 }
 
 
@@ -59,7 +59,7 @@ static NSLock *accessDetailsLock = nil;
 	return request;
 	return request;
 }
 }
 
 
-+ (void)authenticate
++ (NSError *)authenticate
 {
 {
 	[accessDetailsLock lock];
 	[accessDetailsLock lock];
 	ASIHTTPRequest *request = [ASICloudFilesRequest authenticationRequest];
 	ASIHTTPRequest *request = [ASICloudFilesRequest authenticationRequest];
@@ -72,6 +72,7 @@ static NSLock *accessDetailsLock = nil;
 		cdnManagementURL = [responseHeaders objectForKey:@"X-Cdn-Management-Url"];
 		cdnManagementURL = [responseHeaders objectForKey:@"X-Cdn-Management-Url"];
 	}
 	}
 	[accessDetailsLock unlock];
 	[accessDetailsLock unlock];
+	return [request error];
 }
 }
 
 
 + (NSString *)username
 + (NSString *)username

@@ -211,12 +211,40 @@ static NSString *apiKey = @"";
 	GHAssertEqualStrings(object.name, @"puttestfile.txt", @"Failed to parse object name", @"Failed to parse object name");
 	GHAssertEqualStrings(object.name, @"puttestfile.txt", @"Failed to parse object name", @"Failed to parse object name");
 	GHAssertNotNil(object.data, @"Failed to parse object data");
 	GHAssertNotNil(object.data, @"Failed to parse object data");
 	GHAssertEqualStrings(string, @"this is a test", @"Failed to parse object data", @"Failed to parse object data");
 	GHAssertEqualStrings(string, @"this is a test", @"Failed to parse object data", @"Failed to parse object data");
-	
-	[string release];
+
 	
 	
 	ASICloudFilesContainerRequest *deleteContainerRequest = [ASICloudFilesContainerRequest deleteContainerRequest:@"ASICloudFilesTest"];
 	ASICloudFilesContainerRequest *deleteContainerRequest = [ASICloudFilesContainerRequest deleteContainerRequest:@"ASICloudFilesTest"];
 	[deleteContainerRequest startSynchronous];
 	[deleteContainerRequest startSynchronous];
 	
 	
+	// Now put the object from a file
+
+	createContainerRequest = [ASICloudFilesContainerRequest createContainerRequest:@"ASICloudFilesTest"];
+	[createContainerRequest startSynchronous];
+	
+	NSString *filePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"cloudfile"];
+	[data writeToFile:filePath atomically:NO];
+	
+	putRequest = [ASICloudFilesObjectRequest putObjectRequestWithContainer:@"ASICloudFilesTest" objectPath:@"puttestfile.txt" contentType:@"text/plain" file:filePath metadata:nil etag:nil];
+	
+	[putRequest startSynchronous];
+	
+	GHAssertNil([putRequest error], @"Failed to PUT object");
+	
+	getRequest = [ASICloudFilesObjectRequest getObjectRequestWithContainer:@"ASICloudFilesTest" objectPath:@"puttestfile.txt"];
+	[getRequest startSynchronous];
+	
+	object = [getRequest object];
+	
+	GHAssertNotNil(object, @"Failed to retrieve new object");
+	GHAssertNotNil(object.name, @"Failed to parse object name");
+	GHAssertEqualStrings(object.name, @"puttestfile.txt", @"Failed to parse object name", @"Failed to parse object name");
+	GHAssertNotNil(object.data, @"Failed to parse object data");
+	GHAssertEqualStrings(string, @"this is a test", @"Failed to parse object data", @"Failed to parse object data");
+	
+	[string release];
+	
+	deleteContainerRequest = [ASICloudFilesContainerRequest deleteContainerRequest:@"ASICloudFilesTest"];
+	[deleteContainerRequest startSynchronous];
 }
 }
 
 
 - (void)testPostObject {
 - (void)testPostObject {