#3 fixed initialisers

Author: insanoid

SwiftyJSONAccelerator/Base Files/BaseTemplate.txt

@@ -15,11 +15,8 @@ public {OBJECT_KIND} {OBJECT_NAME}: {OBJECT_BASE_CLASS}{NSCODING_PROTOCOL_SUPPOR
     // MARK: Properties
 {PROPERTIES}
 
-    // MARK: Initalizers
 {SWIFTY_JSON_SUPPORT}
-
 {OBJECT_MAPPER_SUPPORT}
-
     /**
     Generates description of the object in the form of a NSDictionary.
     - returns: A Key value pair containing all valid values in the object.
@@ -28,10 +25,7 @@ public {OBJECT_KIND} {OBJECT_NAME}: {OBJECT_BASE_CLASS}{NSCODING_PROTOCOL_SUPPOR
 
         var dictionary: [String : AnyObject ] = [ : ]
 {DESC}
-
         return dictionary
     }
-
     {NSCODING_SUPPORT}
-
 }

SwiftyJSONAccelerator/Base Files/NSCodingTemplate.txt

@@ -1,8 +1,9 @@
-// MARK: NSCoding Protocol
+
+    // MARK: NSCoding Protocol
     required public init(coder aDecoder: NSCoder) {
 {DECODERS}
     }
 
     public func encodeWithCoder(aCoder: NSCoder) {
 {ENCODERS}
-    }
+    }

SwiftyJSONAccelerator/Base Files/ObjectMapperTemplate.txt

@@ -1,3 +1,4 @@
+    // MARK: ObjectMapper Initalizers
     /**
     Map a JSON object to this class using ObjectMapper
     - parameter map: A mapping from ObjectMapper

SwiftyJSONAccelerator/Base Files/SwiftyJSONTemplate.txt

@@ -1,3 +1,4 @@
+    // MARK: SwiftyJSON Initalizers
     /**
     Initates the class based on the object
     - parameter object: The object of either Dictionary or Array kind that was passed.
@@ -14,4 +15,4 @@
     */
     public init(json: JSON) {
 {INITALIZER}
-    }
+    }

SwiftyJSONAccelerator/SJEditorViewController.swift

