Merge pull request #15 from uacaps/characterset

Characterset

Author: Matthew York

NSObject-ObjectMap/NSObject+ObjectMap.m

@@ -365,11 +365,36 @@ +(id)objectOfClass:(Class)objectClass fromJSON:(NSDictionary *)dict {
 
 -(NSString *)classOfPropertyNamed:(NSString *)propName {
     objc_property_t theProperty = class_getProperty([self class], [propName UTF8String]);
-    NSString *className = [NSString stringWithFormat:@"%s", getPropertyType(theProperty)];
-    return className;
+    
+    const char *attributes = property_getAttributes(theProperty);
+    char buffer[1 + strlen(attributes)];
+    strcpy(buffer, attributes);
+    char *state = buffer, *attribute;
+    while ((attribute = strsep(&state, ",")) != NULL) {
+        if (attribute[0] == 'T' && attribute[1] != '@') {
+            // it's a C primitive type:
+            /*
+             if you want a list of what will be returned for these primitives, search online for
+             "objective-c" "Property Attribute Description Examples"
+             apple docs list plenty of examples of what you get for int "i", long "l", unsigned "I", struct, etc.*/
+            NSString *typeName = [[NSString alloc] initWithData:[NSData dataWithBytes:(attribute + 1) length:strlen(attribute) - 1] encoding:NSUTF8StringEncoding];
+            return typeName;
+             }
+             else if (attribute[0] == 'T' && attribute[1] == '@' && strlen(attribute) == 2) {
+             // it's an ObjC id type:
+             return @"id";
+             }
+             else if (attribute[0] == 'T' && attribute[1] == '@') {
+             // it's another ObjC object type:
+             NSData *data = [NSData dataWithBytes:(attribute + 3) length:strlen(attribute) - 4];
+             NSString *className = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+             return className;
+             }
+             }
+             return @"";
 }
 
-
+/*
 static const char * getPropertyType(objc_property_t property) {
     const char *attributes = property_getAttributes(property);
     char buffer[1 + strlen(attributes)];
@@ -382,7 +407,7 @@ -(NSString *)classOfPropertyNamed:(NSString *)propName {
              if you want a list of what will be returned for these primitives, search online for
              "objective-c" "Property Attribute Description Examples"
              apple docs list plenty of examples of what you get for int "i", long "l", unsigned "I", struct, etc.
-             */
+ 
             return (const char *)[[NSData dataWithBytes:(attribute + 1) length:strlen(attribute) - 1] bytes];
         }
         else if (attribute[0] == 'T' && attribute[1] == '@' && strlen(attribute) == 2) {
@@ -391,11 +416,13 @@ -(NSString *)classOfPropertyNamed:(NSString *)propName {
         }
         else if (attribute[0] == 'T' && attribute[1] == '@') {
             // it's another ObjC object type:
+            NSData *data = [NSData dataWithBytes:(attribute + 3) length:strlen(attribute) - 4];
+            NSString *asdf = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
             return (const char *)[[NSData dataWithBytes:(attribute + 3) length:strlen(attribute) - 4] bytes];
         }
     }
     return "";
-}
+}*/
 
 +(NSArray *)arrayFromJSON:(NSArray *)jsonArray ofObjects:(NSString *)obj {
     //NSString *filteredObject = [NSString stringWithFormat:@"%@s",obj];

Tests/UnitTests.xcodeproj/project.pbxproj

@@ -252,7 +252,7 @@
 		1FA6C2051834122B008C5B8D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = "Center for Advanced Public Safety";
 				TargetAttributes = {
 					1FA6C22D1834122B008C5B8D = {
@@ -363,7 +363,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -402,7 +401,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -460,7 +458,6 @@
 		1FA6C2431834122B008C5B8D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/UnitTests.app/UnitTests";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -483,7 +480,6 @@
 		1FA6C2441834122B008C5B8D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/UnitTests.app/UnitTests";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",

Tests/UnitTests.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"