Merge pull request #161 from jpotts18/swift-3

Swift 3

Author: davepatterson

.travis.yml

@@ -1,15 +1,16 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode8
+xcode_sdk: iphonesimulator10.0
+xcode_project: Validator.xcodeproj
+xcode_scheme: Validator
 
 before_install:
-
+  - gem install cocoapods -v '0.32.1'
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
 
 script:
-
+  - xcodebuild clean build test -project Validator.xcodeproj -scheme Validator -sdk iphonesimulator -destination "platform=iOS Simulator,OS=10.0,name=iPhone 6" -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO | xcpretty
   - pod lib lint
-  - xcodebuild clean build test -project Validator.xcodeproj -scheme Validator -sdk iphonesimulator9.1 -destination "OS=9.1,name=iPhone 6" -enableCodeCoverage YES | xcpretty
-
 after_success:
 
   - bash <(curl -s https://codecov.io/bash)

SwiftValidator/Core/Validatable.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public typealias ValidatableField = protocol<AnyObject, Validatable>
+public typealias ValidatableField = AnyObject & Validatable
 
 public protocol Validatable {
 

SwiftValidator/Core/ValidationDelegate.swift

@@ -23,5 +23,5 @@ public protocol ValidationDelegate {
 
      - returns: No return value.
      */
-    func validationFailed(errors: [(Validatable, ValidationError)])
+    func validationFailed(_ errors: [(Validatable, ValidationError)])
 }

SwiftValidator/Core/Validator.swift

@@ -20,9 +20,9 @@ public class Validator {
     /// Dictionary to hold fields by their object identifiers
     private var fields = ValidatorDictionary<Validatable>()
     /// Variable that holds success closure to display positive status of field.
-    private var successStyleTransform:((validationRule:ValidationRule)->Void)?
+    private var successStyleTransform:((_ validationRule:ValidationRule)->Void)?
     /// Variable that holds error closure to display negative status of field.
-    private var errorStyleTransform:((validationError:ValidationError)->Void)?
+    private var errorStyleTransform:((_ validationError:ValidationError)->Void)?
     /// - returns: An initialized object, or nil if an object could not be created for some reason that would not result in an exception.
     public init(){}
 
@@ -44,13 +44,13 @@ public class Validator {
 
                 // let the user transform the field if they want
                 if let transform = self.errorStyleTransform {
-                    transform(validationError: error)
+                    transform(error)
                 }
             } else {
                 // No error
                 // let the user transform the field if they want
                 if let transform = self.successStyleTransform {
-                    transform(validationRule: rule)
+                    transform(rule)
                 }
             }
         }
@@ -65,22 +65,22 @@ public class Validator {
     - parameter field: Holds validator field data.
     - returns: No return value.
     */
-    public func validateField(field: ValidatableField, callback: (error:ValidationError?) -> Void){
+    public func validateField(_ field: ValidatableField, callback: (_ error:ValidationError?) -> Void){
         if let fieldRule = validations[field] {
             if let error = fieldRule.validateField() {
                 errors[field] = error
                 if let transform = self.errorStyleTransform {
-                    transform(validationError: error)
+                    transform(error)
                 }
-                callback(error: error)
+                callback(error)
             } else {
                 if let transform = self.successStyleTransform {
-                    transform(validationRule: fieldRule)
+                    transform(fieldRule)
                 }
-                callback(error: nil)
+                callback(nil)
             }
         } else {
-            callback(error: nil)
+            callback(nil)
         }
     }
 
@@ -93,7 +93,7 @@ public class Validator {
     - parameter error: A closure which is called with validationError, an object that holds validation error data
     - returns: No return value
     */
-    public func styleTransformers(success success:((validationRule:ValidationRule)->Void)?, error:((validationError:ValidationError)->Void)?) {
+    public func styleTransformers(success:((_ validationRule:ValidationRule)->Void)?, error:((_ validationError:ValidationError)->Void)?) {
         self.successStyleTransform = success
         self.errorStyleTransform = error
     }
@@ -106,7 +106,7 @@ public class Validator {
      - parameter rules: A Rule array that holds different rules that apply to said field.
      - returns: No return value
      */
-    public func registerField(field: ValidatableField, errorLabel:UILabel? = nil, rules:[Rule]) {
+    public func registerField(_ field: ValidatableField, errorLabel:UILabel? = nil, rules:[Rule]) {
         validations[field] = ValidationRule(field: field, rules:rules, errorLabel:errorLabel)
         fields[field] = field
     }
@@ -117,7 +117,7 @@ public class Validator {
      - parameter field: field used to locate and remove field from validator.
      - returns: No return value
      */
-    public func unregisterField(field:ValidatableField) {
+    public func unregisterField(_ field:ValidatableField) {
         validations.removeValueForKey(field)
         errors.removeValueForKey(field)
     }
@@ -127,7 +127,7 @@ public class Validator {
 
      - returns: No return value.
      */
-    public func validate(delegate:ValidationDelegate) {
+    public func validate(_ delegate:ValidationDelegate) {
 
         self.validateAllFields()
 
@@ -145,10 +145,10 @@ public class Validator {
      - parameter callback: A closure which is called with errors, a dictionary of type Validatable:ValidationError.
      - returns: No return value.
      */
-    public func validate(callback:(errors:[(Validatable, ValidationError)])->Void) -> Void {
+    public func validate(_ callback:(_ errors:[(Validatable, ValidationError)])->Void) -> Void {
 
         self.validateAllFields()
 
-        callback(errors: errors.map { (fields[$1.field]!, $1) } )
+        callback(errors.map { (fields[$1.field]!, $1) } )
     }
 }

SwiftValidator/Core/ValidatorDictionary.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct ValidatorDictionary<T> : SequenceType {
+public struct ValidatorDictionary<T> : Sequence {
 
     private var innerDictionary: [ObjectIdentifier: T] = [:];
 
@@ -31,15 +31,15 @@ public struct ValidatorDictionary<T> : SequenceType {
         innerDictionary.removeAll()        
     }
 
-    public mutating func removeValueForKey(key: ValidatableField) {
-        innerDictionary.removeValueForKey(ObjectIdentifier(key))
+    public mutating func removeValueForKey(_ key: ValidatableField) {
+        innerDictionary.removeValue(forKey: ObjectIdentifier(key))
     }
 
     public var isEmpty: Bool {
         return innerDictionary.isEmpty
     }
 
-    public func generate() -> DictionaryGenerator<ObjectIdentifier ,T> {
-        return innerDictionary.generate()
+    public func makeIterator() -> DictionaryIterator<ObjectIdentifier ,T> {
+        return innerDictionary.makeIterator()
     }
 }

SwiftValidator/Rules/AlphaNumericRule.swift

@@ -21,6 +21,6 @@ public class AlphaNumericRule: CharacterSetRule {
      - returns: An initialized object, or nil if an object could not be created for some reason that would not result in an exception.
      */
     public init(message: String = "Enter valid numeric characters") {
-        super.init(characterSet: NSCharacterSet.alphanumericCharacterSet(), message: message)
+        super.init(characterSet: CharacterSet.alphanumerics, message: message)
     }
-}
+}

SwiftValidator/Rules/AlphaRule.swift

@@ -21,6 +21,6 @@ public class AlphaRule: CharacterSetRule {
      - returns: An initialized object, or nil if an object could not be created for some reason.
      */
     public init(message: String = "Enter valid alphabetic characters") {
-        super.init(characterSet: NSCharacterSet.letterCharacterSet(), message: message)
+        super.init(characterSet: CharacterSet.letters, message: message)
     }
-}
+}

SwiftValidator/Rules/CharacterSetRule.swift

@@ -13,7 +13,7 @@ import Foundation
  */
 public class CharacterSetRule: Rule {
     /// NSCharacter that hold set of valid characters to hold
-    private let characterSet: NSCharacterSet
+    private let characterSet: CharacterSet
     /// String that holds error message
     private var message: String
 
@@ -24,7 +24,7 @@ public class CharacterSetRule: Rule {
      - parameter message: String of error message.
      - returns: An initialized object, or nil if an object could not be created for some reason that would not result in an exception.
      */
-    public init(characterSet: NSCharacterSet, message: String = "Enter valid alpha") {
+    public init(characterSet: CharacterSet, message: String = "Enter valid alpha") {
         self.characterSet = characterSet
         self.message = message
     }
@@ -35,9 +35,9 @@ public class CharacterSetRule: Rule {
      - parameter value: String to checked for validation.
      - returns: Boolean value. True if validation is successful; False if validation fails.
      */
-    public func validate(value: String) -> Bool {
+    public func validate(_ value: String) -> Bool {
         for uni in value.unicodeScalars {
-            if !characterSet.longCharacterIsMember(uni.value) {
+            guard let uniVal = UnicodeScalar(uni.value), characterSet.contains(uniVal) else {
                 return false
             }
         }
@@ -52,4 +52,4 @@ public class CharacterSetRule: Rule {
     public func errorMessage() -> String {
         return message
     }
-}
+}

SwiftValidator/Rules/ConfirmRule.swift

@@ -37,7 +37,7 @@ public class ConfirmationRule: Rule {
      - parameter value: String to checked for validation.
      - returns: A boolean value. True if validation is successful; False if validation fails.
      */
-    public func validate(value: String) -> Bool {
+    public func validate(_ value: String) -> Bool {
         return confirmField.validationText == value
     }
 
@@ -49,4 +49,4 @@ public class ConfirmationRule: Rule {
     public func errorMessage() -> String {
         return message
     }
-}
+}

SwiftValidator/Rules/ExactLengthRule.swift

@@ -26,7 +26,7 @@ public class ExactLengthRule : Rule {
      */
     public init(length: Int, message : String = "Must be exactly %ld characters long"){
         self.length = length
-        self.message = NSString(format: message, self.length) as String
+        self.message = String(format: message, self.length)
     }
 
     /**
@@ -35,7 +35,7 @@ public class ExactLengthRule : Rule {
      - parameter value: String to checked for validation.
      - returns: A boolean value. True if validation is successful; False if validation fails.
      */
-    public func validate(value: String) -> Bool {
+    public func validate(_ value: String) -> Bool {
         return value.characters.count == length
     }
 
@@ -47,4 +47,4 @@ public class ExactLengthRule : Rule {
     public func errorMessage() -> String {
         return message
     }
-}
+}