- updated to swift 3 - compiles

Author: Jakob Mygind

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "jatoben/CommandLine" "be13f512744a187feed05a900abda8cc7e3283cc"
+github "jatoben/CommandLine" "7a5502c068512b67c3711968ae7f6a3fa71f1ca9"
 github "nodes-ios/model-generator" "06d9aa994e5773c01330552b10880768ed31e9e7"

nstack-translations-generator/Classes/TranslationsGenerator/Downloader.swift

@@ -9,49 +9,49 @@
 import Foundation
 
 struct Downloader {
-    var semaphore = dispatch_semaphore_create(0)
+    var semaphore = DispatchSemaphore(value: 0)
 
-    static func dataWithDownloaderSettings(settings: DownloaderSettings) throws -> NSData? {
+    static func dataWithDownloaderSettings(_ settings: DownloaderSettings) throws -> Data? {
         return try Downloader().dataWithDownloaderSettings(settings)
     }
 
-    func dataWithDownloaderSettings(settings: DownloaderSettings) throws -> NSData? {
+    func dataWithDownloaderSettings(_ settings: DownloaderSettings) throws -> Data? {
         var requestURL = settings.URL
 
         // Add flat if needed
-        if settings.flatTranslations, let comps = NSURLComponents(URL: requestURL, resolvingAgainstBaseURL: false) {
-            let queryItem = NSURLQueryItem(name: "flat", value: "true")
+        if settings.flatTranslations, var comps = URLComponents(url: requestURL as URL, resolvingAgainstBaseURL: false) {
+            let queryItem = URLQueryItem(name: "flat", value: "true")
             comps.queryItems?.append(queryItem)
-            requestURL = comps.URL ?? requestURL
+            requestURL = comps.url as URL? ?? requestURL
         }
 
-        let request = NSMutableURLRequest(URL: requestURL)
+        let request = NSMutableURLRequest(url: requestURL as URL)
 
         // Add headers
         request.setValue("application/vnd.nodes", forHTTPHeaderField: "accept")
         request.setValue(settings.appKey, forHTTPHeaderField: "X-Rest-Api-Key")
         request.setValue(settings.appID, forHTTPHeaderField: "X-Application-Id")
 
-        var actualData: NSData?
-        var finalError: ErrorType?
+        var actualData: Data?
+        var finalError: Error?
 
         // Start data task
-        NSURLSession.sharedSession().dataTaskWithRequest(request) { data, response, error in
+        URLSession.shared.dataTask(with: request as URLRequest) { data, response, error in
             var customError: NSError?
 
-            if let response = response as? NSHTTPURLResponse {
+            if let response = response as? HTTPURLResponse {
                 switch response.statusCode {
                 case 300...999:
                     let content: String?
                     if let data = data {
-                        let json = try? NSJSONSerialization.JSONObjectWithData(data, options: .AllowFragments) as? [String: AnyObject]
+                        let json = try? JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: AnyObject]
                         content = "\(json ?? [:])"
                     } else {
                         content = nil
                     }
 
                     let errorString = "Server response contained error: \(content ?? "")"
-                    customError = NSError(domain: Generator.errorDomain, code: ErrorCode.DownloaderError.rawValue,
+                    customError = NSError(domain: Generator.errorDomain, code: ErrorCode.downloaderError.rawValue,
                         userInfo: [NSLocalizedDescriptionKey : errorString])
                 default: break
                 }
@@ -60,15 +60,15 @@ struct Downloader {
             actualData = data
             finalError = customError ?? error
 
-            dispatch_semaphore_signal(self.semaphore)
+            self.semaphore.signal()
         }.resume()
 
-        dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER)
+        semaphore.wait(timeout: DispatchTime.distantFuture)
 
         if let error = finalError {
             throw error
         }
 
         return actualData
     }
-}
+}

nstack-translations-generator/Classes/TranslationsGenerator/DownloaderSettings.swift

@@ -9,39 +9,39 @@
 import Foundation
 
 struct DownloaderSettings {
-    var URL: NSURL
+    var URL: Foundation.URL
     var appID: String
     var appKey: String
     var flatTranslations: Bool
 }
 
 extension DownloaderSettings {
     // Default URL
-    private static let defaultURL = NSURL(string: "https://nstack.io/api/v1/translate/mobile/keys?all=true")!
+    fileprivate static let defaultURL = Foundation.URL(string: "https://nstack.io/api/v1/translate/mobile/keys?all=true")!
 
     // Dictionary keys
-    private static let plistURLKey    = "REST_API_URL"
-    private static let plistAppIDKey  = "APPLICATION_ID"
-    private static let plistAppKeyKey = "REST_API_KEY"
-    private static let plistFlatKey   = "FLAT"
+    fileprivate static let plistURLKey    = "REST_API_URL"
+    fileprivate static let plistAppIDKey  = "APPLICATION_ID"
+    fileprivate static let plistAppKeyKey = "REST_API_KEY"
+    fileprivate static let plistFlatKey   = "FLAT"
 
-    static func settingsFromConfigurationFile(plistPath plistPath: String) throws -> DownloaderSettings {
-        let data = try NSData(contentsOfFile: plistPath, options: NSDataReadingOptions(rawValue: 0))
-        let plist = try NSPropertyListSerialization.propertyListWithData(data, options: .Immutable, format: nil)
+    static func settingsFromConfigurationFile(plistPath: String) throws -> DownloaderSettings {
+        let data = try Data(contentsOf: Foundation.URL(fileURLWithPath: plistPath), options: NSData.ReadingOptions(rawValue: 0))
+        let plist = try PropertyListSerialization.propertyList(from: data, options: PropertyListSerialization.MutabilityOptions(), format: nil)
 
         guard let dictionary = plist as? [String: AnyObject] else {
-            throw NSError(domain: Generator.errorDomain, code: ErrorCode.DownloaderError.rawValue,
+            throw NSError(domain: Generator.errorDomain, code: ErrorCode.downloaderError.rawValue,
                 userInfo: [NSLocalizedDescriptionKey : "Couldn't parse plist into a dictionary."])
         }
 
         var downloadURL = defaultURL
 
-        guard let appID = dictionary[plistAppIDKey] as? String, appKey = dictionary[plistAppKeyKey] as? String else {
-            throw NSError(domain: Generator.errorDomain, code: ErrorCode.DownloaderError.rawValue,
+        guard let appID = dictionary[plistAppIDKey] as? String, let appKey = dictionary[plistAppKeyKey] as? String else {
+            throw NSError(domain: Generator.errorDomain, code: ErrorCode.downloaderError.rawValue,
                 userInfo: [NSLocalizedDescriptionKey : "App ID or API key not found in the plist file."])
         }
 
-        if let customURLString = dictionary[plistURLKey] as? String, customURL = NSURL(string: customURLString) {
+        if let customURLString = dictionary[plistURLKey] as? String, let customURL = Foundation.URL(string: customURLString) {
             downloadURL = customURL
         }
 
@@ -60,4 +60,4 @@ extension DownloaderSettings {
         self.appKey = appKey
         self.flatTranslations = flatTranslations
     }
-}
+}

nstack-translations-generator/Classes/TranslationsGenerator/Extensions.swift

@@ -10,6 +10,6 @@ import Foundation
 
 extension String {
     var uppercasedFirstLetter: String {
-        return String(characters.prefix(1)).uppercaseString + String(characters.dropFirst())
+        return String(characters.prefix(1)).uppercased() + String(characters.dropFirst())
     }
 }

nstack-translations-generator/Classes/TranslationsGenerator/Generator.swift

@@ -10,15 +10,15 @@ import Foundation
 import ModelGenerator
 
 public enum ErrorCode: Int {
-    case WrongArguments = 1000
-    case DownloaderError
-    case ParserError
-    case GeneratorError
+    case wrongArguments = 1000
+    case downloaderError
+    case parserError
+    case generatorError
 }
 
 // Public interface/implementation
-@objc public class TranslationsGenerator: NSObject {
-    public class func generate(arguments: [String]) throws -> String {
+@objc open class TranslationsGenerator: NSObject {
+    open class func generate(_ arguments: [String]) throws -> String {
         return try Generator.generate(arguments)
     }
 }
@@ -32,7 +32,7 @@ struct Generator {
         return settings
     }
 
-    static func generate(arguments: [String]) throws -> String {
+    static func generate(_ arguments: [String]) throws -> String {
 
         // 1. Parse arguments
         let settings = try GeneratorSettings.parseFromArguments(arguments)
@@ -43,32 +43,32 @@ struct Generator {
 
         // If we got data, continue with generation, throw otherwise
         guard let data = dData else {
-            throw NSError(domain: errorDomain, code: ErrorCode.GeneratorError.rawValue, userInfo:
+            throw NSError(domain: errorDomain, code: ErrorCode.generatorError.rawValue, userInfo:
                 [NSLocalizedDescriptionKey : "No data received from downloader."])
         }
 
         // 3. - 7. Generate the code
         let generatedOutput = try self.generateFromData(data)
 
         // 8. Write to disk (optionally)
-        if let outputPath: NSString = settings.outputPath {
-            let path: NSString   = outputPath.stringByExpandingTildeInPath
-            let jsonFile         = path.stringByAppendingPathComponent(self.modelName + ".json")
-            let translationsFile = path.stringByAppendingPathComponent(self.modelName + ".swift")
+        if let outputPath: NSString = settings.outputPath as NSString? {
+            let path: NSString   = outputPath.expandingTildeInPath as NSString
+            let jsonFile         = path.appendingPathComponent(self.modelName + ".json")
+            let translationsFile = path.appendingPathComponent(self.modelName + ".swift")
 
             // Save translations
-            try generatedOutput.code.writeToFile(translationsFile, atomically: true, encoding: NSUTF8StringEncoding)
+            try generatedOutput.code.write(toFile: translationsFile, atomically: true, encoding: String.Encoding.utf8)
 
             // Save json
-            let jsonData = try NSJSONSerialization.dataWithJSONObject(generatedOutput.JSON, options: .PrettyPrinted)
-            try jsonData.writeToFile(jsonFile, options: .DataWritingAtomic)
+            let jsonData = try JSONSerialization.data(withJSONObject: generatedOutput.JSON, options: .prettyPrinted)
+            try jsonData.write(to: URL(fileURLWithPath: jsonFile), options: .atomic)
         }
 
         // 7. Finish
         return generatedOutput.code
     }
 
-    static func generateFromData(data: NSData) throws -> (code: String, JSON: [String: AnyObject]) {
+    static func generateFromData(_ data: Data) throws -> (code: String, JSON: [String: AnyObject]) {
         // 3. Parse translations
         let parsed = try Parser.parseResponseData(data)
 
@@ -87,7 +87,7 @@ struct Generator {
         return (finalString, parsed.JSON)
     }
 
-    private static func generateMainModelFromParserOutput(output: ParserOutput, subModels: String?) throws -> String {
+    fileprivate static func generateMainModelFromParserOutput(_ output: ParserOutput, subModels: String?) throws -> String {
         var indent = Indentation(level: 0)
 
         var modelString = "public final class \(self.modelName): Translatable {\n"
@@ -115,7 +115,7 @@ struct Generator {
         return modelString
     }
 
-    private static func generateSubModelsFromParserOutput(output: ParserOutput) throws -> (models: String, extensions: String) {
+    fileprivate static func generateSubModelsFromParserOutput(_ output: ParserOutput) throws -> (models: String, extensions: String) {
         var modelsString = ""
         var extensionsString = ""
 
@@ -149,16 +149,16 @@ struct Generator {
         return (modelsString, extensionsString)
     }
 
-    private static func templateString() throws -> String {
-        let templatePath = NSBundle(forClass: TranslationsGenerator.self).pathForResource("ImplementationTemplate", ofType: "txt")
+    fileprivate static func templateString() throws -> String {
+        let templatePath = Bundle(for: TranslationsGenerator.self).path(forResource: "ImplementationTemplate", ofType: "txt")
         guard let path = templatePath else {
-            throw NSError(domain: self.errorDomain, code: ErrorCode.GeneratorError.rawValue,
+            throw NSError(domain: self.errorDomain, code: ErrorCode.generatorError.rawValue,
                 userInfo: [NSLocalizedDescriptionKey : "Internal inconsistency error. Couldn't find template file to insert generated code into."])
         }
 
         var string = try String(contentsOfFile: path)
-        let dateString = NSDateFormatter.localizedStringFromDate(NSDate(), dateStyle: .ShortStyle, timeStyle: .LongStyle)
-        string = string.stringByReplacingOccurrencesOfString("#DATE#", withString: dateString)
+        let dateString = DateFormatter.localizedString(from: Date(), dateStyle: .short, timeStyle: .long)
+        string = string.replacingOccurrences(of: "#DATE#", with: dateString)
 
         return string
     }

nstack-translations-generator/Classes/TranslationsGenerator/GeneratorSettings.swift

@@ -16,9 +16,9 @@ struct GeneratorSettings {
 }
 
 extension GeneratorSettings {
-    static func parseFromArguments(arguments: [String]) throws -> GeneratorSettings {
+    static func parseFromArguments(_ arguments: [String]) throws -> GeneratorSettings {
         if arguments.count < 5 || arguments.count > 8 {
-            throw NSError(domain: Generator.errorDomain, code: ErrorCode.WrongArguments.rawValue,
+            throw NSError(domain: Generator.errorDomain, code: ErrorCode.wrongArguments.rawValue,
                 userInfo: [NSLocalizedDescriptionKey : "Error, wrong number of arguments passed."])
         }
 
@@ -45,22 +45,22 @@ extension GeneratorSettings {
         }
 
         // Get plist path if present
-        if let plistPaths = parsedArguments["-plist"] where plistPaths.count == 1 {
+        if let plistPaths = parsedArguments["-plist"] , plistPaths.count == 1 {
             plistPath = plistPaths[0]
         }
 
         // Get keys if present
-        if let keysArray = parsedArguments["-keys"] where keysArray.count == 2 {
+        if let keysArray = parsedArguments["-keys"] , keysArray.count == 2 {
             keys = (keysArray[0], keysArray[1])
         }
 
         // Check if we have keys
         if plistPath == nil && (keys?.appKey == nil || keys?.appID == nil) {
-            throw NSError(domain: Generator.errorDomain, code: ErrorCode.WrongArguments.rawValue,
+            throw NSError(domain: Generator.errorDomain, code: ErrorCode.wrongArguments.rawValue,
                 userInfo: [NSLocalizedDescriptionKey : "No or multiple plist paths, or wrong keys format."])
         }
 
-        if let flat = parsedArguments["-flat"] where flat.count == 1 && flat[0] == "1" {
+        if let flat = parsedArguments["-flat"] , flat.count == 1 && flat[0] == "1" {
             flatTranslations = true
         }
 
@@ -73,7 +73,7 @@ extension GeneratorSettings {
         } else if let plistPath = plistPath {
             return try DownloaderSettings.settingsFromConfigurationFile(plistPath: plistPath)
         }
-        throw NSError(domain: Generator.errorDomain, code: ErrorCode.GeneratorError.rawValue,
+        throw NSError(domain: Generator.errorDomain, code: ErrorCode.generatorError.rawValue,
             userInfo: [NSLocalizedDescriptionKey : "Couldn't generate downloader settings from arguments."])
     }
-}
+}

nstack-translations-generator/Classes/TranslationsGenerator/Parser.swift

@@ -16,10 +16,10 @@ struct ParserOutput {
 }
 
 struct Parser {
-    static func parseResponseData(data: NSData) throws -> ParserOutput {
-        let object = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions(rawValue: 0))
+    static func parseResponseData(_ data: Data) throws -> ParserOutput {
+        let object = try JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions(rawValue: 0))
         guard let dictionary = object as? [String: AnyObject] else {
-            throw NSError(domain: Generator.errorDomain, code: ErrorCode.ParserError.rawValue, userInfo:
+            throw NSError(domain: Generator.errorDomain, code: ErrorCode.parserError.rawValue, userInfo:
                 [NSLocalizedDescriptionKey : "The data isn't in the correct format. Translations JSON file should have a dictionary as it's root object."])
         }
 
@@ -31,18 +31,18 @@ struct Parser {
             content = t
         }
 
-        guard let langsDictionary = content, firstLanguage = langsDictionary.values.first as? [String: AnyObject] else {
-            throw NSError(domain: Generator.errorDomain, code: ErrorCode.ParserError.rawValue, userInfo:
+        guard let langsDictionary = content, let firstLanguage = langsDictionary.values.first as? [String: AnyObject] else {
+            throw NSError(domain: Generator.errorDomain, code: ErrorCode.parserError.rawValue, userInfo:
                 [NSLocalizedDescriptionKey : "Parsed JSON wasn't containing translations data."])
         }
 
         // Fix for default
         var language = firstLanguage
         if let object = language["default"] {
-            language.removeValueForKey("default")
+            language.removeValue(forKey: "default")
             language["defaultSection"] = object
         }
 
         return ParserOutput(JSON: dictionary, mainKeys: language.map({ return $0.0 }), language: language, isFlat: language is [String: String])
     }
-}
+}