Skip to content

Commit c9f361f

Browse files
author
Richard Piazza
committed
Fixed bundle on singularization
1 parent da82149 commit c9f361f

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

CodeQuickKit-ObjC/CQKSerializableNSManagedObject.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ - (NSObject *)serializedObjectForPropertyName:(NSString *)propertyName withData:
340340

341341
- (Class)objectClassOfCollectionTypeForPropertyName:(NSString *)propertyName
342342
{
343-
return [NSObject singularizedClassForPropertyName:propertyName];
343+
return [NSObject singularizedClassForPropertyName:propertyName inBundle:[NSBundle bundleForClass:self.class]];
344344
}
345345

346346
#pragma mark -

CodeQuickKit-ObjC/CQKSerializableNSObject.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ - (NSObject *)serializedObjectForPropertyName:(NSString *)propertyName withData:
355355

356356
- (Class)objectClassOfCollectionTypeForPropertyName:(NSString *)propertyName
357357
{
358-
return [NSObject singularizedClassForPropertyName:propertyName];
358+
return [NSObject singularizedClassForPropertyName:propertyName inBundle:[NSBundle bundleForClass:self.class]];
359359
}
360360

361361
#pragma mark -

CodeQuickKit-ObjC/NSObject+CQKRuntime.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353

5454
/// Returns the class associated with the property name.
5555
/// Will attempt to append bundle name.
56-
+ (nonnull Class)singularizedClassForPropertyName:(nullable NSString *)propertyName;
56+
+ (nonnull Class)singularizedClassForPropertyName:(nullable NSString *)propertyName inBundle:(nullable NSBundle *)bundle;
5757

5858
@end

CodeQuickKit-ObjC/NSObject+CQKRuntime.m

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ - (BOOL)respondsToSetterForPropertyName:(NSString *)propertyName
137137
return [self respondsToSelector:NSSelectorFromString(setter)];
138138
}
139139

140-
+ (Class)singularizedClassForPropertyName:(NSString *)propertyName
140+
+ (Class)singularizedClassForPropertyName:(NSString *)propertyName inBundle:(nullable NSBundle *)bundle
141141
{
142142
if (propertyName == nil) {
143143
return [NSNull class];
@@ -160,7 +160,10 @@ + (Class)singularizedClassForPropertyName:(NSString *)propertyName
160160
return entityClass;
161161
}
162162

163-
NSBundle *bundle = [NSBundle bundleForClass:self.class];
163+
if (bundle == nil) {
164+
return [NSNull class];
165+
}
166+
164167
if (bundle.bundleDisplayName != nil) {
165168
NSString *underscored = [bundle.bundleDisplayName stringByReplacingOccurrencesOfString:@" " withString:@"_"];
166169
NSString *moduleName = [NSString stringWithFormat:@"%@.%@", underscored, singular];

CodeQuickKit.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = "CodeQuickKit"
11-
s.version = "1.1.1"
11+
s.version = "1.1.3"
1212
s.summary = "An iOS Library simplifying some everyday tasks."
1313
s.description = <<-DESC
1414
CodeQuickKit is a collection of Objective-C Categories and helper classes designed to

0 commit comments

Comments
 (0)