improved description generator

Author: insanoid

SwiftyJSONAccelerator/Models-Components/DefaultModelFileComponent.swift

@@ -136,20 +136,20 @@ extension DefaultModelFileComponent {
 
   func genDescriptionForPrimitive(_ name: String, _ type: String, _ constantName: String) -> String {
     if type == VariableType.Bool.rawValue {
-      return "dictionary.updateValue(\(name), forKey: \(constantName))"
+      return "dictionary[\(constantName)] = \(name)"
     }
-    return "if let value = \(name) { dictionary.updateValue(value, forKey: \(constantName)) }"
+    return "if let value = \(name) { dictionary[\(constantName)] = value }"
   }
   func genDescriptionForPrimitiveArray(_ name: String, _ constantName: String) -> String {
-    return "if let value = \(name) { dictionary.updateValue(value, forKey: \(constantName)) }"
+    return "if let value = \(name) { dictionary[\(constantName)] = value }"
   }
 
   func genDescriptionForObject(_ name: String, _ constantName: String) -> String {
-    return "if let value = \(name) { dictionary.updateValue(value.dictionaryRepresentation(), forKey: \(constantName)) }"
+    return "if let value = \(name) { dictionary[\(constantName)] = value.dictionaryRepresentation() }"
   }
 
   func genDescriptionForObjectArray(_ name: String, _ constantName: String) -> String {
-    return "if let value = \(name) { dictionary.updateValue(value.map { $0.dictionaryRepresentation() }, forKey: \(constantName)) }"
+    return "if let value = \(name) { dictionary[\(constantName)] = value.map { $0.dictionaryRepresentation() } }"
   }
 
   func genEncoder(_ name: String, _ type: String, _ constantName: String) -> String {

SwiftyJSONAccelerator/Templates/BaseTemplate.txt

@@ -20,8 +20,8 @@ public {OBJECT_KIND} {OBJECT_NAME}{EXTENDED_OBJECT_COLON}{EXTEND_FROM} {
    Generates description of the object in the form of a NSDictionary.
    - returns: A Key value pair containing all valid values in the object.
   */
-  public func dictionaryRepresentation() -> [String: AnyObject] {
-    var dictionary: [String: AnyObject] = [:]
+  public func dictionaryRepresentation() -> [String: Any] {
+    var dictionary: [String: Any] = [:]
 {DESCRIPTION}
     return dictionary
   }

SwiftyJSONAccelerator/Templates/Library-Extension-Templates/SwiftyJSONTemplate.txt

@@ -4,7 +4,7 @@
    - parameter object: The object of either Dictionary or Array kind that was passed.
    - returns: An initalized instance of the class.
   */
-  convenience public init(object: AnyObject) {
+  convenience public init(object: Any) {
     self.init(json: JSON(object))
   }
 

SwiftyJSONAcceleratorTests/ModelGeneratorTests.swift

@@ -224,14 +224,14 @@ class ModelGeneratorTests: XCTestCase {
 
     expect(baseModelFile!.component.description.count).to(equal(8))
     let descriptions = [
-      "if let value = valueSeven { dictionary.updateValue(value.map { $0.dictionaryRepresentation() }, forKey: kACBaseClassValueSevenKey) }",
-      "if let value = valueTwo { dictionary.updateValue(value, forKey: kACBaseClassValueTwoKey) }",
-      "if let value = valueFour { dictionary.updateValue(value, forKey: kACBaseClassValueFourKey) }",
-      "if let value = valueFive { dictionary.updateValue(value, forKey: kACBaseClassValueFiveKey) }",
-      "if let value = valueSix { dictionary.updateValue(value.dictionaryRepresentation(), forKey: kACBaseClassValueSixKey) }",
-      "if let value = valueOne { dictionary.updateValue(value, forKey: kACBaseClassValueOneKey) }",
-      "dictionary.updateValue(valueThree, forKey: kACBaseClassValueThreeKey)",
-      "if let value = valueEight { dictionary.updateValue(value, forKey: kACBaseClassValueEightKey) }"
+        "if let value = valueSix { dictionary[kACBaseClassValueSixKey] = value.dictionaryRepresentation() }",
+        "if let value = valueFive { dictionary[kACBaseClassValueFiveKey] = value }",
+        "if let value = valueTwo { dictionary[kACBaseClassValueTwoKey] = value }",
+        "dictionary[kACBaseClassValueThreeKey] = valueThree",
+        "if let value = valueSeven { dictionary[kACBaseClassValueSevenKey] = value.map { $0.dictionaryRepresentation() } }",
+        "if let value = valueOne { dictionary[kACBaseClassValueOneKey] = value }",
+        "if let value = valueFour { dictionary[kACBaseClassValueFourKey] = value }",
+        "if let value = valueEight { dictionary[kACBaseClassValueEightKey] = value }"
     ]
     for description in descriptions {
       expect(baseModelFile!.component.description.contains(description)).to(equal(true))