Changed the way delegate responses are called.

For regular delegates, methods will be called on whatever thread the operation executed on, which probably won't be the main thread. If delegate methods need to update the UI, they should shunt themselves onto the main thread.

For block-based callbacks, we can shunt the call on to the main thread automatically by using dispatch_async (because we don't need to wait for the callback to finish) and the main queue.

However, this causes a problem with the acceptance tests because they execute on the main thread and will lock the main thread using an NSCondition when calling assertEventually. For that reason, the option to shunt the block callback on to the main queue can be turned off.

Classes/LRRestyClientBlockDelegate.h

@@ -14,6 +14,7 @@
 {
   LRRestyResponseBlock block;
 }
++ (void)setDispatchesOnMainQueue:(BOOL)shouldDispatchOnMainQueue;
 + (id)delegateWithBlock:(LRRestyResponseBlock)block;
 - (id)initWithBlock:(LRRestyResponseBlock)theBlock;
 @end

Classes/LRRestyClientBlockDelegate.m

@@ -11,6 +11,13 @@
 
 @implementation LRRestyClientBlockDelegate
 
+static BOOL _shouldDispatchOnMainQueue = YES;
+
++ (void)setDispatchesOnMainQueue:(BOOL)shouldDispatchOnMainQueue
+{
+  _shouldDispatchOnMainQueue = shouldDispatchOnMainQueue;
+}
+
 + (id)delegateWithBlock:(LRRestyResponseBlock)block;
 {
   return [[[self alloc] initWithBlock:block] autorelease];
@@ -33,7 +40,14 @@ - (void)dealloc
 - (void)restyRequest:(LRRestyRequest *)request didFinishWithResponse:(LRRestyResponse *)response
 {
   if (block) {
-    block(response);
+    if (_shouldDispatchOnMainQueue) {
+      dispatch_async(dispatch_get_main_queue(), ^{
+        block(response);
+      });
+    }
+    else {
+      block(response);
+    }
   }
 }
 

Classes/LRRestyRequest.m

@@ -136,9 +136,7 @@ - (void)start
   [super start];
 
   if ([delegate respondsToSelector:@selector(restyRequestDidStart:)]) {
-    dispatch_sync(dispatch_get_main_queue(), ^{
-      [delegate restyRequestDidStart:self];
-    });
+    [delegate restyRequestDidStart:self];
   }
   [LRResty log:[NSString stringWithFormat:@"Performing %@ with headers %@", self, [URLRequest allHTTPHeaderFields]]];
 }
@@ -151,9 +149,7 @@ - (void)finish;
               headers:[(NSHTTPURLResponse *)self.URLResponse allHeaderFields]
        originalRequest:self];
 
-  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-    [delegate restyRequest:self didFinishWithResponse:restResponse];
-  });
+  [delegate restyRequest:self didFinishWithResponse:restResponse];
 
   [restResponse release];
 
@@ -176,9 +172,7 @@ - (void)connection:(NSURLConnection *)connection didReceiveAuthenticationChallen
 - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
 {
   if ([delegate respondsToSelector:@selector(restyRequest:didReceiveData:)]) {
-    dispatch_sync(dispatch_get_main_queue(), ^{
-      [delegate restyRequest:self didReceiveData:data];
-    });
+    [delegate restyRequest:self didReceiveData:data];
   }
   [super connection:connection didReceiveData:data];
 }

Tests/Acceptance/DeleteResourceTests.m

@@ -65,19 +65,6 @@ - (void)testCanPerformDeleteRequestAndPassResponseToABlock
   [testLocalResponse release];
 }
 
