Stop using an NSTimer to update progress, we just do it from the main request loop instead

Added default values for didFailSelector and didFinishSelector for the simple cases
Several small bug fixes
Order of methods in implementation now matches the order of those in the header

@@ -10,9 +10,11 @@
 #import <Cocoa/Cocoa.h>
 #import <Cocoa/Cocoa.h>
 #import "ASIProgressDelegate.h"
 #import "ASIProgressDelegate.h"
 
 
+
+
 @interface ASIHTTPRequest : NSOperation {
 @interface ASIHTTPRequest : NSOperation {
 	
 	
-	//The url for this operation, should include get params in the query string where appropriate
+	//The url for this operation, should include GET params in the query string where appropriate
 	NSURL *url; 
 	NSURL *url; 
 	
 	
 	//The delegate, you need to manage setting and talking to your delegate in your subclasses
 	//The delegate, you need to manage setting and talking to your delegate in your subclasses
@@ -78,103 +80,145 @@
 	//Size of the POST payload
 	//Size of the POST payload
 	double postLength;	
 	double postLength;	
 	
 	
-	//Timer used to update the progress delegates
-	NSTimer *progressTimer;
-	
 	//The total amount of downloaded data
 	//The total amount of downloaded data
 	double totalBytesRead;
 	double totalBytesRead;
 	
 	
+	//Last amount of data read (used for incrementing progress)
+	double lastBytesRead;
+	//Last amount of data sent (used for incrementing progress)
+	double lastBytesSent;
+	
 	//Realm for authentication when credentials are required
 	//Realm for authentication when credentials are required
 	NSString *authenticationRealm;
 	NSString *authenticationRealm;
 
 
+	//This lock will block the request until the delegate supplies authentication info
+	NSConditionLock *authenticationLock;
+	
 	//Called on the delegate when the request completes successfully
 	//Called on the delegate when the request completes successfully
 	SEL didFinishSelector;
 	SEL didFinishSelector;
 	
 	
 	//Called on the delegate when the request fails
 	//Called on the delegate when the request fails
 	SEL didFailSelector;
 	SEL didFailSelector;
 	
 	
-	//This lock will block the request until the delegate supplies authentication info
-	NSConditionLock *authenticationLock;
 }
 }
 
 
+#pragma mark init / dealloc
+
 // Should be an HTTP or HTTPS url, may include username and password if appropriate
 // Should be an HTTP or HTTPS url, may include username and password if appropriate
 - (id)initWithURL:(NSURL *)newURL;
 - (id)initWithURL:(NSURL *)newURL;
 
 
+#pragma mark delegate configuration
+
+// Delegate will get messages when the request completes, fails or when authentication is required
+- (void)setDelegate:(id)newDelegate;
+
+// upload progress delegate (usually an NSProgressIndicator) is sent information on upload progress
+- (void)setUploadProgressDelegate:(id)newDelegate;
+
+// download progress delegate (usually an NSProgressIndicator) is sent information on download progress
+- (void)setDownloadProgressDelegate:(id)newDelegate;
+
+#pragma mark setup request
+
+//Add a custom header to the request
+- (void)addRequestHeader:(NSString *)header value:(NSString *)value;
+
 //Add a POST variable to the request
 //Add a POST variable to the request
 - (void)setPostValue:(id)value forKey:(NSString *)key;
 - (void)setPostValue:(id)value forKey:(NSString *)key;
 
 
 //Add the contents of a local file as a POST variable to the request
 //Add the contents of a local file as a POST variable to the request
 - (void)setFile:(NSString *)filePath forKey:(NSString *)key;
 - (void)setFile:(NSString *)filePath forKey:(NSString *)key;
 
 
