Support delegate for class.

Author: kevin-lyn

STNetTaskQueue/STNetTaskQueue.h

@@ -91,14 +91,23 @@
 - (void)task:(STNetTask *)task didFailWithError:(NSError *)error;
 
 /*
- Add a net task delegate to "STNetTaskQueue",
+ Add a net task delegate to "STNetTaskQueue" with uri of the net task,
  it's a weak reference and duplicated delegate with same uri will be ignored.
  
  @param delegate id<STNetTaskDelegate>
  @param uri NSString A unique string returned by STNetTask.
  */
 - (void)addTaskDelegate:(id<STNetTaskDelegate>)delegate uri:(NSString *)uri;
 
+/*
+ Add a net task delegate to "STNetTaskQueue" with class of net task,
+ it's a weak reference and duplicated delegate with same class will be ignored.
+ 
+ @param delegate id<STNetTaskDelegate>
+ @param class Class Class which extends STNetTask.
+ */
+- (void)addTaskDelegate:(id<STNetTaskDelegate>)delegate class:(Class)class;
+
 /*
  Most of the times you don't need to remove net task delegate explicitly,
  because "STNetTaskQueue" holds weak reference of each delegate.
@@ -107,6 +116,7 @@
  @param uri NSString
  */
 - (void)removeTaskDelegate:(id<STNetTaskDelegate>)delegate uri:(NSString *)uri;
+- (void)removeTaskDelegate:(id<STNetTaskDelegate>)delegate class:(Class)class;
 - (void)removeTaskDelegate:(id<STNetTaskDelegate>)delegate;
 
 @end

STNetTaskQueue/STNetTaskQueue.m

