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

- Fix

Browse Source
This commit is contained in:
Giuseppe Nucifora 2017-01-04 00:12:53 +01:00
parent 520b729123
commit 13801d0aa3
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Example/Podfile.lock
View File

@ -33,7 +33,7 @@ PODS:
- FBSDKShareKit (4.18.0): - FBSDKShareKit (4.18.0):
- FBSDKCoreKit - FBSDKCoreKit
- NSDataAES (0.2.2) - NSDataAES (0.2.2)
- NSDate_Utils (1.0.0) - NSDate_Utils (1.0.1)
- NSString-Helper (1.0.5) - NSString-Helper (1.0.5)
- nv-ios-http-status (0.0.1) - nv-ios-http-status (0.0.1)
- PEAR-FileManager-iOS (1.3.1) - PEAR-FileManager-iOS (1.3.1)
@ -80,7 +80,7 @@ SPEC CHECKSUMS:
FBSDKLoginKit: 6773073e970b2b15fb12e451ce7f11da0532b880 FBSDKLoginKit: 6773073e970b2b15fb12e451ce7f11da0532b880
FBSDKShareKit: 0b8d6cc3f103c75297eb3c62caec284a2ccf1b9e FBSDKShareKit: 0b8d6cc3f103c75297eb3c62caec284a2ccf1b9e
NSDataAES: 967ea3337476a80e9838a533c25d570a06855ed0 NSDataAES: 967ea3337476a80e9838a533c25d570a06855ed0
NSDate_Utils: 45d47afab329001ccafe056308d0cc05460e5298 NSDate_Utils: b451375dcbf9099a444c32de029c4498a5e7d58e
NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4 NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4
nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f
PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3

4
Example/Pods/Manifest.lock generated
View File

@ -33,7 +33,7 @@ PODS:
- FBSDKShareKit (4.18.0): - FBSDKShareKit (4.18.0):
- FBSDKCoreKit - FBSDKCoreKit
- NSDataAES (0.2.2) - NSDataAES (0.2.2)
- NSDate_Utils (1.0.0) - NSDate_Utils (1.0.1)
- NSString-Helper (1.0.5) - NSString-Helper (1.0.5)
- nv-ios-http-status (0.0.1) - nv-ios-http-status (0.0.1)
- PEAR-FileManager-iOS (1.3.1) - PEAR-FileManager-iOS (1.3.1)
@ -80,7 +80,7 @@ SPEC CHECKSUMS:
FBSDKLoginKit: 6773073e970b2b15fb12e451ce7f11da0532b880 FBSDKLoginKit: 6773073e970b2b15fb12e451ce7f11da0532b880
FBSDKShareKit: 0b8d6cc3f103c75297eb3c62caec284a2ccf1b9e FBSDKShareKit: 0b8d6cc3f103c75297eb3c62caec284a2ccf1b9e
NSDataAES: 967ea3337476a80e9838a533c25d570a06855ed0 NSDataAES: 967ea3337476a80e9838a533c25d570a06855ed0
NSDate_Utils: 45d47afab329001ccafe056308d0cc05460e5298 NSDate_Utils: b451375dcbf9099a444c32de029c4498a5e7d58e
NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4 NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4
nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f
PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3

10
Example/Pods/NSDate_Utils/Pod/Classes/NSDate+NSDate_Util.m generated
View File

@ -523,12 +523,10 @@ static NSDateFormatter *_displayFormatter = nil;
[dateFormatter setDateFormat:dateFormat]; [dateFormatter setDateFormat:dateFormat];
NSDate *theDate = nil; NSDate *theDate = [NSDate dateFromString:dateString withFormat:dateFormat];
NSError *error = nil;
if (![dateFormatter getObjectValue:&theDate forString:dateString range:nil error:&error]) { if (theDate) {
NSLog(@"Date '%@' could not be parsed: %@", dateString, error);
}
else {
return dateFormat; return dateFormat;
} }
} }

18
PNObject/Classes/PNObject.m
View File

@ -432,9 +432,21 @@ NSString * const PNObjectMappingSelector = @"selector";
[JSONFormObject setValue:@(val) forKey:propertyName]; [JSONFormObject setValue:@(val) forKey:propertyName];
}, },
@"NSDate" : ^{ @"NSDate" : ^{
NSString *val = [[value toLocalTime] stringWithFormat:kNSDateHelperFormatSQLDateWithTime]; NSDate *val;
if (![self isObjNull:val]) {
[JSONFormObject setValue:val forKey:propertyName]; if ([value isKindOfClass:[NSString class]]) {
NSString *str = [NSString stringWithFormat:@"%@", value];
NSString *dateFormat = [NSDate parseDateFormatFromString:str];
if (dateFormat == nil) {
dateFormat = kNSDateHelperFormatSQLDateWithTime;
}
val = [[NSDate dateFromString:str withFormat:dateFormat] toLocalTime];
}
else {
val = [value toLocalTime];
} }
}, },
@"NSArray" : ^{ @"NSArray" : ^{

2
PNObject/Classes/PNObjectConfig.h
View File

@ -145,7 +145,7 @@ typedef NS_ENUM(NSInteger, OAuthMode) {
- (void) setClientID:(NSString * _Nonnull) clientID clientSecret:(NSString* _Nonnull) clientSecret forEnv:(NSString * _Nonnull) environment; - (void) setClientID:(NSString * _Nonnull) clientID clientSecret:(NSString* _Nonnull) clientSecret forEnv:(NSString * _Nonnull) environment;
- (void) setOauthUserName:(NSString * _Nonnull)oauthUserName oauthPassword:(NSString* _Nonnull) oauthPassword forEnv:(NSString *) environment; - (void) setOauthUserName:(NSString * _Nonnull)oauthUserName oauthPassword:(NSString* _Nonnull) oauthPassword forEnv:(NSString * _Nonnull) environment;
/** /**
* <#Description#> * <#Description#>

4
PNObject/Classes/PNObjectModel.m
View File

@ -146,8 +146,6 @@ static bool isFirstAccess = YES;
if ([_fileManager checkPath:className]) { if ([_fileManager checkPath:className]) {
NSError *error = nil;
NSData *data = [[_fileManager fetchFileDataWithPath:className] aes_decrypt:[DDDKeychainWrapper dataForKey: PNObjectEncryptionKey]]; NSData *data = [[_fileManager fetchFileDataWithPath:className] aes_decrypt:[DDDKeychainWrapper dataForKey: PNObjectEncryptionKey]];
return [NSKeyedUnarchiver unarchiveObjectWithData:data]; return [NSKeyedUnarchiver unarchiveObjectWithData:data];
@ -162,8 +160,6 @@ static bool isFirstAccess = YES;
BOOL isPNObjectSubclass = [[object class] isSubclassOfClass:[PNObject class]]; BOOL isPNObjectSubclass = [[object class] isSubclassOfClass:[PNObject class]];
NSError *error = nil;
if(isPNObjectSubclass) { if(isPNObjectSubclass) {
if ([[object class] conformsToProtocol:@protocol(PNObjectSubclassing)]) { if ([[object class] conformsToProtocol:@protocol(PNObjectSubclassing)]) {