-//Add a custom header to the request
-- (void)addRequestHeader:(NSString *)header value:(NSString *)value;
+// When set, username and password will be presented for HTTP authentication
+- (void)setUsername:(NSString *)newUsername andPassword:(NSString *)newPassword;
+
+// When true, authentication information will automatically be stored in (and re-used from) the keychain
+- (void)setUsesKeychain:(BOOL)shouldUseKeychain;
 
 
 //the results of this request will be saved to downloadDestinationPath, if it is set
 //the results of this request will be saved to downloadDestinationPath, if it is set
 - (void)setDownloadDestinationPath:(NSString *)newDestinationPath;
 - (void)setDownloadDestinationPath:(NSString *)newDestinationPath;
-- (NSString *)downloadDestinationPath;
 
 
-// When set, username and password will be presented for HTTP authentication
-- (void)setUsername:(NSString *)newUsername andPassword:(NSString *)newPassword;
-
-// Delegate will get messages when the request completes, fails or when authentication is required
-- (void)setDelegate:(id)newDelegate;
+- (NSString *)downloadDestinationPath;
 
 
-// Called on the delegate when the request completes successfully
+// This selector will be called on the delegate when the request completes successfully
 - (void)setDidFinishSelector:(SEL)selector;
 - (void)setDidFinishSelector:(SEL)selector;
 
 
-// Called on the delegate when the request fails
+//  This selector will be called on the delegate when the request fails
 - (void)setDidFailSelector:(SEL)selector;
 - (void)setDidFailSelector:(SEL)selector;
 
 
-// upload progress delegate (usually an NSProgressIndicator) is sent information on upload progress
-- (void)setUploadProgressDelegate:(id)newDelegate;
+#pragma mark get information about this request
 
 
-// download progress delegate (usually an NSProgressIndicator) is sent information on download progress
-- (void)setDownloadProgressDelegate:(id)newDelegate;
+// Accessors for getting information about the request (useful for auth dialogs) 
+- (NSString *)authenticationRealm;
+- (NSString *)host;
 
 
-// When true, authentication information will automatically be stored in (and re-used from) the keychain
-- (void)setUsesKeychain:(BOOL)shouldUseKeychain;
+// Contains a description of the error that occurred if the request failed
+- (NSError *)error;
+- (void)setError:(NSError *)newError;
 
 
 // Will be true when the request is complete (success or failure)
 // Will be true when the request is complete (success or failure)
 - (BOOL)complete;
 - (BOOL)complete;
+- (BOOL)isFinished; //Same thing, for NSOperationQueues to read
+
+// Get total amount of data received so far for this request
+- (double)totalBytesRead;
 
 
 // Returns the contents of the result as an NSString (not appropriate for binary data!)
 // Returns the contents of the result as an NSString (not appropriate for binary data!)
 - (NSString *)dataString;
 - (NSString *)dataString;
 
 
-// Accessors for getting information about the request (useful for auth dialogs) 
-- (NSString *)authenticationRealm;
-- (NSString *)host;
+#pragma mark request logic
 
 
-// Contains a description of the error that occurred if the request failed
-- (NSError *)error;
+// Start loading the request
+- (void)loadRequest;
 
 
+// Cancel loading and clean up
+- (void)cancelLoad;
 
 
-// CFnetwork event handlers
-- (void)handleStreamComplete;
-- (void)handleStreamError;
-- (void)handleBytesAvailable;
-- (void)handleNetworkEvent:(CFStreamEventType)type;
+#pragma mark upload/download progress
 
 
-// Start loading the request
-- (void)loadRequest;
+// Called on main thread to update progress delegates
+- (void)updateProgressIndicators;
+- (void)resetUploadProgress:(NSNumber *)max;
+- (void)updateUploadProgress;
+- (void)resetDownloadProgress:(NSNumber *)max;
+- (void)updateDownloadProgress;
+
+#pragma mark handling request complete / failure
+
+//Called when a request completes successfully - defaults to: @selector(requestFinished:)
+- (void)requestFinished;
+
+//Called when a request fails - defaults to: @selector(requestFailed:)
+- (void)failWithProblem:(NSString *)problem;
+
+#pragma mark http authentication stuff
 
 
 // Reads the response headers to find the content length, and returns true if the request needs a username and password (or if those supplied were incorrect)
 // Reads the response headers to find the content length, and returns true if the request needs a username and password (or if those supplied were incorrect)
 - (BOOL)isAuthorizationFailure;
 - (BOOL)isAuthorizationFailure;
 
 
