memory leak fix

evermeer · Jun 10, 2018 · 54ce05f · 54ce05f
1 parent ea8ed32
commit 54ce05f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/EVReflection.podspec b/EVReflection.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "EVReflection"
-  s.version      = "5.6.1"
+  s.version      = "5.6.2"
   s.summary      = "Reflection based object mapping. (Dictionary, CKRecord, NSManagedObject, Realm, JSON, XML, Alamofire, Moya, RxSwift, ReactiveSwift)"
 
   s.description  = <<-EOS

diff --git a/EVReflection.xcworkspace/xcuserdata/evermeer.xcuserdatad/UserInterfaceState.xcuserstate b/EVReflection.xcworkspace/xcuserdata/evermeer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Source/EVReflection.swift b/Source/EVReflection.swift
@@ -980,7 +980,10 @@ final public class EVReflection {
             do {
                 if !(value is NSNull) {
                     var setValue: AnyObject? = value as AnyObject?
-                    try anyObject.validateValue(&setValue, forKey: key)
+                    let validateFunction = "validate" + key.prefix(1).uppercased() + key.dropFirst() + ":error:"
+                    if (anyObject as AnyObject).responds(to: Selector(validateFunction)) {
+                        try anyObject.validateValue(&setValue, forKey: key)
+                    }
                     anyObject.setValue(setValue, forKey: key)
                 }
             } catch _ {

diff --git a/UnitTests/EVReflectionTests/EVReflectionIssue84.swift b/UnitTests/EVReflectionTests/EVReflectionIssue84.swift
@@ -86,3 +86,8 @@ class TestIssue84: XCTestCase {
 
     }
 }
+
+
+
+
+
diff --git a/UnitTests/EVReflectionTests/EVReflectionMappingTest.swift b/UnitTests/EVReflectionTests/EVReflectionMappingTest.swift
@@ -70,6 +70,13 @@ class EVReflectionMappingTests: XCTestCase {
         XCTAssertNil(player.memberSince)
         XCTAssertEqual(player.rating, 0)
     }
+
+    func testValidationFunction() {
+        let user = GameUser(json: "{\"name\":\"Yo\"}")
+        XCTAssertNil(user.name, "Name should not have been set to Yo")
+        let user2 = GameUser(json: "{\"name\":\"Yol\"}")
+        XCTAssertEqual(user2.name, "Yol", "Name should have been set to Yol")
+    }
 }
 
 enum MyValidationError: Error {