Singularization

Better handling of Singularization; Replacing module name spaces with
underscores.

Author: Richard Piazza

CodeQuickKit-ObjC/CQKSerializableNSManagedObject.m

@@ -340,45 +340,7 @@ - (NSObject *)serializedObjectForPropertyName:(NSString *)propertyName withData:
 
 - (Class)objectClassOfCollectionTypeForPropertyName:(NSString *)propertyName
 {
-    if (propertyName == nil || [propertyName isEqualToString:@""]) {
-        return [NSNull class];
-    }
-    
-    Class entityClass = NSClassFromString(propertyName);
-    if (entityClass != nil) {
-        return entityClass;
-    }
-    
-    NSMutableString *singular = [propertyName mutableCopy];
-    if ([singular.lowercaseString hasSuffix:@"s"]) {
-        [singular replaceCharactersInRange:NSMakeRange(singular.length - 1, 1) withString:@""];
-    }
-    
-    [singular replaceCharactersInRange:NSMakeRange(0, 1) withString:[singular substringToIndex:1].uppercaseString];
-    
-    entityClass = NSClassFromString(singular);
-    if (entityClass != nil) {
-        return entityClass;
-    }
-    
-    NSBundle *bundle = [NSBundle bundleForClass:self.class];
-    if (bundle.bundleDisplayName != nil) {
-        NSString *moduleName = [NSString stringWithFormat:@"%@.%@", bundle.bundleDisplayName, singular];
-        entityClass = NSClassFromString(moduleName);
-        if (entityClass != nil) {
-            return entityClass;
-        }
-    }
-    
-    if (bundle.bundleName != nil) {
-        NSString *moduleName = [NSString stringWithFormat:@"%@.%@", bundle.bundleName, singular];
-        entityClass = NSClassFromString(moduleName);
-        if (entityClass != nil) {
-            return entityClass;
-        }
-    }
-    
-    return [NSNull class];
+    return [NSObject singularizedClassForPropertyName:propertyName];
 }
 
 #pragma mark -

CodeQuickKit-ObjC/CQKSerializableNSObject.m

@@ -355,45 +355,7 @@ - (NSObject *)serializedObjectForPropertyName:(NSString *)propertyName withData:
 
 - (Class)objectClassOfCollectionTypeForPropertyName:(NSString *)propertyName
 {
-    if (propertyName == nil || [propertyName isEqualToString:@""]) {
-        return [NSNull class];
-    }
-    
-    Class entityClass = NSClassFromString(propertyName);
-    if (entityClass != nil) {
-        return entityClass;
-    }
-    
-    NSMutableString *singular = [propertyName mutableCopy];
-    if ([singular.lowercaseString hasSuffix:@"s"]) {
-        [singular replaceCharactersInRange:NSMakeRange(singular.length - 1, 1) withString:@""];
-    }
-    
-    [singular replaceCharactersInRange:NSMakeRange(0, 1) withString:[singular substringToIndex:1].uppercaseString];
-    
-    entityClass = NSClassFromString(singular);
-    if (entityClass != nil) {
-        return entityClass;
-    }
-    
-    NSBundle *bundle = [NSBundle bundleForClass:self.class];
-    if (bundle.bundleDisplayName != nil) {
-        NSString *moduleName = [NSString stringWithFormat:@"%@.%@", bundle.bundleDisplayName, singular];
-        entityClass = NSClassFromString(moduleName);
-        if (entityClass != nil) {
-            return entityClass;
-        }
-    }
-    
-    if (bundle.bundleName != nil) {
-        NSString *moduleName = [NSString stringWithFormat:@"%@.%@", bundle.bundleName, singular];
-        entityClass = NSClassFromString(moduleName);
-        if (entityClass != nil) {
-            return entityClass;
-        }
-    }
-    
-    return [NSNull class];
+    return [NSObject singularizedClassForPropertyName:propertyName];
 }
 
 #pragma mark -

CodeQuickKit-ObjC/NSObject+CQKRuntime.h

