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

Refactor RKDictionaryByMergingDictionaryWithDictionary to cleanup & clarify code. Refs #938.

Browse Source
This commit is contained in:
Jawwad Ahmad
2012-09-18 15:35:03 -04:00
parent bfbc345ee8
commit 4f1fdf2bea
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Code/Support/RKDictionaryUtilities.m
View File

@@ -8,15 +8,17 @@
#import "RKDictionaryUtilities.h"
NSDictionary * RKDictionaryByMergingDictionaryWithDictionary(NSDictionary *dictionary, NSDictionary *anotherDictionary)
NSDictionary * RKDictionaryByMergingDictionaryWithDictionary(NSDictionary *dict1, NSDictionary *dict2)
{
NSMutableDictionary *mergedDictionary = [NSMutableDictionary dictionaryWithDictionary:dictionary];
[anotherDictionary enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
if ([[mergedDictionary objectForKey:key] isKindOfClass:[NSDictionary class]] && [obj isKindOfClass:[NSDictionary class]]) {
NSDictionary *newVal = RKDictionaryByMergingDictionaryWithDictionary([mergedDictionary objectForKey:key], obj);
[mergedDictionary setObject:newVal forKey:key];
NSMutableDictionary *mergedDictionary = [dict1 mutableCopy];
[dict2 enumerateKeysAndObjectsUsingBlock:^(id key2, id obj2, BOOL *stop) {
id obj1 = dict1[key2];
if ([obj1 isKindOfClass:[NSDictionary class]] && [obj2 isKindOfClass:[NSDictionary class]]) {
NSDictionary *mergedSubdict = RKDictionaryByMergingDictionaryWithDictionary(obj1, obj2);
mergedDictionary[key2] = mergedSubdict;
} else {
[mergedDictionary setObject:obj forKey:key];
mergedDictionary[key2] = obj2;
}
}];