Merge pull request #40 from ScalaInc/fix/logs

Fix/logs

Author: adamgallowayscala

ExpSwift/Classes/Logging.swift

@@ -8,24 +8,23 @@
 
 import Foundation
 
-
 func expLogging<T>(_ object: @autoclosure () -> T, _ file: String = #file, _ function: String = #function, _ line: Int = #line) {
-        #if DEBUG
-            let value = object()
-            let stringRepresentation: String
-            
-            if let value = value as? CustomDebugStringConvertible {
-                stringRepresentation = value.debugDescription
-            } else if let value = value as? CustomStringConvertible {
-                stringRepresentation = value.description
-            } else {
-                fatalError("expLogging only works for values that conform to CustomDebugStringConvertible or CustomStringConvertible")
-            }
-            
-            let fileURL = NSURL(string: file)?.lastPathComponent ?? "Unknown file"
-            let queue = NSThread.isMainThread() ? "UI" : "BG"
-            
-            NSLog("<\(queue)> \(fileURL) \(function)[\(line)]: " + stringRepresentation)
-        #endif
+    #if DEBUG
+        let value = object()
+        let stringRepresentation: String
+        
+        if let value = value as? CustomDebugStringConvertible {
+            stringRepresentation = value.debugDescription
+        } else if let value = value as? CustomStringConvertible {
+            stringRepresentation = value.description
+        } else {
+            fatalError("epxLoggingPrint only works for values that conform to CustomDebugStringConvertible or CustomStringConvertible")
+        }
+        
+        let fileURL = URL(string: file)?.lastPathComponent ?? "Unknown file"
+        let queue = Thread.isMainThread ? "UI" : "BG"
+        
+        print("<\(queue)> \(fileURL) \(function)[\(line)]: " + stringRepresentation)
+    #endif
 }
 

ExpSwift/Classes/Thing.swift

@@ -25,7 +25,9 @@ public final class Thing: Model,ResponseObject,ResponseCollection,ModelProtocol
             }
         }
         if let dic = representation?["experience"]  as? NSDictionary {
-            self.experience = Experience(response:response, representation: representation?["experience"])
+             if let uuid = dic.value(forKeyPath: "uuid") as? String {
+               self.experience = Experience(response:response, representation: representation?["experience"])
+            }
         }
         super.init(response: response, representation: representation)
     }