kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-23 20:31:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

[REBASE ME] Refactored Router for simplicity, nearly done with design. Initial support for relationship loading from object manager.

Browse Source
This commit is contained in:
Blake Watters
2012-06-20 16:43:32 -04:00
parent c4a329cc58
commit 6c3b75039b
9 changed files with 319 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Code/ObjectMapping/RKObjectManager.m
View File

@@ -261,7 +261,8 @@ static NSOperationQueue *defaultMappingQueue = nil;
- (id)loaderForObject:(id<NSObject>)object method:(RKRequestMethod)method
{
NSString *resourcePath = (method == RKRequestMethodInvalid) ? nil : [self.router resourcePathForObject:object method:method];
RKRoute *route = [self.router routeForObject:object method:method];
NSString* resourcePath = (method == RKRequestMethodInvalid) ? nil : [route resourcePathForObject:object];
RKObjectLoader *loader = [self loaderWithResourcePath:resourcePath];
loader.method = method;
loader.sourceObject = object;
@@ -345,7 +346,8 @@ static NSOperationQueue *defaultMappingQueue = nil;
- (void)sendObject:(id<NSObject>)object method:(RKRequestMethod)method usingBlock:(void(^)(RKObjectLoader *))block
{
NSString *resourcePath = [self.router resourcePathForObject:object method:method];
RKRoute *route = [self.router routeForObject:object method:method];
NSString *resourcePath = [route resourcePathForObject:object];
[self sendObject:object toResourcePath:resourcePath usingBlock:^(RKObjectLoader *loader) {
loader.method = method;
block(loader);
@@ -372,6 +374,19 @@ static NSOperationQueue *defaultMappingQueue = nil;
[self sendObject:object method:RKRequestMethodDELETE usingBlock:block];
}
- (void)loadRelationship:(NSString *)relationshipName ofObject:(id)object usingBlock:(void(^)(RKObjectLoader *))block
{
// TODO: Try to pull the path/url off of the object (relationshipResourcePath | relationshipURL)
RKRoute *route = [self.router routeForRelationship:relationshipName ofClass:[object class] method:RKRequestMethodGET];
NSString *resourcePath = [route resourcePathForObject:object];
[self loadObjectsAtResourcePath:resourcePath usingBlock:block];
// id targetObject = [object valueForKey:relationshipName];
// [self sendObject:targetObject toResourcePath:resourcePath usingBlock:^(RKObjectLoader *loader) {
// loader.method = RKRequestMethodGET;
// block(loader);
// }];
}
#endif // NS_BLOCKS_AVAILABLE
#pragma mark - Object Instance Loaders for Non-nested JSON