Fix #167 by recognising struct properties as native properties.

lucasmedeirosleite · Jul 18, 2018 · 164169b · 164169b
1 parent 15a39f3
commit 164169b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/Sources/EasyMapping/EKPropertyHelper.h b/Sources/EasyMapping/EKPropertyHelper.h
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface EKPropertyHelper : NSObject
 
-+ (BOOL)propertyNameIsScalar:(NSString *)propertyName fromObject:(id)object;
++ (BOOL)propertyNameIsNativeProperty:(NSString *)propertyName fromObject:(id)object;
 
 + (nullable id)propertyRepresentation:(NSArray *)array forObject:(id)object withPropertyName:(NSString *)propertyName;
 

diff --git a/Sources/EasyMapping/EKPropertyHelper.m b/Sources/EasyMapping/EKPropertyHelper.m
@@ -39,12 +39,14 @@ @implementation EKPropertyHelper
 
 #pragma mark - Property introspection
 
-+ (BOOL)propertyNameIsScalar:(NSString *)propertyName fromObject:(id)object
++ (BOOL)propertyNameIsNativeProperty:(NSString *)propertyName fromObject:(id)object
 {
     objc_property_t property = class_getProperty(object_getClass(object), [propertyName UTF8String]);
 	NSString *type = property ? [self propertyTypeStringRepresentationFromProperty:property] : nil;
 
-	return (type.length == 1) && memchr(scalarTypes, type.UTF8String[0], sizeof(scalarTypes));
+    BOOL isScalar = (type.length == 1) && memchr(scalarTypes, type.UTF8String[0], sizeof(scalarTypes));
+    BOOL isStruct = (type.length > 2) && [type characterAtIndex:0] == '{' && [type characterAtIndex:type.length - 1] == '}';
+	return isScalar || isStruct;
 }
 
 + (NSString *) propertyTypeStringRepresentationFromProperty:(objc_property_t)property
@@ -110,7 +112,7 @@ + (void)setProperty:(EKPropertyMapping *)propertyMapping onObject:(id)object
     } else {
         if (!value && ignoreMissingFields) return;
 
-        if (![self propertyNameIsScalar:propertyMapping.property fromObject:object]) {
+        if (![self propertyNameIsNativeProperty:propertyMapping.property fromObject:object]) {
             [self setValue:nil onObject:object forKeyPath:propertyMapping.property];
         }
     }
@@ -136,7 +138,7 @@ + (void) setProperty:(EKPropertyMapping *)propertyMapping
     } else {
         if (!value && ignoreMissingFields) return;
 
-        if (![self propertyNameIsScalar:propertyMapping.property fromObject:object]) {
+        if (![self propertyNameIsNativeProperty:propertyMapping.property fromObject:object]) {
             [self setValue:nil onObject:object forKeyPath:propertyMapping.property];
         }
     }

diff --git a/TestFixtures/TestModels/Models/NSObject/Native.h b/TestFixtures/TestModels/Models/NSObject/Native.h
@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
+#import <CoreLocation/CoreLocation.h>
 #import "BaseTestModel.h"
 
 @interface Native : BaseTestModel
@@ -29,6 +30,7 @@
 @property (nonatomic, readwrite) double doubleProperty;
 @property (nonatomic, readwrite) BOOL boolProperty;
 @property (nonatomic, readwrite) bool smallBoolProperty;
+@property (nonatomic, readwrite) CLLocationCoordinate2D locationCoordinateProperty;
 
 @end
 

diff --git a/TestFixtures/TestModels/Models/NSObject/Native.m b/TestFixtures/TestModels/Models/NSObject/Native.m
@@ -16,7 +16,8 @@ +(EKObjectMapping *)objectMapping
         [mapping mapPropertiesFromArray:@[
                                       @"charProperty", @"unsignedCharProperty", @"shortProperty", @"unsignedShortProperty", @"intProperty", @"unsignedIntProperty",
                                       @"integerProperty", @"unsignedIntegerProperty", @"longProperty", @"unsignedLongProperty", @"longLongProperty",
-                                      @"unsignedLongLongProperty", @"floatProperty", @"cgFloatProperty", @"doubleProperty", @"boolProperty", @"smallBoolProperty"
+                                      @"unsignedLongLongProperty", @"floatProperty", @"cgFloatProperty", @"doubleProperty", @"boolProperty", @"smallBoolProperty",
+                                      @"locationCoordinateProperty"
                                       ]];
     }];
 }

diff --git a/Tests/EasyMappingTests/EKPropertyHelperTestCase.swift b/Tests/EasyMappingTests/EKPropertyHelperTestCase.swift
@@ -38,15 +38,15 @@ class EKPropertyHelperTestCase: XCTestCase {
         let mapping = Native.objectMapping()
         let properties = mapping.propertyMappings as? [String:EKPropertyMapping] ?? [:]
         for property in properties.values {
-            XCTAssert(EKPropertyHelper.propertyNameIsScalar(property.property, from: sut))
+            XCTAssert(EKPropertyHelper.propertyNameIsNativeProperty(property.property, from: sut))
         }
 
-        XCTAssert(EKPropertyHelper.propertyNameIsScalar("boolProperty", from: sut))
+        XCTAssert(EKPropertyHelper.propertyNameIsNativeProperty("boolProperty", from: sut))
     }
 
     func testIdIdentification() {
         let object = MutableFoundationClass()
-        XCTAssertFalse(EKPropertyHelper.propertyNameIsScalar("idObject", from: object))
+        XCTAssertFalse(EKPropertyHelper.propertyNameIsNativeProperty("idObject", from: object))
 
         let id = EKPropertyHelper.propertyRepresentation([1,2,3], for: object, withPropertyName: "idObject")