-- (void)testResponseBlockIsCalledOnMainThread
-{
-  __block BOOL wasCalledOnMainThread = NO;
-
-  mimicDELETE(@"/simple/resource", andReturnAnything(), ^{
-    [client delete:resourceWithPath(@"/simple/resource") withBlock:^(LRRestyResponse *response) {
-      wasCalledOnMainThread = [[NSThread currentThread] isMainThread];
-    }];
-  });
-
-  assertEventuallyWithBlock(^{ return wasCalledOnMainThread; });
-}
-
 - (void)testCanPerformSynchronousDeleteRequest
 {
   LRRestyResponse *response = [client delete:resourceWithPath(@"/synchronous/echo")];

Tests/Acceptance/GetResourceTests.m

@@ -77,19 +77,6 @@ - (void)testCanPerformGetRequestAndPassResponseToABlock
   [testLocalResponse release];
 }
 
-- (void)testResponseBlockIsCalledOnMainThread
-{
-  __block BOOL wasCalledOnMainThread = NO;
-
-  mimicGET(@"/simple/resource", andReturnAnything(), ^{
-    [client get:resourceWithPath(@"/simple/resource") withBlock:^(LRRestyResponse *response) {
-      wasCalledOnMainThread = [[NSThread currentThread] isMainThread];
-    }];
-  });
-
-  assertEventuallyWithBlock(^{ return wasCalledOnMainThread; });
-}
-
 - (void)testCanPerformSynchronousGetRequest
 {
   LRRestyResponse *response = [client get:resourceWithPath(@"/synchronous/echo")];

Tests/Acceptance/PostResourceTests.m

@@ -130,22 +130,6 @@ - (void)testCanPostToResourceWithFormEncodedDataContainingNumbers
   assertEventuallyThat(&receivedResponse, is(responseWithRequestEcho(@"params.number", @"123")));
 }
 
-- (void)testResponseBlockIsCalledOnMainThread
-{
-  __block BOOL wasCalledOnMainThread = NO;
-
-  mimicPOST(@"/simple/resource", andEchoRequest(), ^{  
-    [client post:resourceWithPath(@"/simple/resource") 
-         payload:@"payload"
-       withBlock:^(LRRestyResponse *response) {
-
-         wasCalledOnMainThread = [[NSThread currentThread] isMainThread];
-       }];
-  });
-
-  assertEventuallyWithBlock(^{ return wasCalledOnMainThread; });
-}
-
 - (void)testCanPerformSynchronousPostRequest
 {
   LRRestyResponse *response = [client post:resourceWithPath(@"/synchronous/echo") payload:@"hello world"];

Tests/Acceptance/PutResourceTests.m

@@ -130,22 +130,6 @@ - (void)testCanPostToResourceWithFormEncodedDataContainingNumbers
   assertEventuallyThat(&receivedResponse, is(responseWithRequestEcho(@"params.number", @"123")));
 }
 
-- (void)testResponseBlockIsCalledOnMainThread
-{
-  __block BOOL wasCalledOnMainThread = NO;
-
-  mimicPUT(@"/simple/resource", andEchoRequest(), ^{  
-    [client put:resourceWithPath(@"/simple/resource") 
-        payload:@"payload"
-      withBlock:^(LRRestyResponse *response) {
-
-         wasCalledOnMainThread = [[NSThread currentThread] isMainThread];
-       }];
-  });
-
-  assertEventuallyWithBlock(^{ return wasCalledOnMainThread; });
-}
-
 - (void)testCanPerformSynchronousPutRequest
 {
   LRRestyResponse *response = [client put:resourceWithPath(@"/synchronous/echo") payload:@"hello world"];

Tests/Acceptance/RestyClientAcceptanceTestCase.m

@@ -7,6 +7,7 @@
 //
 
 #import "RestyClientAcceptanceTestCase.h"
+#import "LRRestyClientBlockDelegate.h"
 
 @implementation RestyClientAcceptanceTestCase
 
@@ -16,6 +17,11 @@ @implementation RestyClientAcceptanceTestCase
 - (void)setUp
 {
   client = [LRResty newClient];
+
+  /* we can't call our callbacks on the main queue as we 
+   have to block the main thread with assertEventually */
+
+  [LRRestyClientBlockDelegate setDispatchesOnMainQueue:NO];
 }
 
 - (void)tearDown