added functionality to auto parse SHModelObject variables and NSArrays or SHModelObjects provided mapping

grevolution · grevolution · commit bcc8077bfb2e · 2015-03-14T19:13:09.000+11:00
diff --git a/SHModelObject.xcodeproj/project.pbxproj b/SHModelObject.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		F244007518DACD6B0078B6B0 /* SHModelObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F244006F18DACD6B0078B6B0 /* SHModelObject.m */; };
 		F244007618DACD6B0078B6B0 /* SHAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F244007118DACD6B0078B6B0 /* SHAppDelegate.m */; };
 		F244007718DACD6B0078B6B0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F244007218DACD6B0078B6B0 /* Images.xcassets */; };
-		F244007818DACD6B0078B6B0 /* SHTestModal.m in Sources */ = {isa = PBXBuildFile; fileRef = F244007418DACD6B0078B6B0 /* SHTestModal.m */; };
 		F2B4093118BA16F400611B29 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2B4093018BA16F400611B29 /* Foundation.framework */; };
 		F2B4093318BA16F400611B29 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2B4093218BA16F400611B29 /* CoreGraphics.framework */; };
 		F2B4093518BA16F400611B29 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2B4093418BA16F400611B29 /* UIKit.framework */; };
@@ -21,6 +20,8 @@
 		F2B4094C18BA16F500611B29 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2B4093418BA16F400611B29 /* UIKit.framework */; };
 		F2B4095418BA16F500611B29 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F2B4095218BA16F500611B29 /* InfoPlist.strings */; };
 		F2B4095618BA16F500611B29 /* SHModalObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F2B4095518BA16F500611B29 /* SHModalObjectTests.m */; };
+		F2FA97791AB40312002B972D /* SHAnotherModel.m in Sources */ = {isa = PBXBuildFile; fileRef = F2FA97781AB40312002B972D /* SHAnotherModel.m */; };
+		F2FA977C1AB40377002B972D /* SHTestModal.m in Sources */ = {isa = PBXBuildFile; fileRef = F2FA977B1AB40377002B972D /* SHTestModal.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -40,7 +41,6 @@
 		F244007118DACD6B0078B6B0 /* SHAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHAppDelegate.m; sourceTree = "<group>"; };
 		F244007218DACD6B0078B6B0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		F244007318DACD6B0078B6B0 /* SHAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHAppDelegate.h; sourceTree = "<group>"; };
-		F244007418DACD6B0078B6B0 /* SHTestModal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHTestModal.m; sourceTree = "<group>"; };
 		F2B4092D18BA16F400611B29 /* SHModelObject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SHModelObject.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F2B4093018BA16F400611B29 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		F2B4093218BA16F400611B29 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -54,6 +54,10 @@
 		F2B4095118BA16F500611B29 /* SHModelObjectTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SHModelObjectTests-Info.plist"; sourceTree = "<group>"; };
 		F2B4095318BA16F500611B29 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F2B4095518BA16F500611B29 /* SHModalObjectTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SHModalObjectTests.m; sourceTree = "<group>"; };
+		F2FA97771AB40312002B972D /* SHAnotherModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHAnotherModel.h; sourceTree = "<group>"; };
+		F2FA97781AB40312002B972D /* SHAnotherModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHAnotherModel.m; sourceTree = "<group>"; };
+		F2FA977A1AB40377002B972D /* SHTestModal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHTestModal.h; sourceTree = "<group>"; };
+		F2FA977B1AB40377002B972D /* SHTestModal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHTestModal.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -126,9 +130,12 @@
 				F244006D18DACD6B0078B6B0 /* SHModelObject */,
 				F244007118DACD6B0078B6B0 /* SHAppDelegate.m */,
 				F244007318DACD6B0078B6B0 /* SHAppDelegate.h */,
-				F244007418DACD6B0078B6B0 /* SHTestModal.m */,
 				F244007218DACD6B0078B6B0 /* Images.xcassets */,
 				F2B4093718BA16F400611B29 /* Supporting Files */,
+				F2FA977A1AB40377002B972D /* SHTestModal.h */,
+				F2FA977B1AB40377002B972D /* SHTestModal.m */,
+				F2FA97771AB40312002B972D /* SHAnotherModel.h */,
+				F2FA97781AB40312002B972D /* SHAnotherModel.m */,
 			);
 			path = SHModelObject;
 			sourceTree = "<group>";
@@ -258,10 +265,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F244007818DACD6B0078B6B0 /* SHTestModal.m in Sources */,
+				F2FA97791AB40312002B972D /* SHAnotherModel.m in Sources */,
 				F2B4093D18BA16F400611B29 /* main.m in Sources */,
 				F244007518DACD6B0078B6B0 /* SHModelObject.m in Sources */,
 				F244007618DACD6B0078B6B0 /* SHAppDelegate.m in Sources */,
