giuseppenuc/PNObject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix vari

Browse Source
This commit is contained in:
Giuseppe Nucifora 2016-04-18 12:50:28 +02:00
parent 79b96fc967
commit a42f52b513
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PNObject.podspec
View File

@ -8,7 +8,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "PNObject" s.name = "PNObject"
s.version = "0.6.1" s.version = "0.6.2"
s.summary = "PNObject is a simple replica of the more complex ParseObject" s.summary = "PNObject is a simple replica of the more complex ParseObject"
# This description is used to generate tags and improve search results. # This description is used to generate tags and improve search results.

4
Pod/Classes/PNObject+Protected.m
View File

@ -128,7 +128,7 @@
@"NSArray" : ^{ @"NSArray" : ^{
NSMutableArray *arr = [NSMutableArray array]; NSMutableArray *arr = [NSMutableArray array];
for(id JSONObject in value) { for(id JSONObject in value) {
if([[JSONObject class] isSubclassOfClass:[PNObject class]]) { if(fromLocal || [[JSONObject class] isSubclassOfClass:[PNObject class]] || [NSClassFromString(mappedJSONType) isSubclassOfClass:[PNObject class]]) {
PNObject *val = [[NSClassFromString(mappedJSONType) alloc] initWithJSON:JSONObject fromLocal:fromLocal]; PNObject *val = [[NSClassFromString(mappedJSONType) alloc] initWithJSON:JSONObject fromLocal:fromLocal];
[arr addObject:val]; [arr addObject:val];
} }
@ -142,7 +142,7 @@
@"NSMutableArray" : ^{ @"NSMutableArray" : ^{
NSMutableArray *arr = [NSMutableArray array]; NSMutableArray *arr = [NSMutableArray array];
for(id JSONObject in value) { for(id JSONObject in value) {
if([[JSONObject class] isSubclassOfClass:[PNObject class]]) { if(fromLocal || [[JSONObject class] isSubclassOfClass:[PNObject class]] || [NSClassFromString(mappedJSONType) isSubclassOfClass:[PNObject class]]) {
PNObject *val = [[NSClassFromString(mappedJSONType) alloc] initWithJSON:JSONObject fromLocal:fromLocal]; PNObject *val = [[NSClassFromString(mappedJSONType) alloc] initWithJSON:JSONObject fromLocal:fromLocal];
[arr addObject:val]; [arr addObject:val];
} }

7
Pod/Classes/PNObject.m
View File

@ -291,6 +291,9 @@ NSString * const PNObjectMappingSelector = @"selector";
[arr addObject:objectDict]; [arr addObject:objectDict];
} }
else {
[arr addObject:object];
}
} }
[JSON setValue:arr forKey:propertyName]; [JSON setValue:arr forKey:propertyName];
@ -305,6 +308,9 @@ NSString * const PNObjectMappingSelector = @"selector";
[arr addObject:objectDict]; [arr addObject:objectDict];
} }
else {
[arr addObject:object];
}
} }
[JSON setValue:arr forKey:propertyName]; [JSON setValue:arr forKey:propertyName];
@ -319,6 +325,7 @@ NSString * const PNObjectMappingSelector = @"selector";
} }
else { else {
// do nothing // do nothing
[JSON setValue:value forKey:propertyName];
} }
})(); })();
} }