Merge c013589 into 4e2bd2b

spotify · Feb 2, 2016 · bbc3eba · bbc3eba
2 parents 4e2bd2b + c013589
commit bbc3eba
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/SPTDataLoader/SPTDataLoader.m b/SPTDataLoader/SPTDataLoader.m
@@ -24,6 +24,7 @@
 #import "SPTDataLoaderResponse.h"
 #import "SPTDataLoaderRequestResponseHandler.h"
 #import "SPTDataLoaderDelegate.h"
+#import "SPTDataLoaderResponse+Private.h"
 
 @interface SPTDataLoader ()
 
@@ -71,9 +72,22 @@ - (void)executeDelegateBlock:(dispatch_block_t)block
 {
     SPTDataLoaderRequest *copiedRequest = [request copy];
     id<SPTDataLoaderDelegate> delegate = self.delegate;
-    if ([delegate respondsToSelector:@selector(dataLoaderShouldSupportChunks:)] && copiedRequest.chunks) {
-        NSAssert([delegate dataLoaderShouldSupportChunks:self], @"The data loader was given a request that required chunks while the delegate does not support chunks");
+
+    // Cancel the request immediately if it requires chunks and the delegate does not support that
+    BOOL chunksSupported = [delegate respondsToSelector:@selector(dataLoaderShouldSupportChunks:)];
+    if (chunksSupported) {
+        chunksSupported = [delegate dataLoaderShouldSupportChunks:self];
+    }
+    if (!chunksSupported && copiedRequest.chunks) {
+        NSError *error = [NSError errorWithDomain:SPTDataLoaderRequestErrorDomain
+                                             code:SPTDataLoaderRequestErrorChunkedRequestWithoutChunkedDelegate
+                                         userInfo:nil];
+        SPTDataLoaderResponse *response = [SPTDataLoaderResponse dataLoaderResponseWithRequest:request response:nil];
+        response.error = error;
+        [delegate dataLoader:self didReceiveErrorResponse:response];
+        return nil;
     }
+
     id<SPTCancellationToken> cancellationToken = [self.requestResponseHandlerDelegate requestResponseHandler:self
                                                                                               performRequest:copiedRequest];
     @synchronized(self.cancellationTokens) {

diff --git a/SPTDataLoaderTests/SPTDataLoaderTest.m b/SPTDataLoaderTests/SPTDataLoaderTest.m
@@ -150,4 +150,12 @@ - (void)testDelegateCallbackOnSeparateQueue
     XCTAssertEqual(self.delegate.numberOfCallsToSuccessfulResponse, 1u, @"The data loader did not relay a successful response to the delegate");
 }
 
+- (void)testErrorDelegateCallbackWhenMismatchInChunkSupport
+{
+    SPTDataLoaderRequest *request = [SPTDataLoaderRequest new];
+    request.chunks = YES;
+    [self.dataLoader performRequest:request];
+    XCTAssertEqual(self.delegate.numberOfCallsToErrorResponse, 1u);
+}
+
 @end
diff --git a/include/SPTDataLoader/SPTDataLoaderRequest.h b/include/SPTDataLoader/SPTDataLoaderRequest.h
@@ -28,7 +28,8 @@ typedef NS_ENUM(NSInteger, SPTDataLoaderRequestMethod) {
 };
 
 typedef NS_ENUM(NSInteger, SPTDataLoaderRequestErrorCode) {
-    SPTDataLoaderRequestErrorCodeTimeout
+    SPTDataLoaderRequestErrorCodeTimeout,
+    SPTDataLoaderRequestErrorChunkedRequestWithoutChunkedDelegate
 };
 
 extern NSString * const SPTDataLoaderRequestErrorDomain;