Updated UI to function with new code.

Author: insanoid

.travis.yml

@@ -5,18 +5,19 @@ cache:
 osx_image: xcode8.0
 xcode_workspace: SwiftyJSONAccelerator.xcworkspace
 xcode_scheme: SwiftyJSONAccelerator
-xcode_sdk: macosx10.12
+xcode_sdk: macosx10.11
 podfile: Podfile
 install:
   - bundle install
   - gem install cocoapods
   - ./install_swiftlint.sh
 before_script:
   - rm -rf Pods
+  - rm -rf Podlock
   - bundle install
   - bundle exec pod install
 script:
-  - xcodebuild -workspace SwiftyJSONAccelerator.xcworkspace -scheme "SwiftyJSONAccelerator" test | tee xcodebuild.log | xcpretty -s
+  - xcodebuild -workspace SwiftyJSONAccelerator.xcworkspace -schee "SwiftyJSONAccelerator" test | tee xcodebuild.log | xcpretty -s
   - swiftlint
 after_success:
   - slather

SwiftyJSONAccelerator/Constants.swift

@@ -27,7 +27,7 @@ enum VariableType: String {
   case Bool = "Bool"
   case Array = "[]"
   case Object = "{OBJ}"
-  case Null = "AnyObject"
+  case Null = "Any"
 }
 
 /**

SwiftyJSONAccelerator/Library-Extensions/ObjectMapperModelFile.swift

@@ -67,10 +67,10 @@ struct ObjectMapperModelFile: ModelFile, DefaultModelFileComponent {
       generateCommonComponentsFor(property)
 
     case .EmptyArray:
-      component.declarations.append(genVariableDeclaration(property.name, "AnyObject", true))
+      component.declarations.append(genVariableDeclaration(property.name, "Any", true))
       component.description.append(genDescriptionForPrimitiveArray(property.name, property.constantName))
-      component.decoders.append(genDecoder(property.name, "AnyObject", property.constantName, true))
-      component.encoders.append(genEncoder(property.name, "AnyObject", property.constantName))
+      component.decoders.append(genDecoder(property.name, "Any", property.constantName, true))
+      component.encoders.append(genEncoder(property.name, "Any", property.constantName))
       generateCommonComponentsFor(property)
     case .NullType: break
       // Currently we do not deal with null values.

SwiftyJSONAccelerator/Library-Extensions/SwiftyJSONModelFile.swift

@@ -74,10 +74,10 @@ struct SwiftyJSONModelFile: ModelFile, DefaultModelFileComponent {
     case .EmptyArray:
       component.stringConstants.append(genStringConstant(property.constantName, property.key))
       component.initialisers.append(genInitializerForPrimitiveArray(property.name, "object", property.constantName))
-      component.declarations.append(genVariableDeclaration(property.name, "AnyObject", true))
+      component.declarations.append(genVariableDeclaration(property.name, "Any", true))
       component.description.append(genDescriptionForPrimitiveArray(property.name, property.constantName))
-      component.decoders.append(genDecoder(property.name, "AnyObject", property.constantName, true))
-      component.encoders.append(genEncoder(property.name, "AnyObject", property.constantName))
+      component.decoders.append(genDecoder(property.name, "Any", property.constantName, true))
+      component.encoders.append(genEncoder(property.name, "Any", property.constantName))
     case .NullType:
       // Currently we do not deal with null values.
       break

SwiftyJSONAccelerator/Storyboard/Base.lproj/Main.storyboard

@@ -7,6 +7,8 @@
 //
 
 import Cocoa
+import SwiftyJSON
+
 fileprivate func < <T: Comparable>(lhs: T?, rhs: T?) -> Bool {
   switch (lhs, rhs) {
   case let (l?, r?):
@@ -39,11 +41,10 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
   @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!
-  @IBOutlet var includeObjectMapperCheckbox: NSButton!
+  @IBOutlet var includeHeaderImportCheckbox: NSButton!
+  @IBOutlet var enableNSCodingSupportCheckbox: NSButton!
+  @IBOutlet var librarySelector: NSPopUpButton!
+  @IBOutlet var modelTypeSelectorSegment: NSSegmentedControl!
 
   // MARK: View methods
   override func loadView() {
@@ -89,7 +90,9 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
         handleError(error)
         textView!.lnv_textDidChange(Notification.init(name: NSNotification.Name.NSTextDidChange, object: nil))
         return false
-      }
+      } else {
+        genericJSONError()
+    }
     return false
   }
 
@@ -101,13 +104,13 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
     // The base class field is blank, cannot proceed without it.
     // Possibly can have a default value in the future.
     if baseClassTextField?.stringValue.characters.count <= 0 {
-      let alert: NSAlert = NSAlert()
+      let alert = NSAlert()
       alert.messageText = "Enter a base class name to continue."
       alert.runModal()
       return
     }
 
-    let filePath: String? = openFile()
+    let filePath = openFile()
 
     // No file path was selected, go back!
     if filePath == nil {
@@ -119,27 +122,28 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
     // Checks for validity of the content, else can cause crashes.
     if object != nil {
 
-//      let swiftyState = self.includeSwiftyCheckbox?.state == 1 ? true : false
-//      let supportSwiftyState = self.supportSwiftyJSONCheckbox?.state == 1 ? true : false
-//
-//      let nscodingState = self.supportNSCodingCheckbox?.state == 1 ? true : false
-//
-//      let objectMapperState = self.includeObjectMapperCheckbox?.state == 1 ? true : false
-//      let supportObjectMapperState = self.supportObjectMapperCheckbox?.state == 1 ? true : false
-
-//            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()
+        let nsCodingState = self.enableNSCodingSupportCheckbox.state == 1 && (modelTypeSelectorSegment.selectedSegment == 1)
+        let constructType = self.modelTypeSelectorSegment.selectedSegment == 0 ? ConstructType.ClassType : ConstructType.StructType
+        let libraryType = self.librarySelector.indexOfSelectedItem == 0 ? JSONMappingLibrary.SwiftyJSON : JSONMappingLibrary.ObjectMapper
+        let configuration = ModelGenerationConfiguration.init(
+            filePath: filePath!.appending("/"),
+            baseClassName: baseClassTextField.stringValue,
+            authorName: authorNameTextField.stringValue,
+            companyName: companyNameTextField.stringValue,
+            prefix: prefixClassTextField.stringValue,
+            constructType: constructType,
+            modelMappingLibrary: libraryType,
+            supportNSCoding: nsCodingState)
+        let modelGenerator = ModelGenerator.init(JSON(object!), configuration)
+        let filesGenerated = modelGenerator.generate()
+        var successState = true
+        for file in filesGenerated {
+            let content = FileGenerator.generateFileContentWith(file, configuration: configuration)
+            let name = file.fileName
+            let path = configuration.filePath
+            successState = FileGenerator.writeToFileWith(name, content: content, path: path)
+        }
+        notify(completionState: successState, fileCount: filesGenerated.count)
     } else {
       let alert: NSAlert = NSAlert()
       alert.messageText = "Unable to save the file check the content."
@@ -148,23 +152,21 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
   }
 
   @IBAction func recalcEnabledBoxes(_ sender: AnyObject) {
+    self.enableNSCodingSupportCheckbox.isEnabled = (modelTypeSelectorSegment.selectedSegment == 1)
+  }
 
-    let supportSwiftyState = self.supportSwiftyJSONCheckbox?.state == 1 ? true : false
-    let supportObjectMapperState = self.supportObjectMapperCheckbox?.state == 1 ? true : false
-
-    if supportSwiftyState {
-      self.includeSwiftyCheckbox?.isEnabled = true
-    } else {
-      self.includeSwiftyCheckbox?.isEnabled = false
-    }
 
-    if supportObjectMapperState {
-      self.includeObjectMapperCheckbox?.isEnabled = true
-    } else {
-      self.includeObjectMapperCheckbox?.isEnabled = false
+    func notify(completionState: Bool, fileCount: Int) {
+        let notification: NSUserNotification = NSUserNotification()
+        notification.title = "SwiftyJSONAccelerator"
+        if completionState && fileCount > 0 {
+            notification.subtitle = "Completed - \(fileCount) Generated."
+        } else {
+            notification.subtitle = "No files were generated, cannot model arrays inside arrays."
+        }
+        NSUserNotificationCenter.default.deliver(notification)
     }
-  }
-
+    
   // MARK: Internal Methods
 
   /**
@@ -224,9 +226,18 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
       } else {
         invalidJSONError(message)
       }
+    } else {
+        genericJSONError()
     }
   }
 
+    /**
+     Shows a generic error about JSON in case the system is not able to figure out what is wrong.
+     */
+   func genericJSONError() {
+    invalidJSONError("The JSON seems to be invalid!")
+   }
+
   /// MARK: Resetting and showing error messages
 
   /**
@@ -258,7 +269,10 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
 
   // MARK: TextView Delegate
   func textDidChange(_ notification: Notification) {
-    validateAndFormat(false)
+    let isValid = validateAndFormat(false)
+    if isValid {
+        resetErrorImage()
+    }
   }
 
   // MARK: Internal Methods

SwiftyJSONAccelerator/UI/SJEditorViewController.swift

@@ -216,7 +216,7 @@ class ModelGeneratorTests: XCTestCase {
       "public var valueSix: ACValueSix?",
       "public var valueOne: String?",
       "public var valueThree: Bool = false",
-      "public var valueEight: [AnyObject]?"
+      "public var valueEight: [Any]?"
     ]
     for declaration in declarations {
       expect(baseModelFile!.component.declarations.contains(declaration)).to(equal(true))
@@ -260,7 +260,7 @@ class ModelGeneratorTests: XCTestCase {
       "self.valueSix = aDecoder.decodeObject(forKey: kACBaseClassValueSixKey) as? ACValueSix",
       "self.valueOne = aDecoder.decodeObject(forKey: kACBaseClassValueOneKey) as? String",
       "self.valueThree = aDecoder.decodeBool(forKey: kACBaseClassValueThreeKey)",
-      "self.valueEight = aDecoder.decodeObject(forKey: kACBaseClassValueEightKey) as? [AnyObject]"
+      "self.valueEight = aDecoder.decodeObject(forKey: kACBaseClassValueEightKey) as? [Any]"
     ]
     for decoder in decoders {
       expect(baseModelFile!.component.decoders.contains(decoder)).to(equal(true))

SwiftyJSONAcceleratorTests/ModelGeneratorTests.swift

@@ -19,4 +19,4 @@
             }
         }
     }
-}
+}dd