- Fix AccessToken Save, SharedInstance

- Fix crash in removeObserver PNObject

Example/PNObject/PNObjectAppDelegate.m

@@ -51,22 +51,28 @@
 	 
 	 [user getJSONObject];*/
 	
+	PNAccessToken *accessToken = [PNAccessToken currentAccessToken];
 	
+	NSLog(@"%@",[accessToken JSONObject]);
 	
-	[[[PNObjectConfig sharedInstance] manager] GET:[[[PNObjectConfig sharedInstance] PNObjEndpoint] stringByAppendingString:[PNAccessToken PNObjClassName]] parameters:nil progress:^(NSProgress * _Nonnull downloadProgress) {
+	/*[[[PNObjectConfig sharedInstance] manager] GET:[[[PNObjectConfig sharedInstance] PNObjEndpoint] stringByAppendingString:[PNAccessToken PNObjClassName]] parameters:nil progress:^(NSProgress * _Nonnull downloadProgress) {
 		
 	 } success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
 		
 		PNAccessToken *accessToken = [[PNAccessToken alloc] initWithJSON:responseObject];
 		
-		NSLog(@"%@",[accessToken getJSONObject]);
+		NSLog(@"%@",[accessToken JSONObject]);
+		
+		dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
 	 [accessToken saveLocally];
+		});
+		//[accessToken saveLocally];
 		
 	 } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
 		
 		NSLog(@"%@",error);
 		
-	}];
+	 }];*/
 	//NSLog(@"%@",userDictionary);
 	
 	/*

Pod/Classes/PNClasses/PNAccessToken.h

@@ -20,9 +20,16 @@ typedef NS_ENUM(NSInteger, TokenType) {
  *
  *  @return singleton
  */
-+ (instancetype _Nonnull) currentUser;
++ (instancetype _Nonnull) currentAccessToken;
 
 
+/**
+ *  gets singleton object of current user session.
+ *
+ *  @return singleton
+ */
++ (instancetype _Nonnull) currentAccessTokenWithJSON:(NSDictionary *)JSON;
+
 ///--------------------------------------
 #pragma mark - PNAccessToken Properties
 ///--------------------------------------

Pod/Classes/PNClasses/PNAccessToken.m

@@ -15,6 +15,81 @@
 
 @implementation PNAccessToken
 
+static PNAccessToken *SINGLETON = nil;
+
+static bool isFirstAccess = YES;
+
+#pragma mark - Public Method
+
++ (instancetype) currentAccessToken {
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		isFirstAccess = NO;
+		
+		SINGLETON = [[super allocWithZone:NULL] initForCurrentAccessTokenWithJSON:nil];
+	});
+	
+	return SINGLETON;
+}
+
++ (instancetype _Nonnull) currentAccessTokenWithJSON:(NSDictionary *)JSON {
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		isFirstAccess = NO;
+		
+		SINGLETON = [[super allocWithZone:NULL] initForCurrentAccessTokenWithJSON:JSON];
+	});
+	
+	return SINGLETON;
+}
+
+
+- (instancetype) initForCurrentAccessTokenWithJSON:(NSDictionary *)JSON {
+	if(SINGLETON){
+		return SINGLETON;
+	}
+	if (isFirstAccess) {
+		[self doesNotRecognizeSelector:_cmd];
+	}
+	NSDictionary *savedAccessToken;
+	
+	if (JSON) {
+		savedAccessToken =  JSON;
+	}
+	else {
+		savedAccessToken = [[PNObjectModel sharedInstance] fetchObjectsWithClass:[self class]];
+	}
+	
+	if (savedAccessToken) {
+		self = [super initWithJSON:savedAccessToken];
+	}
+	else {
+		self = [super init];
+	}
+	
+	if (self) {
+		if (_tokenTypeString) {
+			((void (^)())@{
+						   @"beaer" : ^{
+				_tokenType = TokenTypeBearer;
+			},
+						   @"basic" : ^{
+				_tokenType = TokenTypeBasic;
+			}
+						   }[_tokenTypeString] ?: ^{
+							   
+						   })();
+		}
+		
+		if (_expiresIn) {
+			_expirationDate = [[NSDate date] dateByAddingHours:[_expiresIn integerValue]];
+		}
+	}
+	
+	return self;
+}
+
+
 #pragma mark PNObjectSubclassing Protocol
 
 + (NSDictionary *)objcetMapping {
@@ -30,23 +105,7 @@
 }
 
 - (instancetype) initWithJSON:(NSDictionary *)JSON {
-	self = [super initWithJSON:JSON];
+	return [[self class] currentAccessTokenWithJSON:JSON];
-	
-	if (self) {
-		((void (^)())@{
-					   @"beaer" : ^{
-			_tokenType = TokenTypeBearer;
-		},
-					   @"basic" : ^{
-			_tokenType = TokenTypeBasic;
-		}
-					   }[_tokenTypeString] ?: ^{
-						   
-					   })();
-		
-		_expirationDate = [[NSDate date] dateByAddingHours:[_expiresIn integerValue]];
-	}
-	return self;
 }
 
 + (NSString *)objectClassName {

Pod/Classes/PNObject+PNObjectConnection.m

@@ -46,7 +46,7 @@
 								   failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure {
 	
 	return [[[PNObjectConfig sharedInstance] manager] POST:[[[PNObjectConfig sharedInstance] PNObjEndpoint] stringByAppendingFormat:@"%@",[[self class] objectClassName]]
-                                                parameters:[self getJSONObject] constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
+												parameters:[self JSONObject] constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
 													
 												} progress:^(NSProgress * _Nonnull _uploadProgress) {
 													if (uploadProgress) {
@@ -67,7 +67,7 @@
 								 failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure {
 	
 	return [[[PNObjectConfig sharedInstance] manager] PUT:[[[PNObjectConfig sharedInstance] PNObjEndpoint] stringByAppendingFormat:@"%@",[[self class] objectClassName]]
-                                               parameters:[self getJSONObject]
+											   parameters:[self JSONObject]
 												  success:^(NSURLSessionDataTask * _Nonnull _task, id  _Nullable _responseObject) {
 													  if (success) {
 														  success(_task,_responseObject);
@@ -82,7 +82,7 @@
 - (NSURLSessionDataTask *)DELETEWithSuccess:(void (^)(NSURLSessionDataTask *task, id responseObject))success
 									failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure {
 	return [[[PNObjectConfig sharedInstance] manager] DELETE:[[[PNObjectConfig sharedInstance] PNObjEndpoint] stringByAppendingFormat:@"%@",[[self class] objectClassName]]
-                                                  parameters:[self getJSONObject]
+												  parameters:[self JSONObject]
 													 success:^(NSURLSessionDataTask * _Nonnull _task, id  _Nullable _responseObject) {
 														 if (success) {
 															 success(_task,_responseObject);

Pod/Classes/PNObject+Protected.m

@@ -42,7 +42,7 @@
 		NSString *mappedJSONType;
 		
 		NSString *propertyType = [properties valueForKey:propertyName];
-		NSLogDebug(@"%@",self.objectMapping);
+		NSLogDebug(@"%@",self.JSONObject);
 		
 		NSLogDebug(@"%@",[[self class] objcetMapping]);
 		
@@ -156,7 +156,7 @@
 		
 		NSString *propertyType = [properties valueForKey:propertyName];
 		
-		id mappingValue = [self.objectMapping valueForKey:propertyName];
+		id mappingValue = [self.JSONObject valueForKey:propertyName];
 		
 		if([mappingValue isKindOfClass:NSDictionary.class]) {
 			mappedJSONKey = [mappingValue valueForKey:@"key"];

Pod/Classes/PNObject.h

@@ -50,7 +50,7 @@
 /**
  *  <#Description#>
  */
-@property (nonatomic, strong, getter=getJSONObject, nonnull) NSDictionary * objectMapping;
+@property (nonatomic, strong, nonnull) NSDictionary * JSONObject;
 
 
 @end

Pod/Classes/PNObject.m

@@ -75,9 +75,9 @@
 			NSMutableDictionary * objectDict = [[NSMutableDictionary alloc] initWithDictionary:[[self class] objcetMapping]];
 			[objectDict addEntriesFromDictionary:[PNObject objcetMapping]];
 			
-			_objectMapping = objectDict;
+			_JSONObject = objectDict;
 			
-			NSAssert(_objectMapping, @"You must create objectMapping");
+			NSAssert(_JSONObject, @"You must create objectMapping");
 			
 			_singleInstance = [[self class] singleInstance];
 			
@@ -102,9 +102,9 @@
 			NSMutableDictionary * objectDict = [[NSMutableDictionary alloc] initWithDictionary:[[self class] objcetMapping]];
 			[objectDict addEntriesFromDictionary:[PNObject objcetMapping]];
 			
-			_objectMapping = objectDict;
+			_JSONObject = objectDict;
 			
-			NSAssert(_objectMapping, @"You must create objectMapping");
+			NSAssert(_JSONObject, @"You must create objectMapping");
 			
 			_singleInstance = [[self class] singleInstance];
 			
@@ -112,7 +112,7 @@
 			
 		}
 		
-		NSAssert(_objectMapping, @"You must create objectMapping");
+		NSAssert(_JSONObject, @"You must create objectMapping");
 		_JSON = [[NSMutableDictionary alloc] initWithDictionary:JSON];
 		
 		[self populateObjectFromJSON:_JSON];
@@ -129,8 +129,8 @@
 	
 	NSDictionary *properties = [PNObject propertiesForClass:self.class];
 	
-	for (NSString* propertyName in _objectMapping) {
+	for (NSString* propertyName in _JSONObject) {
-		id mappingValue = [_objectMapping objectForKey:propertyName];
+		id mappingValue = [_JSONObject objectForKey:propertyName];
 		
 		if([mappingValue isKindOfClass:NSDictionary.class]) {
 			mappedJSONKey = [mappingValue valueForKey:@"key"];
@@ -205,7 +205,7 @@
 					   @"NSArray" : ^{
 			NSMutableArray *arr = [NSMutableArray array];
 			for(id PNObject in value) {
-				SEL selector = NSSelectorFromString(@"getJSONObject");
+				SEL selector = NSSelectorFromString(@"JSONObject");
 				NSInvocation *invocation = [NSInvocation invocationWithMethodSignature: [[PNObject class] instanceMethodSignatureForSelector:selector]];
 				[invocation setSelector:selector];
 				[invocation setTarget:PNObject];
@@ -224,7 +224,7 @@
 				PNObject *val = [[NSClassFromString(mappedJSONType) alloc] initWithJSON:JSONObject];
 				[arr addObject:val];
 				
-				SEL selector = NSSelectorFromString(@"getJSONObject");
+				SEL selector = NSSelectorFromString(@"JSONObject");
 				NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[PNObject class] instanceMethodSignatureForSelector:selector]];
 				[invocation setSelector:selector];
 				[invocation setTarget:value];
@@ -238,7 +238,7 @@
 					   }[propertyType] ?: ^{
 						   BOOL isPNObjectSubclass = [NSClassFromString(propertyType) isSubclassOfClass:[PNObject class]];
 						   if(isPNObjectSubclass) {
-							   SEL selector = NSSelectorFromString(@"getJSONObject");
+							   SEL selector = NSSelectorFromString(@"JSONObject");
 							   NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[PNObject class] instanceMethodSignatureForSelector:selector]];
 							   [invocation setSelector:selector];
 							   [invocation setTarget:value];
@@ -260,7 +260,7 @@
 }
 
 
-- (NSDictionary* _Nonnull) getJSONObject {
+- (NSDictionary* _Nonnull) JSONObject {
 	if (!_JSON) {
 		return [self reverseMapping];
 	}
@@ -321,7 +321,6 @@
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
-	NSLogDebug(@"%@",[[[self class] objcetMapping] objectForKey:keyPath]);
 	[_JSON setObject:[change objectForKey:@"new"] forKey:[[[self class] objcetMapping] objectForKey:keyPath]];
 }
 
@@ -333,10 +332,19 @@
 		if ([propertyName isEqualToString:@"description"] || [propertyName isEqualToString:@"debugDescription"])  {
 			continue;
 		}
+		
+		@try {
 			[self removeObserver:self forKeyPath:propertyName];
 		}
+		@catch (NSException *exception) {
+			
+		}
+		@finally {
+			
+		}
+	}
 	_JSON = nil;
-	_objectMapping = nil;
+	_JSONObject = nil;
 	_objID = nil;
 	_createdAt = nil;
 	

Pod/Classes/PNObjectModel.m

@@ -161,7 +161,7 @@ static bool isFirstAccess = YES;
 			
 			if ([(PNObject*) object singleInstance]) {
 				
-				SEL selector = NSSelectorFromString(@"getJSONObject");
+				SEL selector = NSSelectorFromString(@"JSONObject");
 				NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[PNObject class] instanceMethodSignatureForSelector:selector]];
 				[invocation setSelector:selector];
 				[invocation setTarget:object];
@@ -197,7 +197,7 @@ static bool isFirstAccess = YES;
 					NSMutableArray *objects = [[NSMutableArray alloc] initWithArray:[NSKeyedUnarchiver unarchiveObjectWithData:data]];
 					
 					
-					SEL selector = NSSelectorFromString(@"getJSONObject");
+					SEL selector = NSSelectorFromString(@"JSONObject");
 					NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[PNObject class] instanceMethodSignatureForSelector:selector]];
 					[invocation setSelector:selector];
 					[invocation setTarget:object];
@@ -225,7 +225,7 @@ static bool isFirstAccess = YES;
 					NSMutableArray *objects = [[NSMutableArray alloc] init];
 					
 					
-					SEL selector = NSSelectorFromString(@"getJSONObject");
+					SEL selector = NSSelectorFromString(@"JSONObject");
 					NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[PNObject class] instanceMethodSignatureForSelector:selector]];
 					[invocation setSelector:selector];
 					[invocation setTarget:object];