-// Apply authentication information and resume the request after an authentication challenge
-- (void)applyCredentialsAndResume;
-
 // Unlock (unpause) the request thread so it can resume the request
 // Unlock (unpause) the request thread so it can resume the request
 // Should be called by delegates when they have populated the authentication information after an authentication challenge
 // Should be called by delegates when they have populated the authentication information after an authentication challenge
 - (void)retryWithAuthentication;
 - (void)retryWithAuthentication;
 
 
-// Cancel loading and clean up
-- (void)cancelLoad;
+// Apply authentication information and resume the request after an authentication challenge
+- (void)applyCredentialsAndResume;
 
 
-// Called from timer on main thread to update progress delegates
-- (void)updateUploadProgress;
-- (void)updateDownloadProgress;
+// Look for somewhere we can get authentication information from
+- (void)applyCredentialsLoad;
+
+// Customise or overidde this to have a generic error for authentication failure
+- (NSError *)authenticationError;
 
 
-#pragma mark keychain stuff
+#pragma mark stream status handlers
+
+// CFnetwork event handlers
+- (void)handleNetworkEvent:(CFStreamEventType)type;
+- (void)handleBytesAvailable;
+- (void)handleStreamComplete;
+- (void)handleStreamError;
+
+
+#pragma mark keychain storage
 
 
 //Save credentials to the keychain
 //Save credentials to the keychain
 + (void)saveCredentials:(NSURLCredential *)credentials forHost:(NSString *)host port:(int)port protocol:(NSString *)protocol realm:(NSString *)realm;
 + (void)saveCredentials:(NSURLCredential *)credentials forHost:(NSString *)host port:(int)port protocol:(NSString *)protocol realm:(NSString *)realm;
@@ -182,10 +226,16 @@
 //Return credentials from the keychain
 //Return credentials from the keychain
 + (NSURLCredential *)savedCredentialsForHost:(NSString *)host port:(int)port protocol:(NSString *)protocol realm:(NSString *)realm;
 + (NSURLCredential *)savedCredentialsForHost:(NSString *)host port:(int)port protocol:(NSString *)protocol realm:(NSString *)realm;
 
 
-//Called when a request completes successfully
-- (void)requestFinished;
+//Remove credentials from the keychain
++ (void)removeCredentialsForHost:(NSString *)host port:(int)port protocol:(NSString *)protocol realm:(NSString *)realm;
+
+
+
+
+
+
+
+
 
 
-//Called when a request fails
-- (void)failWithProblem:(NSString *)problem;
 
 
 @end
 @end

@@ -13,4 +13,5 @@
 - (void)setDoubleValue:(double)newValue;
 - (void)setDoubleValue:(double)newValue;
 - (void)incrementBy:(double)amount;
 - (void)incrementBy:(double)amount;
 - (void)setMaxValue:(double)newMax;
 - (void)setMaxValue:(double)newMax;
+- (double)maxValue;
 @end
 @end

@@ -27,6 +27,10 @@
 - (IBAction)simpleURLFetch:(id)sender
 - (IBAction)simpleURLFetch:(id)sender
 {
 {
 	ASIHTTPRequest *request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://allseeing-i.com"]] autorelease];
 	ASIHTTPRequest *request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://allseeing-i.com"]] autorelease];
+	
+	//Customise our user agent, for no real reason
+	[request addRequestHeader:@"User-Agent" value:@"ASIHTTPRequest"];
+	
 	[request start];
 	[request start];
 	if ([request dataString]) {
 	if ([request dataString]) {
 		[htmlSource setString:[request dataString]];
 		[htmlSource setString:[request dataString]];