refactoring - changing the way methods are created

Author: mitulmanish

Source/HTTPSession.swift

@@ -184,22 +184,9 @@ public class HTTPSession {
 					location = nil
 				}
 
-                
-                let productInformation: ProductInformation?
-                if let productInformationJSONObject = lightJSONObject["product"] as? NSDictionary, let name = productInformationJSONObject["name"] as? String, let manufaturer = productInformationJSONObject["company"] as? String {
-                    
-                    let capabilities: Capabilities?
-                    if let capabilitiesJSONObject = productInformationJSONObject["capabilities"] as? NSDictionary {
-                        let hasColor = capabilitiesJSONObject["has_color"] as? Bool
-                        let hasIR = capabilitiesJSONObject["has_ir"] as? Bool
-                        let hasMultiZone = capabilitiesJSONObject["has_multizone"] as? Bool
-                        capabilities = Capabilities(hasColor: hasColor, hasIR: hasIR, hasMulitiZone: hasMultiZone)
-                    } else {
-                        capabilities = nil
-                    }
-                    productInformation = ProductInformation(productName: name, manufacturer: manufaturer, capabilities: capabilities)
-                } else {
-                    productInformation = nil
+                var productInformation: ProductInformation?
+                if let productInformationJSONObject = lightJSONObject["product"] as? NSDictionary {
+                    productInformation = ProductInformation(data: productInformationJSONObject)
                 }
 
 				let color = Color(hue: colorHue, saturation: colorSaturation, kelvin: colorKelvin)

Source/ProductInformation.swift

@@ -9,13 +9,42 @@
 import Foundation
 
 public struct ProductInformation {
-    public let productName: String?
-    public let manufacturer: String?
+    public let productName: String
+    public let manufacturer: String
     public let capabilities: Capabilities?
+    
+    public init?(data: NSDictionary) {
+        guard let name = data["name"] as? String, let company = data["company"] as? String, let productCapabilities = data["capabilities"] as? NSDictionary else {
+            return nil
+        }
+        productName = name
+        manufacturer = company
+        capabilities = Capabilities(data: productCapabilities)
+    }
+    
+    var description: String {
+        return "Name: \(productName) - manufactured by \(manufacturer) Capabilities supported - \(String(describing: capabilities?.description))"
+    }
 }
 
 public struct Capabilities {
-    public let hasColor: Bool?
-    public let hasIR: Bool?
-    public let hasMulitiZone: Bool?
+    public let hasColor: Bool
+    public let hasIR: Bool
+    public let hasMulitiZone: Bool
+    
+    public init?(data: NSDictionary) {
+        guard let hasColor = data["has_color"] as? Bool,
+        let hasIR = data["has_ir"] as? Bool, let multiZone = data["has_multizone"] as? Bool else {
+                return nil
+        }
+        
+        self.hasColor = hasColor
+        self.hasIR = hasIR
+        self.hasMulitiZone = multiZone
+    }
+    
+    var description: String {
+        return "supports color - \(hasColor), supports Infra-red \(hasIR), multiple zones - \(hasMulitiZone)"
+    }
+    
 }