Merge pull request Mantle#568 from jmah/jmah/protocol-storage

Check superclass for property persistence

Mantle/MTLModel.m

@@ -231,12 +231,18 @@ + (MTLPropertyStorage)storageBehaviorForPropertyWithKey:(NSString *)propertyKey
 		free(attributes);
 	};
 
-	Method getterMethod = class_getInstanceMethod(self.class, attributes->getter);
-	Method setterMethod = class_getInstanceMethod(self.class, attributes->setter);
-	if (!attributes->dynamic && attributes->ivar == NULL && getterMethod == NULL && setterMethod == NULL) {
+	BOOL hasGetter = [self instancesRespondToSelector:attributes->getter];
+	BOOL hasSetter = [self instancesRespondToSelector:attributes->setter];
+	if (!attributes->dynamic && attributes->ivar == NULL && !hasGetter && !hasSetter) {
 		return MTLPropertyStorageNone;
 	} else if (attributes->readonly && attributes->ivar == NULL) {
-		return MTLPropertyStorageNone;
+		if ([self isEqual:MTLModel.class]) {
+			return MTLPropertyStorageNone;
+		} else {
+			// Check superclass in case the subclass redeclares a property that
+			// falls through
+			return [self.superclass storageBehaviorForPropertyWithKey:propertyKey];
+		}
 	} else {
 		return MTLPropertyStoragePermanent;
 	}

MantleTests/MTLModelSpec.m

@@ -151,6 +151,16 @@
 	expect(@([MTLStorageBehaviorModel storageBehaviorForPropertyWithKey:@"notIvarBacked"])).to(equal(@(MTLPropertyStorageNone)));
 });
 
+it(@"should consider properties declared in subclass with storage in superclass permanent", ^{
+	expect(@([MTLStorageBehaviorModelSubclass storageBehaviorForPropertyWithKey:@"shadowedInSubclass"])).to(equal(@(MTLPropertyStoragePermanent)));
+	expect(@([MTLStorageBehaviorModelSubclass storageBehaviorForPropertyWithKey:@"declaredInProtocol"])).to(equal(@(MTLPropertyStoragePermanent)));
+});
+
+it(@"should ignore optional protocol properties not implemented", ^{
+	expect(@([MTLOptionalPropertyModel storageBehaviorForPropertyWithKey:@"optionalUnimplementedProperty"])).to(equal(@(MTLPropertyStorageNone)));
+	expect(@([MTLOptionalPropertyModel storageBehaviorForPropertyWithKey:@"optionalImplementedProperty"])).to(equal(@(MTLPropertyStoragePermanent)));
+});
+
 describe(@"merging with model subclasses", ^{
 	__block MTLTestModel *superclass;
 	__block MTLSubclassTestModel *subclass;
@@ -190,9 +200,5 @@
 	});
 });
 
-it(@"should ignore optional protocol properties not implemented", ^{
-	expect(@([MTLOptionalPropertyModel storageBehaviorForPropertyWithKey:@"optionalProperty"])).to(equal(@(MTLPropertyStorageNone)));
-});
-
 
 QuickSpecEnd

MantleTests/MTLTestModel.h

@@ -97,6 +97,21 @@ extern const NSInteger MTLTestModelNameMissing;
 @property (readonly, nonatomic, weak) id weakProperty;
 @property (readonly, nonatomic, strong) id strongProperty;
 
+@property (readonly, nonatomic, strong) id shadowedInSubclass;
+@property (readonly, nonatomic, strong) id declaredInProtocol;
+
+@end
+
+@protocol MTLDateProtocol <NSObject>
+
+@property (readonly, nonatomic, strong) id declaredInProtocol;
+
+@end
+
+@interface MTLStorageBehaviorModelSubclass : MTLStorageBehaviorModel <MTLDateProtocol>
+
+@property (readonly, nonatomic, strong) id shadowedInSubclass;
+
 @end
 
 @interface MTLBoolModel : MTLModel <MTLJSONSerializing>
@@ -159,10 +174,13 @@ extern const NSInteger MTLTestModelNameMissing;
 @protocol MTLOptionalPropertyProtocol
 
 @optional
-@property (readwrite, nonatomic, copy) NSString *optionalProperty;
+@property (readwrite, nonatomic, strong) id optionalUnimplementedProperty;
+@property (readwrite, nonatomic, strong) id optionalImplementedProperty;
 
 @end
 
 @interface MTLOptionalPropertyModel : MTLModel <MTLOptionalPropertyProtocol>
 
+@property (readwrite, nonatomic, strong) id optionalImplementedProperty;
+
 @end

MantleTests/MTLTestModel.m

@@ -355,6 +355,12 @@ - (id)notIvarBacked {
 
 @end
 
+@implementation MTLStorageBehaviorModelSubclass
+
+@dynamic shadowedInSubclass;
+
+@end
+
 @implementation MTLMultiKeypathModel
 
 #pragma mark MTLJSONSerializing