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

Overhaul RKParser API's for clarity and simplicity:

Browse Source 
* Adds support for NSJSONSerialization. closes #476
* Renames RKParser to RKSerialization
* Renames RKParserRegistry to RKMIMETypeSerialization
* Rework serialization implementations API's to use class methods
* Fold together string and regular expression matching for MIME Type registrations
* Port serialization implementations to working off of NSData instead of NSString. refs #762
* Migrate JSONKit to being an optional component. See https://github.com/RestKit/RKJSONKitSerialization
This commit is contained in:
Blake Watters
2012-09-04 13:07:31 -04:00
parent a74b8717dc
commit 10377d0a70
27 changed files with 450 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Code/Network/RKObjectManager.m
View File

@@ -19,7 +19,7 @@
//
#import "RKObjectManager.h"
#import "RKObjectParameters.h"
#import "RKObjectParameterization.h"
#import "RKManagedObjectStore.h"
#import "RKSupport.h"
#import "RKRequestDescriptor.h"
@@ -227,7 +227,7 @@ static NSOperationQueue *defaultMappingQueue = nil;
RKRequestDescriptor *requestDescriptor = [self requestDescriptorForObject:object];
if (requestDescriptor) {
NSError *error = nil;
NSMutableDictionary *mergedParameters = [[RKObjectParameters parametersWithObject:object requestDescriptor:requestDescriptor error:&error] mutableCopy];
NSMutableDictionary *mergedParameters = [[RKObjectParameterization parametersWithObject:object requestDescriptor:requestDescriptor error:&error] mutableCopy];
if (parameters) [mergedParameters reverseMergeWith:parameters];
requestParameters = mergedParameters;
} else {
@@ -249,7 +249,7 @@ static NSOperationQueue *defaultMappingQueue = nil;
RKRequestDescriptor *requestDescriptor = [self requestDescriptorForObject:object];
if (requestDescriptor) {
NSError *error = nil;
NSMutableDictionary *mergedParameters = [[RKObjectParameters parametersWithObject:object requestDescriptor:requestDescriptor error:&error] mutableCopy];
NSMutableDictionary *mergedParameters = [[RKObjectParameterization parametersWithObject:object requestDescriptor:requestDescriptor error:&error] mutableCopy];
if (parameters) [mergedParameters reverseMergeWith:parameters];
requestParameters = mergedParameters;
} else {