@@ -12,14 +12,14 @@ import Cocoa
 class SJEditorViewController: NSViewController, NSTextViewDelegate {
 
     // MARK: Outlet files.
-    @IBOutlet var textView: SJTextView?
-    @IBOutlet var messageLabel: NSTextField?
-    @IBOutlet var errorImageView: NSImageView?
-    @IBOutlet var baseClassTextField: NSTextField?
-    @IBOutlet var prefixClassTextField: NSTextField?
-    @IBOutlet var companyNameTextField: NSTextField?
-    @IBOutlet var authorNameTextField: NSTextField?
-    @IBOutlet var includeSwiftyCheckbox: NSButton?
+    @IBOutlet var textView: SJTextView!
+    @IBOutlet var messageLabel: NSTextField!
+    @IBOutlet var errorImageView: NSImageView!
+    @IBOutlet var baseClassTextField: NSTextField!
+    @IBOutlet var prefixClassTextField: NSTextField!
+    @IBOutlet var companyNameTextField: NSTextField!
+    @IBOutlet var authorNameTextField: NSTextField!
+    @IBOutlet var includeSwiftyCheckbox: NSButton!
     @IBOutlet var supportNSCodingCheckbox: NSButton!
     @IBOutlet var supportSwiftyJSONCheckbox: NSButton!
     @IBOutlet var supportObjectMapperCheckbox: NSButton!
@@ -112,7 +112,18 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
             let objectMapperState = self.includeObjectMapperCheckbox?.state == 1 ? true : false
             let supportObjectMapperState = self.supportObjectMapperCheckbox?.state == 1 ? true : false
 
-            let generator: ModelGenerator = ModelGenerator.init(baseContent: JSON(object!), prefix:  prefixClassTextField?.stringValue, baseClassName: (baseClassTextField?.stringValue)!, authorName: authorNameTextField?.stringValue, companyName: companyNameTextField?.stringValue, type: ModelType.kClassType, filePath:  filePath!, supportSwiftyJSON: supportSwiftyState, includeSwiftyJSON: swiftyState, supportObjectMapper: supportObjectMapperState, includeObjectMapper: objectMapperState, supportNSCoding: nscodingState)
+            let generator: ModelGenerator = ModelGenerator.init(baseContent: JSON(object!), baseClassName: baseClassTextField.stringValue, filePath: filePath!)
+
+            generator.prefix = prefixClassTextField.stringValue
+            generator.authorName = authorNameTextField.stringValue
+            generator.companyName = companyNameTextField.stringValue
+            generator.type = ModelType.kClassType
+            generator.supportSwiftyJSON = supportSwiftyState
+            generator.includeSwiftyJSON = swiftyState
+            generator.supportObjectMapper = supportObjectMapperState
+            generator.includeObjectMapper = objectMapperState
+            generator.supportNSCoding = nscodingState
+
             generator.generate()
         } else {
             let alert:NSAlert = NSAlert()

SwiftyJSONAccelerator/SJModelGenerator.swift

@@ -45,52 +45,36 @@ public struct ModelType {
 public class ModelGenerator {
 
     //MARK: Variables
-    var authorName: String?
-    var companyName: String?
-    var prefix: String?
-    var baseContent: JSON
-    var type: String
     var filePath: String
     var baseClassName: String
+    var baseContent: JSON
 
-    var supportSwiftyJSON: Bool
-    var includeSwiftyJSON: Bool
-
-    var supportObjectMapper: Bool
-    var includeObjectMapper: Bool
-
-    var supportNSCoding: Bool
+    var authorName: String?
+    var companyName: String?
+    var prefix: String?
+    var type: String?
+    var supportSwiftyJSON: Bool?
+    var includeSwiftyJSON: Bool?
+    var supportObjectMapper: Bool?
+    var includeObjectMapper: Bool?
+    var supportNSCoding: Bool?
 
 
     //MARK: Public Methods
     /**
      Initalize the model generator with various settings.
 
      - parameter baseContent:   Base JSON that has to be converted into model.
-     - parameter prefix:        Prefix for the class.
      - parameter baseClassName: Name of the base class.
-     - parameter authorName:    Name of the author, for use in the header documentation of the file.
-     - parameter companyName:   Name of the company, for use in the header documentation of the file.
-     - parameter type:          Type of the model that has to be generated, Struct or Class.
      - parameter filePath:      Filepath where the generated model has to be saved.
-     - parameter includeSwiftyJSON:  Boolean indicating if the header should have SwiftyJSON
 
      - returns: A ModelGenerator instance.
      */
-    init(baseContent: JSON, prefix: String?, baseClassName: String, authorName: String?, companyName: String?, type: String, filePath: String, supportSwiftyJSON: Bool, includeSwiftyJSON: Bool, supportObjectMapper: Bool, includeObjectMapper: Bool, supportNSCoding: Bool) {
-        self.authorName = authorName
+    init(baseContent: JSON, baseClassName: String, filePath: String) {
         self.baseContent = baseContent
-        self.prefix = prefix
-        self.authorName = authorName != nil ? authorName : NSFullUserName()
-        self.companyName = companyName
-        self.type = type
         self.filePath = filePath
         self.baseClassName = baseClassName
-        self.supportSwiftyJSON = supportSwiftyJSON
-        self.includeSwiftyJSON = includeSwiftyJSON
-        self.supportNSCoding = supportNSCoding
-        self.supportObjectMapper = supportObjectMapper
-        self.includeObjectMapper = includeObjectMapper
+        self.authorName = NSFullUserName()
     }
 
     /**
@@ -209,11 +193,11 @@ public class ModelGenerator {
             // Replace all the generated properties in the appropriated placeholders in the template.
             content = content.stringByReplacingOccurrencesOfString("{OBJECT_NAME}", withString: className)
             content = content.stringByReplacingOccurrencesOfString("{DATE}", withString: todayDateString())
-            content = content.stringByReplacingOccurrencesOfString("{OBJECT_KIND}", withString: type)
+            content = content.stringByReplacingOccurrencesOfString("{OBJECT_KIND}", withString: type!)
             content = content.stringByReplacingOccurrencesOfString("{STRING_CONSTANT_BLOCK}", withString: stringConstants)
             content = content.stringByReplacingOccurrencesOfString("{PROPERTIES}", withString: declarations)
 
-            if self.supportNSCoding {
+            if self.supportNSCoding! {
                 if let nscodingBase = try? String(contentsOfFile: NSBundle.mainBundle().pathForResource("NSCodingTemplate", ofType: "txt")!) {
                     content = content.stringByReplacingOccurrencesOfString("{NSCODING_PROTOCOL_SUPPORT}", withString: ", NSCoding")
                     content = content.stringByReplacingOccurrencesOfString("{NSCODING_SUPPORT}", withString: nscodingBase)
@@ -231,13 +215,13 @@ public class ModelGenerator {
                 content = content.stringByReplacingOccurrencesOfString("{NSCODING_SUPPORT}", withString: "")
             }
 
-            if self.supportSwiftyJSON {
+            if self.supportSwiftyJSON! {
                 if let swiftyBase = try? String(contentsOfFile: NSBundle.mainBundle().pathForResource("SwiftyJSONTemplate", ofType: "txt")!) {
                     content = content.stringByReplacingOccurrencesOfString("{SWIFTY_JSON_SUPPORT}", withString: swiftyBase)
 
                     content = content.stringByReplacingOccurrencesOfString("{INITALIZER}", withString: initalizers)
 
-                    if includeSwiftyJSON {
+                    if includeSwiftyJSON! {
                         content = content.stringByReplacingOccurrencesOfString("{INCLUDE_SWIFTY}", withString: "\nimport SwiftyJSON")
                     } else {
                         content = content.stringByReplacingOccurrencesOfString("{INCLUDE_SWIFTY}", withString: "")
@@ -253,15 +237,15 @@ public class ModelGenerator {
                 content = content.stringByReplacingOccurrencesOfString("{INCLUDE_SWIFTY}", withString: "")
             }
 
-            if self.supportObjectMapper {
+            if self.supportObjectMapper! {
                 if let objectMapperBase = try? String(contentsOfFile: NSBundle.mainBundle().pathForResource("ObjectMapperTemplate", ofType: "txt")!) {
                     content = content.stringByReplacingOccurrencesOfString("{OBJECT_MAPPER_SUPPORT}", withString: objectMapperBase)
 
                     content = content.stringByReplacingOccurrencesOfString("{OBJECT_MAPPER_INITIALIZER}", withString: objectMapperMappings)
 
                     objectBaseClass = "Mappable"
 
-                    if includeObjectMapper {
+                    if includeObjectMapper! {
                         content = content.stringByReplacingOccurrencesOfString("{INCLUDE_OBJECT_MAPPER}", withString: "\nimport ObjectMapper")
                     } else {
                         content = content.stringByReplacingOccurrencesOfString("{INCLUDE_OBJECT_MAPPER}", withString: "")