Merge pull request #311 from kilink/master

make mergeValuesForKeysFromModel: work with sub classes

Mantle/MTLModel.m

@@ -184,7 +184,10 @@ - (void)mergeValueForKey:(NSString *)key fromModel:(MTLModel *)model {
 }
 
 - (void)mergeValuesForKeysFromModel:(MTLModel *)model {
+	NSSet *propertyKeys = model.class.propertyKeys;
 	for (NSString *key in self.class.propertyKeys) {
+		if (![propertyKeys containsObject:key]) continue;
+
 		[self mergeValueForKey:key fromModel:model];
 	}
 }

MantleTests/MTLModelSpec.m

@@ -124,4 +124,43 @@
 	expect(target.count).to.equal(8);
 });
 
+describe(@"merging with model subclasses", ^{
+	__block MTLTestModel *superclass;
+	__block MTLSubclassTestModel *subclass;
+
+	beforeEach(^{
+		superclass = [MTLTestModel modelWithDictionary:@{
+			@"name": @"foo",
+			@"count": @5
+		} error:NULL];
+
+		expect(superclass).notTo.beNil();
+
+		subclass = [MTLSubclassTestModel modelWithDictionary:@{
+			@"name": @"bar",
+			@"count": @3,
+			@"generation": @1,
+			@"role": @"subclass"
+		} error:NULL];
+
+		expect(subclass).notTo.beNil();
+	});
+
+	it(@"should merge from subclass model", ^{
+		[superclass mergeValuesForKeysFromModel:subclass];
+
+		expect(superclass.name).to.equal(@"bar");
+		expect(superclass.count).to.equal(8);
+	});
+
+	it(@"should merge from superclass model", ^{
+		[subclass mergeValuesForKeysFromModel:superclass];
+
+		expect(subclass.name).to.equal(@"foo");
+		expect(subclass.count).to.equal(8);
+		expect(subclass.generation).to.equal(1);
+		expect(subclass.role).to.equal(@"subclass");
+	});
+});
+
 SpecEnd

MantleTests/MTLTestModel.h

@@ -41,6 +41,14 @@ extern const NSInteger MTLTestModelNameMissing;
 
 @end
 
+@interface MTLSubclassTestModel : MTLTestModel
+
+// Properties to test merging between subclass and superclass
+@property (nonatomic, copy) NSString *role;
+@property (nonatomic, copy) NSNumber *generation;
+
+@end
+
 @interface MTLArrayTestModel : MTLModel <MTLJSONSerializing>
 
 // This property is associated with a "users.username" key in JSON.

MantleTests/MTLTestModel.m

@@ -120,6 +120,9 @@ - (void)mergeCountFromModel:(MTLTestModel *)model {
 
 @end
 
+@implementation MTLSubclassTestModel
+@end
+
 @implementation MTLArrayTestModel
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey {