Add tests and support for using bitwise specifiers for `enqueuedObjec…

…tRequestOperationsWithMethod:matchingPathPattern:` refs RestKit#1476
CenterDevice · Dec 12, 2013 · 0a6db0b · 0a6db0b
1 parent 2405949
commit 0a6db0b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/Code/Network/RKObjectManager.h b/Code/Network/RKObjectManager.h
@@ -527,7 +527,7 @@ RKMappingResult, RKRequestDescriptor, RKResponseDescriptor;
  
  Paths are matches against the `path` of the `NSURL` of the `NSURLRequest` of each `RKObjectRequestOperation` contained in the receiver's operation queue using a `RKPathMatcher` object.
  
- @param method The HTTP method to match for the cancelled requests, such as `RKRequestMethodGET`, `RKRequestMethodPOST`, `RKRequestMethodPUT`, `RKRequestMethodPatch`, or `RKRequestMethodDELETE`. If `RKRequestMethodAny`, all object request operations with URLs matching the given path pattern will be cancelled.
+ @param method The HTTP method to match for the cancelled requests, such as `RKRequestMethodGET`, `RKRequestMethodPOST`, `RKRequestMethodPUT`, `RKRequestMethodPatch`, or `RKRequestMethodDELETE`. If `RKRequestMethodAny`, all object request operations with URLs matching the given path pattern will be cancelled. Multiple methods may be specified by using a bitwise OR operation.
  @param pathPattern The pattern to match against the path of the request URL for executing object request operations considered for cancellation.
  @return A new array containing all enqueued `RKObjectRequestOperation` objects that match the given HTTP method and path pattern.
  @see `RKPathMatcher`

diff --git a/Code/Network/RKObjectManager.m b/Code/Network/RKObjectManager.m
@@ -820,16 +820,16 @@ - (void)enqueueObjectRequestOperation:(RKObjectRequestOperation *)objectRequestO
 - (NSArray *)enqueuedObjectRequestOperationsWithMethod:(RKRequestMethod)method matchingPathPattern:(NSString *)pathPattern
 {
     NSMutableArray *matches = [NSMutableArray array];
-    NSString *methodName = RKStringFromRequestMethod(method);
     RKPathMatcher *pathMatcher = [RKPathMatcher pathMatcherWithPattern:pathPattern];
     for (NSOperation *operation in [self.operationQueue operations]) {
         if (![operation isKindOfClass:[RKObjectRequestOperation class]]) {
             continue;
         }
         NSURLRequest *request = [(RKObjectRequestOperation *)operation HTTPRequestOperation].request;
         NSString *pathAndQueryString = RKPathAndQueryStringFromURLRelativeToURL([request URL], self.baseURL);
-
-        if ((!methodName || [methodName isEqualToString:[request HTTPMethod]]) && [pathMatcher matchesPath:pathAndQueryString tokenizeQueryStrings:NO parsedArguments:nil]) {
+
+        RKRequestMethod operationMethod = RKRequestMethodFromString([request HTTPMethod]);
+        if ((method & operationMethod) && [pathMatcher matchesPath:pathAndQueryString tokenizeQueryStrings:NO parsedArguments:nil]) {
             [matches addObject:operation];
         }
     }

diff --git a/Tests/Logic/ObjectMapping/RKObjectManagerTest.m b/Tests/Logic/ObjectMapping/RKObjectManagerTest.m
@@ -396,6 +396,26 @@ - (void)testEnqueuedObjectRequestOperationByPathMatchForBaseURLWithPath
     expect([[_objectManager enqueuedObjectRequestOperationsWithMethod:RKRequestMethodGET matchingPathPattern:@":objectID/cancel"] count]).to.equal(1);
 }
 
+- (void)testEnqueuedObjectRequestOperationByMultipleBitmaskMethodAndPath
+{
+    NSURLRequest *request1 = [NSURLRequest requestWithURL:[NSURL URLWithString:@"/object_manager/cancel" relativeToURL:self.objectManager.HTTPClient.baseURL]];
+    NSMutableURLRequest *request2 = [request1 mutableCopy];
+    request2.HTTPMethod = @"POST";
+    NSMutableURLRequest *request3 = [request1 mutableCopy];
+    request3.HTTPMethod = @"DELETE";
+    RKObjectRequestOperation *operation = [[RKObjectRequestOperation alloc] initWithRequest:request1 responseDescriptors:self.objectManager.responseDescriptors];
+
+    RKObjectRequestOperation *secondOperation = [[RKObjectRequestOperation alloc] initWithRequest:request2 responseDescriptors:self.objectManager.responseDescriptors];
+    RKObjectRequestOperation *thirdOperation = [[RKObjectRequestOperation alloc] initWithRequest:request3 responseDescriptors:self.objectManager.responseDescriptors];
+    [_objectManager enqueueObjectRequestOperation:operation];
+    [_objectManager enqueueObjectRequestOperation:secondOperation];
+    [_objectManager enqueueObjectRequestOperation:thirdOperation];
+    NSArray *operations = [_objectManager enqueuedObjectRequestOperationsWithMethod:RKRequestMethodGET | RKRequestMethodPOST matchingPathPattern:@"/object_manager/cancel"];
+    expect(operations).to.haveCountOf(2);
+    expect(operations).to.contain(operation);
+    expect(operations).to.contain(secondOperation);
+}
+
 - (void)testShouldProperlyFireABatchOfOperations
 {
     NSManagedObjectContext *managedObjectContext = [[RKTestFactory managedObjectStore] persistentStoreManagedObjectContext];