+				F2FA977C1AB40377002B972D /* SHTestModal.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/SHModelObject.xcodeproj/project.xcworkspace/xcshareddata/SHModelObject.xccheckout b/SHModelObject.xcodeproj/project.xcworkspace/xcshareddata/SHModelObject.xccheckout
@@ -10,29 +10,29 @@
 	<string>SHModelObject</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>454FEFC7-BFFF-4DA5-B089-6B427C2C7510</key>
-		<string>https://github.com/ndduy/SHModelObject.git</string>
+		<key>B5D04170A948972EE1EFA3B27A34E674C9EF57CA</key>
+		<string>https://github.com/grevolution/SHModelObject.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>SHModelObject.xcodeproj/project.xcworkspace</string>
+	<string>SHModelObject.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>454FEFC7-BFFF-4DA5-B089-6B427C2C7510</key>
+		<key>B5D04170A948972EE1EFA3B27A34E674C9EF57CA</key>
 		<string>../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/ndduy/SHModelObject.git</string>
+	<string>https://github.com/grevolution/SHModelObject.git</string>
 	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
+	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>454FEFC7-BFFF-4DA5-B089-6B427C2C7510</string>
+	<string>B5D04170A948972EE1EFA3B27A34E674C9EF57CA</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>454FEFC7-BFFF-4DA5-B089-6B427C2C7510</string>
+			<string>B5D04170A948972EE1EFA3B27A34E674C9EF57CA</string>
 			<key>IDESourceControlWCCName</key>
 			<string>SHModelObject</string>
 		</dict>
diff --git a/SHModelObject.xcodeproj/project.xcworkspace/xcuserdata/shanulhaq.xcuserdatad/UserInterfaceState.xcuserstate b/SHModelObject.xcodeproj/project.xcworkspace/xcuserdata/shanulhaq.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/SHModelObject.xcodeproj/xcuserdata/shanulhaq.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SHModelObject.xcodeproj/xcuserdata/shanulhaq.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -9,13 +9,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "SHModelObject/SHAppDelegate.m"
-            timestampString = "427600078.010373"
+            filePath = "SHModelObject/SHModelObject/SHModelObject.m"
+            timestampString = "448012336.337347"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "60"
-            endingLineNumber = "60"
-            landmarkName = "-application:didFinishLaunchingWithOptions:"
+            startingLineNumber = "308"
+            endingLineNumber = "308"
+            landmarkName = "-serializeValue:withKey:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -25,13 +25,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "SHModelObject/SHModelObject/SHModelObject.m"
-            timestampString = "427600428.987373"
+            filePath = "SHModelObject/SHAppDelegate.m"
+            timestampString = "448012488.962849"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "188"
-            endingLineNumber = "188"
-            landmarkName = "-serializeValue:withKey:"
+            startingLineNumber = "80"
+            endingLineNumber = "80"
+            landmarkName = "-application:didFinishLaunchingWithOptions:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
diff --git a/SHModelObject/SHAnotherModel.h b/SHModelObject/SHAnotherModel.h
@@ -0,0 +1,17 @@
+//
+//  SHAnotherModel.h
+//  SHModelObject
+//
+//  Created by SHAN UL HAQ on 14/3/15.
+//  Copyright (c) 2015 grevolution. All rights reserved.
+//
+
+#import "SHModelObject.h"
+
+@interface SHAnotherModel : SHModelObject
+
+@property (nonatomic) int modelId;
+@property (nonatomic, strong) NSString *modelName;
+@property (nonatomic, strong) NSString *modelType;
+
+@end
diff --git a/SHModelObject/SHAnotherModel.m b/SHModelObject/SHAnotherModel.m
@@ -0,0 +1,13 @@
+//
+//  SHAnotherModel.m
+//  SHModelObject
+//
+//  Created by SHAN UL HAQ on 14/3/15.
+//  Copyright (c) 2015 grevolution. All rights reserved.
+//
+
+#import "SHAnotherModel.h"
+
+@implementation SHAnotherModel
+
+@end
diff --git a/SHModelObject/SHAppDelegate.m b/SHModelObject/SHAppDelegate.m
@@ -50,9 +50,29 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
                          @"time1" : @"2014-04-11T23:59:00+08:00",
                          @"time2" : @"2014-04-11T23:59:00+08:00",
                          @"time3" : @"2014-04-11T23:59:00+08:00",
+                         @"anotherModel" : @{
+                                 @"modelId" : @1,
+                                 @"modelName" : @"My Model",
+                                 @"modelType" : @"My Model Type"
+                         },
+                         @"arrayOfAnotherModels" : @[
+                                 @{
+                                     @"modelId" : @2,
+                                     @"modelName" : @"My Model 2",
+                                     @"modelType" : @"My Model Type 2"
+                                     },@{
+                                     @"modelId" : @3,
+                                     @"modelName" : @"My Model 3",
+                                     @"modelType" : @"My Model Type 3"
+                                     },@{
+                                     @"modelId" : @4,
+                                     @"modelName" : @"My Model 4",
+                                     @"modelType" : @"My Model Type 4"
+                                     }
+                                 ]
                          };
     
-    NSDictionary *mapping = @{@"time1":@"",@"time2":@"",@"time3":@""};
+    NSDictionary *mapping = @{@"time1":@"",@"time2":@"",@"time3":@"", @"arrayOfAnotherModels" : @"SHAnotherModel"};
     SHTestModal *modal = [[SHTestModal alloc] initWithDictionary:a
                                             dateConversionOption:kDateConverstionFromNSStringToNSDateOption
                                                    inputDateType:kInputDateFormatDotNetWithTimeZone mappings:mapping];
diff --git a/SHModelObject/SHModelObject-Info.plist b/SHModelObject/SHModelObject-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.0.8</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIRequiredDeviceCapabilities</key>
diff --git a/SHModelObject/SHModelObject/SHModelObject.m b/SHModelObject/SHModelObject/SHModelObject.m
@@ -291,19 +291,56 @@ - (void) serializeValue:(id)value withKey:(id)key;
                 NSAssert(false, @"the types do not match : %@ vs %@", ivarType, @"NSNumber");
             }
         } else if([value isKindOfClass:[NSDictionary class]]) {
-            if(![ivarType contains:@"Dictionary"]) {
+            NSString *typeName = [ivarType stringByReplacingOccurrencesOfString:@"@" withString:@""];
+            typeName = [typeName stringByReplacingOccurrencesOfString:@"\"" withString:@""];
+            Class objectClass = NSClassFromString(typeName);
+            BOOL isSHModelObject = [self isSHModelObject:objectClass];
+            if(isSHModelObject){
+                value = [objectClass objectWithDictionary:value];
+            } else if(![ivarType contains:@"Dictionary"]) {
                 NSAssert(false, @"the types do not match : %@ vs %@", ivarType, @"NSDictionary or NSMutableDictionary");
             }
         } else if([value isKindOfClass:[NSArray class]]) {
             if(![ivarType contains:@"Array"]) {
                 NSAssert(false, @"the types do not match : %@ vs %@", ivarType, @"NSArray or NSMutableArray");
             }
+            
+            id availableMappingClass = _dateValueMappings[key];
+            if(availableMappingClass && [availableMappingClass isKindOfClass:[NSString class]]) {
+                //mapping string available.
+                Class objectClass = NSClassFromString(availableMappingClass);
+                BOOL isSHModelObject = [self isSHModelObject:objectClass];
+                if(isSHModelObject){
+                    NSMutableArray *valueArray = [NSMutableArray arrayWithCapacity:[value count]];
+                    for(id item in value){
+                        //item should be a dictionary
+                        if([item isKindOfClass:[NSDictionary class]]) {
+                            id itemObject = [objectClass objectWithDictionary:item];
+                            if(itemObject){
+                                [valueArray addObject:itemObject];
+                            }
+                        } else {
+                            NSLog(@"object %@ is not a NSDictionary object, skipping.", [item description]);
+                        }
+                    }
+                    value = valueArray;
+                }
+            }
         }
         
         [self setValue:value forKey:ivarName];
     }
 }
 
+- (BOOL)isSHModelObject:(Class)class {
+    if(class == nil)
+        return NO;
+    if(class == [SHModelObject class]){
+        return YES;
+    }
+    return [self isSHModelObject:[class superclass]];
+}
+
 #pragma mark - NSObject overriden methods
 
 //
diff --git a/SHModelObject/SHTestModal.h b/SHModelObject/SHTestModal.h
@@ -22,6 +22,8 @@
 
 #import "SHModelObject.h"
 
+@class SHAnotherModel;
+
 @interface SHTestModal : SHModelObject
 
 {
@@ -34,13 +36,15 @@
     
     NSMutableArray *_myArray;
     NSMutableDictionary *_myDictionary;
-    
     NSDate *time1;
 }
 
 @property (nonatomic, strong) NSString *stringValue;
 @property (nonatomic) int anotherIntValue;
 @property (nonatomic) NSInteger anotherIntegerValue;
 @property (nonatomic, strong) NSNumber *anotherNumberValue;
+@property (nonatomic, strong) SHAnotherModel *anotherModel;
+@property (nonatomic, strong) NSArray *arrayOfAnotherModels;
+
 
 @end
