swift 2.2 cleanup

Author: daltoniam

JSONJoy.xcodeproj/xcshareddata/xcschemes/JSONJoy.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

JSONJoy.xcodeproj/xcshareddata/xcschemes/JSONJoyOSX.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

JSONJoy.xcodeproj/xcshareddata/xcschemes/JSONJoyTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

README.md

@@ -36,22 +36,22 @@ We want to translate that JSON to these Swift objects:
 
 ```swift
 struct Address {
-    var objID: Int?
-    var streetAddress: String?
-    var city: String?
-    var state: String?
-    var postalCode: String?
+    let objID: Int?
+    let streetAddress: String?
+    let city: String?
+    let state: String?
+    let postalCode: String?
     init() {
 
     }
 }
 
 struct User {
-    var objID: Int?
-    var firstName: String?
-    var lastName: String?
-    var age: Int?
-    var address = Address()
+    let objID: Int?
+    let firstName: String?
+    let lastName: String?
+    let age: Int?
+    let address = Address()
     init() {
 
     }
@@ -80,11 +80,11 @@ JSONJoy makes this much simpler. We have our Swift objects implement the JSONJoy
 
 ```swift
 struct Address : JSONJoy {
-    var objID: Int
-    var streetAddress: String
-    var city: String
-    var state: String
-    var postalCode: String
+    let objID: Int
+    let streetAddress: String
+    let city: String
+    let state: String
+    let postalCode: String
 
     init(_ decoder: JSONDecoder) throws {
         objID = try decoder["id"].getInt()
@@ -96,11 +96,11 @@ struct Address : JSONJoy {
 }
 
 struct User : JSONJoy {
-    var objID: Int
-    var firstName: String
-    var lastName: String
-    var age: Int
-    var address: Address
+    let objID: Int
+    let firstName: String
+    let lastName: String
+    let age: Int
+    let address: Address
 
     init(_ decoder: JSONDecoder) throws {
         objID = try decoder["id"].getInt()
@@ -156,13 +156,15 @@ firstName = decoder[5]["wrongKey"]["MoreWrong"].string
 
 ```swift
 struct Addresses : JSONJoy {
-    var addresses = [Address]()
+    let addresses: [Address]
 
     init(_ decoder: JSONDecoder) {
 		guard let addrs = decoder["addresses"].array else {throw JSONError.WrongType}
+		var collect = [Address]()
 		for addrDecoder in addrs {
-			addresses.append(Address(addrDecoder))
+			collect.append(Address(addrDecoder))
 		}
+		addresses = collect
     }
 }
 ```

Source/JSONJoy.swift

@@ -114,6 +114,14 @@ public class JSONDecoder {
         return i
     }
 
+    //get the bool and have it throw if it doesn't work
+    public func getBool() throws -> Bool {
+        if let _ = value as? NSNull {
+            throw JSONError.WrongType
+        }
+        return bool
+    }
+    
     //pull the raw values out of an array
     public func getArray<T>(inout collect: Array<T>?) {
         if let array = value as? Array<JSONDecoder> {
@@ -141,8 +149,11 @@ public class JSONDecoder {
         }
     }
     ///the init that converts everything to something nice
-    public init(_ raw: AnyObject) {
+    public init(_ raw: AnyObject, isSub: Bool = false) {
         var rawObject: AnyObject = raw
+        if let str = rawObject as? String where !isSub {
+            rawObject = str.dataUsingEncoding(NSUTF8StringEncoding)!
+        }
         if let data = rawObject as? NSData {
             var response: AnyObject?
             do {
@@ -157,13 +168,13 @@ public class JSONDecoder {
         if let array = rawObject as? NSArray {
             var collect = [JSONDecoder]()
             for val: AnyObject in array {
-                collect.append(JSONDecoder(val))
+                collect.append(JSONDecoder(val, isSub: true))
             }
             value = collect
         } else if let dict = rawObject as? NSDictionary {
             var collect = Dictionary<String,JSONDecoder>()
             for (key,val) in dict {
-                collect[key as! String] = JSONDecoder(val)
+                collect[key as! String] = JSONDecoder(val, isSub: true)
             }
             value = collect
         } else {
@@ -214,13 +225,13 @@ public class JSONDecoder {
             str.removeAtIndex(str.endIndex.advancedBy(-1))
             return str + "}"
         }
-        if value != nil {
-            if let _ = self.string {
-                return "\"\(value!)\""
+        if let v = value {
+            if let s = self.string {
+                return "\"\(s)\""
             } else if let _ = value as? NSNull {
                 return "null"
             }
-            return "\(value!)"
+            return "\(v)"
         }
         return ""
     }