- Fix class naming in default classes

- Add User in PNInstallation
- Varius fix
This commit is contained in:
giuseppenuc committed 2016-04-29 11:26:44 +02:00
1 parent a5550fb7c2
commit 33672c87eb
9 files changed
+23 -13

No files matched your search

+2 -2
View File
@@ -11,11 +11,11 @@
@implementation PNAddress
+ (NSString *) objectClassName {
return @"Address";
return @"PNAddress";
}
+ (NSString *)objectEndPoint {
return @"Address";
return @"PNAddress";
}
+ (NSDictionary *) objcetMapping {
+2 -1
View File
@@ -7,6 +7,7 @@
//
#import "PNObject.h"
#import "PNUser.h"
typedef NS_ENUM(NSInteger, PNInstallationType) {
PNInstallationTypeNew = 0,
@@ -48,7 +49,7 @@ typedef NS_ENUM(NSInteger, PNInstallationType) {
///--------------------------------------
#pragma mark - PNInstallation Properties
///--------------------------------------
@property (nonatomic, strong, nullable) PNUser *user;
/**
* <#Description#>
*/
+5 -1
View File
@@ -8,6 +8,10 @@
#import "PNInstallation.h"
#import "DJLocalization.h"
#import "PNObjectConfig.h"
@interface PNInstallation() <PNObjectSubclassing>
@@ -28,7 +32,7 @@ static bool isFirstAccess = YES;
+ (NSDictionary *)objcetMapping {
NSDictionary *mapping = @{
NSDictionary *mapping = @{@"user":@{@"key":@"user",@"type":[[[PNObjectConfig sharedInstance] userSubClass] PNObjClassName]},
@"deviceType":@"deviceType",
@"deviceModel":@"deviceModel",
@"deviceName":@"deviceName",
+2 -2
View File
@@ -11,11 +11,11 @@
@implementation PNLocation
+ (NSString *) objectClassName {
return @"Location";
return @"PNLocation";
}
+(NSString *)objectEndPoint {
return @"Location";
return @"PNLocation";
}
+ (NSDictionary *) objcetMapping {
+2 -2
View File
@@ -13,11 +13,11 @@
@implementation PNObjcPassword
+ (NSString *) objectClassName {
return @"Password";
return @"PNObjcPassword";
}
+(NSString *)objectEndPoint {
return @"Password";
return @"PNObjcPassword";
}
+ (NSDictionary *) objcetMapping {
+7 -3
View File
@@ -55,12 +55,16 @@ static bool isFirstAccess = YES;
- (instancetype)copy
{
return [[PNUser alloc] init];
Class objectClass = NSClassFromString([[self class] PNObjClassName]);
return [[objectClass alloc] init];
}
- (instancetype)mutableCopy
{
return [[PNUser alloc] init];
Class objectClass = NSClassFromString([[self class] PNObjClassName]);
return [[objectClass alloc] init];
}
- (instancetype) initForCurrentUser
@@ -405,7 +409,7 @@ static bool isFirstAccess = YES;
@"sex":@"sex",
@"birthDate":@"birthDate",
@"phone":@"phone",
@"password":@{@"key":@"password",@"type":@"PNObjcPassword"},
@"password":@{@"key":@"password",@"type":[PNObjcPassword PNObjClassName]},
@"hasAcceptedPrivacy":@"hasAcceptedPrivacy",
@"hasAcceptedNewsletter":@"hasAcceptedNewsletter",
@"hasVerifiedEmail":@"hasVerifiedEmail",
+1
View File
@@ -216,6 +216,7 @@ extern NSString* _Nonnull const Client_Secret;
#pragma mark - PNObjectConfig Properties
///--------------------------------------
@property (nonatomic, readonly, nonnull) Class userSubClass;
/**
* <#Description#>
*/
+1 -1
View File
@@ -58,7 +58,7 @@ NSString* const Client_Secret = @"client_secret";
@property (nonatomic, strong) NSString *currentOAuthClientSecret;
@property (nonatomic, strong) AFOAuth2Manager *authManager;
@property (nonatomic) Class userSubClass;
@end