Change requestMethod to method

Author: segiddins

Code/Network/RKObjectManager.m

@@ -74,7 +74,7 @@
     Class searchClass = [object class];
     do {
         for (RKRequestDescriptor *requestDescriptor in requestDescriptors) {
-            if ([requestDescriptor matchesObject:object requestMethod:requestMethod exactMatch:YES]) return requestDescriptor;
+            if ([requestDescriptor matchesObject:object method:requestMethod exactMatch:YES]) return requestDescriptor;
         }
     } while ((searchClass = [searchClass superclass]));
     return nil;

Code/Network/RKRequestDescriptor.h

@@ -54,7 +54,7 @@
 + (instancetype)requestDescriptorWithMapping:(RKMapping *)mapping
                                  objectClass:(Class)objectClass
                                  rootKeyPath:(NSString *)rootKeyPath
-                               requestMethod:(RKRequestMethod)requestMethod;
+                                      method:(RKRequestMethod)method;
 
 ///-----------------------------------------------------
 /// @name Getting Information About a Request Descriptor
@@ -75,7 +75,7 @@
  */
 @property (nonatomic, copy, readonly) NSString *rootKeyPath;
 
-@property (nonatomic, assign, readonly) RKRequestMethod requestMethod;
+@property (nonatomic, assign, readonly) RKRequestMethod method;
 
 ///--------------------------------
 /// @name Using Request Descriptors
@@ -87,6 +87,6 @@
  @param object The object to be matched against the receiver.
  @return `YES` if the given object matches objectClass, else `NO`.
  */
-- (BOOL)matchesObject:(id)object requestMethod:(RKRequestMethod)requestMethod exactMatch:(BOOL)exact;
+- (BOOL)matchesObject:(id)object method:(RKRequestMethod)method exactMatch:(BOOL)exact;
 
 @end

Code/Network/RKRequestDescriptor.m

@@ -47,18 +47,18 @@ @interface RKRequestDescriptor ()
 @property (nonatomic, strong, readwrite) RKMapping *mapping;
 @property (nonatomic, strong, readwrite) Class objectClass;
 @property (nonatomic, copy, readwrite) NSString *rootKeyPath;
-@property (nonatomic, assign, readwrite) RKRequestMethod requestMethod;
+@property (nonatomic, assign, readwrite) RKRequestMethod method;
 
 @end
 
 @implementation RKRequestDescriptor
 
 + (instancetype)requestDescriptorWithMapping:(RKMapping *)mapping objectClass:(Class)objectClass rootKeyPath:(NSString *)rootKeyPath
 {
-    return [self requestDescriptorWithMapping:mapping objectClass:objectClass rootKeyPath:rootKeyPath requestMethod:RKRequestMethodAny];
+    return [self requestDescriptorWithMapping:mapping objectClass:objectClass rootKeyPath:rootKeyPath method:RKRequestMethodAny];
 }
 
-+ (instancetype)requestDescriptorWithMapping:(RKMapping *)mapping objectClass:(Class)objectClass rootKeyPath:(NSString *)rootKeyPath requestMethod:(RKRequestMethod)requestMethod
++ (instancetype)requestDescriptorWithMapping:(RKMapping *)mapping objectClass:(Class)objectClass rootKeyPath:(NSString *)rootKeyPath method:(RKRequestMethod)method
 {
     NSParameterAssert(mapping);
     NSParameterAssert(objectClass);
@@ -68,7 +68,7 @@ + (instancetype)requestDescriptorWithMapping:(RKMapping *)mapping objectClass:(C
     requestDescriptor.mapping = mapping;
     requestDescriptor.objectClass = objectClass;
     requestDescriptor.rootKeyPath = rootKeyPath;
-    requestDescriptor.requestMethod = requestMethod;
+    requestDescriptor.method = method;
     return requestDescriptor;
 }
 
@@ -78,9 +78,9 @@ - (NSString *)description
             NSStringFromClass([self class]), self, NSStringFromClass(self.objectClass), self.rootKeyPath, self.mapping];
 }
 
-- (BOOL)matchesObject:(id)object requestMethod:(RKRequestMethod)requestMethod exactMatch:(BOOL)exact
+- (BOOL)matchesObject:(id)object method:(RKRequestMethod)method exactMatch:(BOOL)exact
 {
-    return (exact ? [object class] == self.objectClass : [object isKindOfClass:self.objectClass] ) && (requestMethod & self.requestMethod) != 0;
+    return (exact ? [object class] == self.objectClass : [object isKindOfClass:self.objectClass] ) && (method & self.method) != 0;
 }
 
 @end