@@ -214,14 +214,18 @@ - (void)_netTaskDidEnd:(STNetTask *)task
 {
     [self.lock lock];
 
-    NSHashTable *delegates = self.taskDelegates[task.uri];
-    NSArray *allDelegates = [NSArray arrayWithArray:delegates.allObjects];
+    NSHashTable *delegatesForURI = self.taskDelegates[task.uri];
+    NSHashTable *delegatesForClass = self.taskDelegates[NSStringFromClass(task.class)];
+    NSMutableSet *set = [NSMutableSet new];
+    [set addObjectsFromArray:delegatesForURI.allObjects];
+    [set addObjectsFromArray:delegatesForClass.allObjects];
+    NSArray *delegates = set.allObjects;
 
     [self.lock unlock];
 
-    if (allDelegates.count) {
+    if (delegates.count) {
         dispatch_async(dispatch_get_main_queue(), ^ {
-            for (id<STNetTaskDelegate> delegate in allDelegates) {
+            for (id<STNetTaskDelegate> delegate in delegates) {
                 [delegate netTaskDidEnd:task];
             }
         });
@@ -242,22 +246,49 @@ - (void)addTaskDelegate:(id<STNetTaskDelegate>)delegate uri:(NSString *)uri
     [self.lock unlock];
 }
 
+- (void)addTaskDelegate:(id<STNetTaskDelegate>)delegate class:(Class)class
+{
+    NSString *className = NSStringFromClass(class);
+    NSAssert([class isSubclassOfClass:[STNetTask class]], @"%@ should be a subclass of STNetTask", className);
+    
+    [self.lock lock];
+    
+    NSHashTable *delegates = self.taskDelegates[className];
+    if (!delegates) {
+        delegates = [NSHashTable weakObjectsHashTable];
+        self.taskDelegates[className] = delegates;
+    }
+    [delegates addObject:delegate];
+    
+    [self.lock unlock];
+}
+
 - (void)removeTaskDelegate:(id<STNetTaskDelegate>)delegate
 {
     [self.lock lock];
 
-    for (NSString *uri in self.taskDelegates) {
-        [self removeTaskDelegate:delegate uri:uri];
+    for (NSString *key in self.taskDelegates) {
+        [self removeTaskDelegate:delegate key:key];
     }
 
     [self.lock unlock];
 }
 
 - (void)removeTaskDelegate:(id<STNetTaskDelegate>)delegate uri:(NSString *)uri
+{
+    [self removeTaskDelegate:delegate key:uri];
+}
+
+- (void)removeTaskDelegate:(id<STNetTaskDelegate>)delegate class:(Class)class
+{
+    [self removeTaskDelegate:delegate key:NSStringFromClass(class)];
+}
+
+- (void)removeTaskDelegate:(id<STNetTaskDelegate>)delegate key:(NSString *)key
 {
     [self.lock lock];
 
-    NSHashTable *delegates = self.taskDelegates[uri];
+    NSHashTable *delegates = self.taskDelegates[key];
     [delegates removeObject:delegate];
 
     [self.lock unlock];

STNetTaskQueueTest/STNetTaskQueueTest/STNetTaskQueueTestHTTP.m

@@ -152,11 +152,11 @@ - (void)testDeleteNetTask
 
 - (void)testMaxConcurrentTasksCountTask
 {
-    _expectation = [self expectationWithDescription:@"testMaxConcurrentTasksCount"];
-    
     [self setUpNetTaskQueueWithBaseURLString:@"http://jsonplaceholder.typicode.com"];
     [STNetTaskQueue sharedQueue].maxConcurrentTasksCount = 1;
 
+    _expectation = [self expectationWithDescription:@"testMaxConcurrentTasksCount"];
+    
     STTestMaxConcurrentTasksCountNetTask *task1 = [STTestMaxConcurrentTasksCountNetTask new];
     task1.id = 1;
 
@@ -171,6 +171,20 @@ - (void)testMaxConcurrentTasksCountTask
     [self waitForExpectationsWithTimeout:20 handler:nil];
 }
 
+- (void)testTaskDelegateForClass
+{
+    [self setUpNetTaskQueueWithBaseURLString:@"http://jsonplaceholder.typicode.com"];
+    
+    _expectation = [self expectationWithDescription:@"testTaskDelegateForClass"];
+    
+    STTestGetNetTask *testGetTask = [STTestGetNetTask new];
+    testGetTask.id = 1;
+    [[STNetTaskQueue sharedQueue] addTaskDelegate:self class:testGetTask.class];
+    [[STNetTaskQueue sharedQueue] addTask:testGetTask];
+    
+    [self waitForExpectationsWithTimeout:10 handler:nil];
+}
+
 - (void)netTaskDidEnd:(STNetTask *)task
 {
     if (!_expectation) {
@@ -179,14 +193,14 @@ - (void)netTaskDidEnd:(STNetTask *)task
     if ([task isKindOfClass:[STTestRetryNetTask class]]) {
         [_expectation fulfill];
         if (!task.error || task.retryCount != task.maxRetryCount) {
-            XCTFail(@"testRetryNetTask failed");
+            XCTFail(@"%@ failed", _expectation.description);
         }
     }
     else if ([task isKindOfClass:[STTestGetNetTask class]]) {
         [_expectation fulfill];
         STTestGetNetTask *testGetTask = (STTestGetNetTask *)task;
         if (task.error || [testGetTask.post[@"id"] intValue] != testGetTask.id) {
-            XCTFail(@"testGetNetTask failed");
+            XCTFail(@"%@ failed", _expectation.description);
         }
     }
     else if ([task isKindOfClass:[STTestPostNetTask class]]) {
@@ -196,27 +210,27 @@ - (void)netTaskDidEnd:(STNetTask *)task
             ![testPostTask.post[@"title"] isEqualToString:testPostTask.title] ||
             ![testPostTask.post[@"body"] isEqualToString:testPostTask.body] ||
             [testPostTask.post[@"user_id"] intValue] != testPostTask.userId) {
-            XCTFail(@"testPostNetTask failed");
+            XCTFail(@"%@ failed", _expectation.description);
         }
     }
     else if ([task isKindOfClass:[STTestPutNetTask class]]) {
         [_expectation fulfill];
         STTestPutNetTask *testPutTask = (STTestPutNetTask *)task;
         if (task.error || !testPutTask.post) {
-            XCTFail(@"testPutNetTask failed");
+            XCTFail(@"%@ failed", _expectation.description);
         }
     }
     else if ([task isKindOfClass:[STTestPatchNetTask class]]) {
         [_expectation fulfill];
         STTestPatchNetTask *testPatchTask = (STTestPatchNetTask *)task;
         if (task.error || !testPatchTask.post) {
-            XCTFail(@"testPatchNetTask failed");
+            XCTFail(@"%@ failed", _expectation.description);
         }
     }
     else if ([task isKindOfClass:[STTestDeleteNetTask class]]) {
         [_expectation fulfill];
         if (task.error) {
-            XCTFail(@"testDeleteNetTask failed");
+            XCTFail(@"%@ failed", _expectation.description);
         }
     }
     else if ([task isKindOfClass:[STTestMaxConcurrentTasksCountNetTask class]]) {