swiftClassTypeFromString fix

EVReflection.podspec

@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
 #
 
 s.name         = "EVReflection"
-s.version      = "2.22.1"
+s.version      = "2.22.2"
 s.summary      = "iOS: Swift helper library with reflection functions"
 s.description  = "Swift helper library with reflection functions including support for NSCoding, Printable, Hashable, Equatable and JSON"
 s.homepage     = "https://github.com/evermeer/EVReflection"

EVReflection/EVReflectionTests/EVReflectionTests.swift

@@ -296,10 +296,17 @@ class EVReflectionTests: XCTestCase {
         print(a2.toJsonString())
     }
 
+    func testNestedArry() {
+        let json = "{\"date\": 2457389.3333330001,\"results\": { \"sun\": [[559285.95145709824, 202871.33591198301, 61656.198554897906], [127.6163120820332, 948.44727756795123, 406.68471093096883]], \"geomoon\": [[-401458.60657087743, -43744.769596474769, -11058.709613333322], [8433.3114508170656, -78837.790870237863, -26279.67592282737]] }, \"unit\": \"km\" }"
+        let myObject = NestedArrays(json: json)
+        print(myObject.toJsonString())
+    }    
+
     func testStruct() {
+        //TODO: Fix structs
         let json = X().toJsonString()
         print("json = \(json)")
-    }
+    }    
 }
 
 class X: EVObject {
@@ -316,3 +323,7 @@ class X: EVObject {
 
 
 
+
+
+
+

EVReflection/EVReflectionTests/TestObjects.swift

@@ -198,3 +198,25 @@ public class AA : EVObject{
 public class BB : EVObject{
     public var val : Int = 0
 }
+
+class NestedArrays: EVObject {
+    var date: NSNumber?
+    var results: NestedArraysResult?
+    var unit: String?
+}
+
+class NestedArraysResult: EVObject {
+    var planets = [String: [[NSNumber]]]()
+
+    // This way we can solve that the JSON has arbitrary keys
+    internal override func setValue(value: AnyObject!, forUndefinedKey key: String) {
+        if let a = value as? [[NSNumber]] {
+            planets[key] = a
+            return
+        }
+        NSLog("---> setValue for key '\(key)' should be handled.")
+    }
+}
+
+
+

EVReflection/pod/EVReflection.swift

@@ -446,33 +446,28 @@ final public class EVReflection {
 
      :returns: The Class type
      */
-    public class func swiftClassTypeFromString(className: String) -> AnyClass! {
-        //        if className.hasPrefix("Optional<") {
-        //            className = className.substringWithRange(Range<String.Index>(start: className.startIndex.advancedBy(9), end: className.endIndex.advancedBy(-1)))
-        //        }
-        if className.hasPrefix("_Tt") {
-            return NSClassFromString(className)
+    public class func swiftClassTypeFromString(className: String) -> AnyClass? {
+        if let c = NSClassFromString(className) {
+            return c
         }
-        var classStringName = className
+
+        // The default did not work. try a combi of appname and classname
         if className.rangeOfString(".", options: NSStringCompareOptions.CaseInsensitiveSearch) == nil {
             let appName = getCleanAppName()
-            classStringName = "\(appName).\(className)"
-        }
-
-        if let classStringName = NSClassFromString(classStringName) {
-            return classStringName
+            if let c = NSClassFromString("\(appName).\(className)") {
+                return c
+            }
         }
 
         if let bundleIdentifiers = bundleIdentifiers {
             for aBundle in bundleIdentifiers {
-                let className = "\(aBundle).\(className)"
-                if let existingClass = NSClassFromString(className) {
+                if let existingClass = NSClassFromString("\(aBundle).\(className)") {
                     return existingClass
                 }
             }
         }
 
-        return NSClassFromString(classStringName)
+        return nil
     }
 
     /**