@@ -41,7 +41,7 @@
  @param     objectClass The Class to inspect for the propertyName.
  @return    Class for a given the given property with name; Defaults to NSNull.
  */
-+ (nonnull Class)classForPropertyName:(nonnull NSString *)propertyName ofClass:(nonnull Class)objectClass;
++ (nonnull Class)classForPropertyName:(nullable NSString *)propertyName ofClass:(nullable Class)objectClass;
 
 /// Returns the last component from NSStringFromClass()
 + (nonnull NSString *)nameForClass:(nonnull Class)objectClass;
@@ -51,4 +51,8 @@
 
 - (BOOL)respondsToSetterForPropertyName:(nullable NSString *)propertyName;
 
+/// Returns the class associated with the property name.
+/// Will attempt to append bundle name.
++ (nonnull Class)singularizedClassForPropertyName:(nullable NSString *)propertyName;
+
 @end

CodeQuickKit-ObjC/NSObject+CQKRuntime.m

@@ -23,6 +23,7 @@
  */
 
 #import "NSObject+CQKRuntime.h"
+#import "NSBundle+CQKBundle.h"
 #import "CQKSerializableNSObject.h"
 #import "CQKLogger.h"
 #import <objc/runtime.h>
@@ -58,8 +59,12 @@ @implementation NSObject (CQKRuntime)
     return properties;
 }
 
-+ (nonnull Class)classForPropertyName:(nonnull NSString *)propertyName ofClass:(nonnull Class)objectClass
++ (Class)classForPropertyName:(NSString *)propertyName ofClass:(Class)objectClass
 {
+    if (propertyName == nil || objectClass == nil) {
+        return [NSNull class];
+    }
+    
     objc_property_t runtimeProperty = class_getProperty(objectClass, propertyName.UTF8String);
     if (runtimeProperty == nil) {
         NSString *message = [NSString stringWithFormat:@"Could not determine property name class: class_getProperty failed for property: %@", propertyName];
@@ -132,4 +137,49 @@ - (BOOL)respondsToSetterForPropertyName:(NSString *)propertyName
     return [self respondsToSelector:NSSelectorFromString(setter)];
 }
 
++ (Class)singularizedClassForPropertyName:(NSString *)propertyName
+{
+    if (propertyName == nil) {
+        return [NSNull class];
+    }
+    
+    Class entityClass = NSClassFromString(propertyName);
+    if (entityClass != nil) {
+        return entityClass;
+    }
+    
+    NSMutableString *singular = [propertyName mutableCopy];
+    if ([singular.lowercaseString hasSuffix:@"s"]) {
+        [singular replaceCharactersInRange:NSMakeRange(singular.length - 1, 1) withString:@""];
+    }
+    
+    [singular replaceCharactersInRange:NSMakeRange(0, 1) withString:[singular substringToIndex:1].uppercaseString];
+    
+    entityClass = NSClassFromString(singular);
+    if (entityClass != nil) {
+        return entityClass;
+    }
+    
+    NSBundle *bundle = [NSBundle bundleForClass:self.class];
+    if (bundle.bundleDisplayName != nil) {
+        NSString *underscored = [bundle.bundleDisplayName stringByReplacingOccurrencesOfString:@" " withString:@"_"];
+        NSString *moduleName = [NSString stringWithFormat:@"%@.%@", underscored, singular];
+        entityClass = NSClassFromString(moduleName);
+        if (entityClass != nil) {
+            return entityClass;
+        }
+    }
+    
+    if (bundle.bundleName != nil) {
+        NSString *underscored = [bundle.bundleName stringByReplacingOccurrencesOfString:@" " withString:@"_"];
+        NSString *moduleName = [NSString stringWithFormat:@"%@.%@", underscored, singular];
+        entityClass = NSClassFromString(moduleName);
+        if (entityClass != nil) {
+            return entityClass;
+        }
+    }
+    
+    return [NSNull class];
+}
+
 @end