Automatic migration to Swift 2.0

Converted using Xcode 7.0 GM release (Version 7A218).

Author: jonah-williams

Validator.xcodeproj/project.pbxproj

@@ -222,6 +222,7 @@
 		62D1AE0F1A1E6D4400E4DFF8 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftMigration = 0700;
 				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = jpotts18;
 				TargetAttributes = {

Validator/FloatRule.swift

@@ -17,9 +17,9 @@ public class FloatRule:Rule {
     }
 
     public func validate(value: String) -> Bool {
-        let regex = NSRegularExpression(pattern: "[-+]?(\\d*[.])?\\d+", options: nil, error: nil)
+        let regex = try? NSRegularExpression(pattern: "[-+]?(\\d*[.])?\\d+", options: [])
         if let regex = regex {
-            let match = regex.numberOfMatchesInString(value, options: nil, range: NSRange(location: 0, length: count(value)))
+            let match = regex.numberOfMatchesInString(value, options: [], range: NSRange(location: 0, length: value.characters.count))
             return match == 1
         }
         return false

Validator/FullNameRule.swift

@@ -18,7 +18,7 @@ public class FullNameRule : Rule {
     }
 
     public func validate(value: String) -> Bool {
-        var nameArray: [String] = split(value) { $0 == " " }
+        let nameArray: [String] = value.characters.split { $0 == " " }.map { String($0) }
         return nameArray.count >= 2
     }
 

Validator/MaxLengthRule.swift

@@ -20,7 +20,7 @@ public class MaxLengthRule: Rule {
     }
 
     public func validate(value: String) -> Bool {
-        return count(value) <= DEFAULT_LENGTH
+        return value.characters.count <= DEFAULT_LENGTH
     }
 
     public func errorMessage() -> String {

Validator/MinLengthRule.swift

@@ -21,7 +21,7 @@ public class MinLengthRule: Rule {
     }
 
     public func validate(value: String) -> Bool {
-        return count(value) >= DEFAULT_LENGTH
+        return value.characters.count >= DEFAULT_LENGTH
     }
 
     public func errorMessage() -> String {

Validator/Validator.swift

@@ -30,7 +30,7 @@ public class Validator {
         errors = [:]
 
         for (textField, rule) in validations {
-            if var error = rule.validateField() {
+            if let error = rule.validateField() {
                 errors[textField] = error
 
                 // let the user transform the field if they want
@@ -49,7 +49,7 @@ public class Validator {
 
     // MARK: Using Keys
 
-    public func styleTransformers(#success:((validationRule:ValidationRule)->Void)?, error:((validationError:ValidationError)->Void)?) {
+    public func styleTransformers(success success:((validationRule:ValidationRule)->Void)?, error:((validationError:ValidationError)->Void)?) {
         self.successStyleTransform = success
         self.errorStyleTransform = error
     }

Validator/ViewController.swift

@@ -34,15 +34,15 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
         self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: "hideKeyboard"))
 
         validator.styleTransformers(success:{ (validationRule) -> Void in
-            println("here")
+            print("here")
                 // clear error label
                 validationRule.errorLabel?.hidden = true
                 validationRule.errorLabel?.text = ""
                 validationRule.textField.layer.borderColor = UIColor.greenColor().CGColor
                 validationRule.textField.layer.borderWidth = 0.5
 
             }, error:{ (validationError) -> Void in
-                println("error")
+                print("error")
                 validationError.errorLabel?.hidden = false
                 validationError.errorLabel?.text = validationError.errorMessage
                 validationError.textField.layer.borderColor = UIColor.redColor().CGColor
@@ -57,22 +57,22 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
     }
 
     @IBAction func submitTapped(sender: AnyObject) {
-        println("Validating...")
+        print("Validating...")
         validator.validate(self)
     }
 
     // MARK: ValidationDelegate Methods
 
     func validationSuccessful() {
-        println("Validation Success!")
-        var alert = UIAlertController(title: "Success", message: "You are validated!", preferredStyle: UIAlertControllerStyle.Alert)
-        var defaultAction = UIAlertAction(title: "OK", style: .Default, handler: nil)
+        print("Validation Success!")
+        let alert = UIAlertController(title: "Success", message: "You are validated!", preferredStyle: UIAlertControllerStyle.Alert)
+        let defaultAction = UIAlertAction(title: "OK", style: .Default, handler: nil)
         alert.addAction(defaultAction)
         self.presentViewController(alert, animated: true, completion: nil)
 
     }
     func validationFailed(errors:[UITextField:ValidationError]) {
-        println("Validation FAILED!")
+        print("Validation FAILED!")
     }
 
     func hideKeyboard(){

ValidatorTests/ValidatorTests.swift

@@ -35,15 +35,15 @@ class ValidatorTests: XCTestCase {
     let LEN_20 = "Paint the cat orange"
 
     let REGISTER_TXT_FIELD = UITextField()
-    let REGISTER_VALIDATOR = Validator()
+    let REGISTER_VALIDATOR = Validator
     let REGISTER_RULES = [Rule]()
 
     let UNREGISTER_TXT_FIELD = UITextField()
-    let UNREGISTER_VALIDATOR = Validator()
+    let UNREGISTER_VALIDATOR = Validator
     let UNREGISTER_RULES = [Rule]()
 
     let UNREGISTER_ERRORS_TXT_FIELD = UITextField()
-    let UNREGISTER_ERRORS_VALIDATOR = Validator()
+    let UNREGISTER_ERRORS_VALIDATOR = Validator
 
     let ERROR_LABEL = UILabel()