Merge pull request #96 from insanoid/v1.5.1

V1.5.1

Author: insanoid

.swiftformat

@@ -1,9 +1,5 @@
 # file options
 
---exclude Tests/XCTestManifests.swift,Snapshots 
-
-# format options
-
 --allman false
 --binarygrouping 4,8
 --commas always
@@ -35,4 +31,4 @@
 
 # rules
 
---enable isEmpty
+--enable isEmpty

.swiftlint

@@ -0,0 +1,28 @@
+disabled_rules:
+- trailing_whitespace
+- line_length
+- compiler_protocol_init
+- force_try
+opt_in_rules:
+- empty_count
+- empty_string
+excluded:
+- Pods
+- SwiftyJSONAccelerator/UI/External-Libraries
+function_body_length:
+    warning: 300
+    error: 500
+function_parameter_count:
+    warning: 6
+    error: 8
+type_body_length:
+    warning: 300
+    error: 500
+file_length:
+    warning: 1000
+    error: 1500
+    ignore_comment_only_lines: true
+cyclomatic_complexity:
+    warning: 15
+    error: 25
+reporter: "xcode"

.swiftlint.yml

@@ -0,0 +1,25 @@
+language: swift
+
+osx_image: xcode10.2
+xcode_workspace: SwiftyJSONAccelerator.xcworkspace
+xcode_scheme: SwiftyJSONAccelerator
+xcode_sdk: macosx10.14
+
+before_install:
+  - gem install xcpretty
+  - gem install slather
+  - gem install cocoapods
+  - gem install xcov
+
+addons:
+  homebrew:
+    packages:
+    - swiftlint
+    - swiftformat
+    update: true
+
+script:
+  - xcodebuild -workspace SwiftyJSONAccelerator.xcworkspace -scheme "SwiftyJSONAccelerator" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO test
+
+after_success:
+  - xcov -w SwiftyJSONAccelerator.xcworkspace -s SwiftyJSONAccelerator -o build/xcov --coveralls_service_name travis-ci --coveralls_service_job_id $TRAVIS_JOB_ID

.travis.yml

@@ -0,0 +1,4 @@
+# Not core code
+- Pods
+- SwiftyJSONAccelerator/UI
+- SwiftyJSONAccelerator/Support

.xcovignore

@@ -34,8 +34,8 @@ enum ConstructType: String {
 /// - Swift: Pure Swift 5 Codeable
 /// - SwiftCodeExtended: Codeextended along with Swift 5 - https://github.com/JohnSundell/Codextended
 enum JSONMappingMethod: String {
-    case Swift = "SwiftCodingVanilla"
-    case SwiftCodeExtended
+    case swiftNormal = "swiftCodingVanilla"
+    case swiftCodeExtended
 }
 
 /// Types of property.
@@ -54,3 +54,8 @@ enum PropertyType: String {
     case emptyArray
     case nullType
 }
+
+/// Place to store actual constants that don't fit in classes.
+struct Constants {
+    static let filePathKey: String = "path"
+}

Core/Constants.swift

@@ -13,15 +13,12 @@ struct FileGenerator {
     ///
     /// - Parameter filename: Name of the file to be loaded
     /// - Returns: String containing the template.
-    static func loadFileWith(_ filename: String) -> String {
+    static func loadFileWith(_ filename: String) throws -> String {
         let bundle = Bundle.main
-        let path = bundle.path(forResource: filename, ofType: "txt")
-
-        do {
-            let content = try String(contentsOfFile: path!)
-            return content
-        } catch {}
-
-        return ""
+        guard let path = bundle.path(forResource: filename, ofType: "txt") else {
+            return ""
+        }
+        let content = try String(contentsOfFile: path)
+        return content
     }
 }

Core/Generator/FileGenerator.swift

@@ -10,7 +10,7 @@ import Foundation
 
 extension FileGenerator {
     static func generateFileContentWith(_ modelFile: ModelFile, configuration: ModelGenerationConfiguration) -> String {
-        var content = loadFileWith("BaseTemplate")
+        var content = try! loadFileWith("BaseTemplate")
         let singleTab = "  ", doubleTab = "    "
         content = content.replacingOccurrences(of: "{OBJECT_NAME}", with: modelFile.fileName)
         content = content.replacingOccurrences(of: "{DATE}", with: todayDateString())

Core/Generator/FileGeneratorExtension.swift

@@ -72,7 +72,7 @@ public struct ModelGenerator {
 
                 switch variableType {
                 case .array:
-                    if value.arrayValue.count <= 0 {
+                    if value.arrayValue.isEmpty {
                         currentModel.generateAndAddComponentsFor(PropertyComponent(variableName, VariableType.array.rawValue, stringConstantName, key, .emptyArray))
                     } else {
                         let subClassType = value.arrayValue.first!.detailedValueType()

Core/Generator/ModalGenerator.swift

@@ -16,20 +16,11 @@ internal struct ModelComponent {
     var stringConstants: [String]
     /// Initialisers for the properties.
     var initialisers: [String]
-    /// Encoders for NSCoding support.
-    var encoders: [String]
-    /// Decoders for NSCoding support.
-    var decoders: [String]
-    /// Description printer for each of the properties.
-    var description: [String]
 
     /// Initialise a blank model component structure.
     init() {
         declarations = []
         stringConstants = []
         initialisers = []
-        encoders = []
-        decoders = []
-        description = []
     }
 }