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

- Fix Recursive properties from PNObject Subclasses

Browse Source
This commit is contained in:
Giuseppe Nucifora 2016-02-08 11:34:46 +01:00
parent c2f6bdae94
commit 183da3fb32
10 changed files with 131 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Example/PNObject.xcodeproj/project.pbxproj
View File

@ -20,6 +20,7 @@
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
686ABCCF1C68A439000B3F7A /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = 686ABCCE1C68A439000B3F7A /* User.m */; };
DA43246C4FB8B8B587FC2343 /* Pods_PNObject_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB6B6AE8DC4C8FBEC56DD55 /* Pods_PNObject_Tests.framework */; };
E1806AD43C05C089D52D136E /* Pods_PNObject_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73089A9DA261B19C7C342EA /* Pods_PNObject_Example.framework */; };
/* End PBXBuildFile section */
@ -57,6 +58,8 @@
6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
686ABCCD1C68A439000B3F7A /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = User.h; sourceTree = "<group>"; };
686ABCCE1C68A439000B3F7A /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = User.m; sourceTree = "<group>"; };
6ADA851464A35438E6A21617 /* Pods-PNObject_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNObject_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PNObject_Example/Pods-PNObject_Example.debug.xcconfig"; sourceTree = "<group>"; };
75FCB4EFD17838CCA4C93E4A /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
8C017F9292D546DE8DBC84F8 /* PNObject.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = PNObject.podspec; path = ../PNObject.podspec; sourceTree = "<group>"; };
@ -130,6 +133,7 @@
6003F593195388D20070C39A /* Example for PNObject */ = {
isa = PBXGroup;
children = (
686ABCCC1C68A439000B3F7A /* User */,
6003F59C195388D20070C39A /* PNObjectAppDelegate.h */,
6003F59D195388D20070C39A /* PNObjectAppDelegate.m */,
6003F5A5195388D20070C39A /* PNObjectViewController.h */,
@ -181,6 +185,16 @@
name = "Podspec Metadata";
sourceTree = "<group>";
};
686ABCCC1C68A439000B3F7A /* User */ = {
isa = PBXGroup;
children = (
686ABCCD1C68A439000B3F7A /* User.h */,
686ABCCE1C68A439000B3F7A /* User.m */,
);
name = User;
path = "../../../../../../Purplenetwork/GIT/iOS/packman-ios/packman/Model/User";
sourceTree = "<group>";
};
700947C2A719D2A125954296 /* Pods */ = {
isa = PBXGroup;
children = (
@ -388,6 +402,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
686ABCCF1C68A439000B3F7A /* User.m in Sources */,
6003F59E195388D20070C39A /* PNObjectAppDelegate.m in Sources */,
6003F5A7195388D20070C39A /* PNObjectViewController.m in Sources */,
6003F59A195388D20070C39A /* main.m in Sources */,

30
Example/PNObject.xcworkspace/xcshareddata/PNObject.xcscmblueprint Normal file
View File

@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "0D16AB9035733B66D1E42542FCF79AEB110EE3F1",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"0D16AB9035733B66D1E42542FCF79AEB110EE3F1" : 0,
"AEB0552E99BCD7202184FC09F243A3865259D36E" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "8D791C14-A3DF-4773-86F0-EB52646714A3",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"0D16AB9035733B66D1E42542FCF79AEB110EE3F1" : "PNObject\/",
"AEB0552E99BCD7202184FC09F243A3865259D36E" : "..\/..\/..\/Purplenetwork\/GIT\/iOS\/packman-ios"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "PNObject",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Example\/PNObject.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git.giuseppenucifora.com:giuseppenucifora\/PNObject.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0D16AB9035733B66D1E42542FCF79AEB110EE3F1"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git.giuseppenucifora.com:purplenetwork\/packman-ios.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "AEB0552E99BCD7202184FC09F243A3865259D36E"
}
]
}

156
Example/PNObject/Images.xcassets/AppIcon.appiconset/Contents.json
View File

@ -1,5 +1,71 @@
{
"images" : [
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-40@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-40@3x.png",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-60@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-60@3x.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-Small.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-Small@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
@ -13,9 +79,15 @@
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-60@2x.png",
"size" : "50x50",
"idiom" : "ipad",
"filename" : "Icon-Small-50.png",
"scale" : "1x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"filename" : "Icon-Small-50@2x.png",
"scale" : "2x"
},
{
@ -42,84 +114,6 @@
"filename" : "Icon-76@2x.png",
"scale" : "2x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"filename" : "Icon-Small-50.png",
"scale" : "1x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"filename" : "Icon-Small-50@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small@2x.png",
"scale" : "2x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-40@3x.png",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-60@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-40@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-Small.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-Small@2x.png",
"scale" : "2x"
},
{
"size" : "120x120",
"idiom" : "car",
"filename" : "Icon-120.png",
"scale" : "1x"
},
{
"size" : "83.5x83.5",
"idiom" : "ipad",

BIN
Example/PNObject/Images.xcassets/AppIcon.appiconset/Icon-120.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 523 B

6
Example/PNObject/PNObjectAppDelegate.m
View File

@ -9,10 +9,8 @@
#import "PNObjectAppDelegate.h"
#import "PNObjectViewController.h"
#import "PNObject.h"
#import "PNUser.h"
#import "User.h"
#import "PNAddress.h"
#import "PNObject+PNObjectConnection.h"
@ -35,7 +33,7 @@
[[PNObjectConfig sharedInstance] setEnvironment:Stage];
#endif
PNUser *user = [PNUser currentUser];
User *user = [User currentUser];
[user setFirstName:@"Giuseppe"];
[user setLastName:@"Nuficora"];
[user setEmail:@"giuseppe.nucifora@purplenetwork.it"];

4
Example/PNObject/PNObjectViewController.m
View File

@ -9,7 +9,7 @@
#import "PNObjectViewController.h"
#import <PureLayout/PureLayout.h>
#import "PNObject.h"
#import "PNUser.h"
#import "User.h"
#import "PNAddress.h"
#import "PNObject+PNObjectConnection.h"
@ -101,7 +101,7 @@
- (void) apiCallAction {
[[PNUser currentUser] registerCurrentUserWithBlockSuccess:^(id _Nullable responseObject) {
[[User currentUser] registerCurrentUserWithBlockSuccess:^(id _Nullable responseObject) {
} failure:^(NSError * _Nonnull error) {

2
PNObject.podspec
View File

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

2
Pod/Classes/PNClasses/PNUser.h
View File

@ -43,7 +43,7 @@
* @param success <#success description#>
* @param failure <#failure description#>
*/
- (void) registerCurrentUserWithBlockSuccess:(nullable void (^)(id _Nullable responseObject))success
- (void) registerCurrentUserWithBlockSuccess:(nullable void (^)(PNUser * _Nullable responseObject))success
failure:(nullable void (^)(NSError * _Nonnull error))failure;
/**

5
Pod/Classes/PNClasses/PNUser.m
View File

@ -125,13 +125,14 @@ static bool isFirstAccess = YES;
return NO;
}
- (void) registerCurrentUserWithBlockSuccess:(nullable void (^)(id _Nullable responseObject))success
- (void) registerCurrentUserWithBlockSuccess:(nullable void (^)(PNUser * _Nullable responseObject))success
failure:(nullable void (^)(NSError * _Nonnull error))failure {
[self POSTWithEndpointAction:@"registration/register" Progress:nil success:^(NSURLSessionDataTask * _Nullable task, PNObject * _Nullable responseObject) {
NSLog(@"response %@",responseObject);
if(success){
success(responseObject);
success((PNUser*)responseObject);
[self saveLocally];
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
if (failure) {

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

@ -258,7 +258,8 @@ static BOOL property_getTypeString( objc_property_t property, char *buffer )
NSMutableDictionary *results = [NSMutableDictionary dictionary];
if ([PNObjClass isSubclassOfClass:[PNObject class]] && PNObjClass != [PNObject class]) {
[results addEntriesFromDictionary:[self propertiesForClass:[PNObject class]]];
[results addEntriesFromDictionary:[self propertiesForClass:class_getSuperclass(PNObjClass)]];
}
unsigned int outCount, i;