diff --git a/Faker.xcodeproj/project.pbxproj b/Faker.xcodeproj/project.pbxproj index 4f8b71e..5fd7715 100644 --- a/Faker.xcodeproj/project.pbxproj +++ b/Faker.xcodeproj/project.pbxproj @@ -283,11 +283,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = Apostle; TargetAttributes = { F6C07BCF1B820BD2004E8BDD = { CreatedOnToolsVersion = 6.4; + LastSwiftMigration = 0800; }; F6C07BDA1B820BD2004E8BDD = { CreatedOnToolsVersion = 6.4; @@ -389,8 +390,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -438,8 +441,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -459,6 +464,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.4; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -470,6 +476,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -482,6 +489,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -489,6 +497,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -500,6 +509,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "nl.apostle.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Faker.xcodeproj/xcshareddata/xcschemes/Faker.xcscheme b/Faker.xcodeproj/xcshareddata/xcschemes/Faker.xcscheme index 10b54d8..0abec22 100644 --- a/Faker.xcodeproj/xcshareddata/xcschemes/Faker.xcscheme +++ b/Faker.xcodeproj/xcshareddata/xcschemes/Faker.xcscheme @@ -1,6 +1,6 @@ String { + open class func company() -> String { return dataProvider().formats().random()! } @@ -61,11 +61,11 @@ public class Company { - returns: Returns a random company suffix. */ - public class func companySuffix() -> String { + open class func companySuffix() -> String { return dataProvider().suffixes().random()! } - private class func dataProvider() -> Provider { + fileprivate class func dataProvider() -> Provider { return provider ?? Provider() } } diff --git a/Source/Classes/Internet.swift b/Source/Classes/Internet.swift index c0566b7..7b52857 100644 --- a/Source/Classes/Internet.swift +++ b/Source/Classes/Internet.swift @@ -22,10 +22,10 @@ import Foundation -public class Internet { +open class Internet { // MARK: Provider - public class Provider { + open class Provider { public init() { // noop } @@ -77,7 +77,7 @@ public class Internet { // MARK: Variables - public static var provider : Provider? + open static var provider : Provider? // MARK: Generators @@ -89,7 +89,7 @@ public class Internet { - returns: Returns a random e-mail address. */ - public class func email() -> String { + open class func email() -> String { return dataProvider().emailFormats().random()! } @@ -98,7 +98,7 @@ public class Internet { - returns: Returns a random safe e-mail address. */ - public class func safeEmail() -> String { + open class func safeEmail() -> String { return "\(username())@\(safeEmailDomain())" } @@ -110,7 +110,7 @@ public class Internet { - returns: Returns a random free e-mail address. */ - public class func freeEmail() -> String { + open class func freeEmail() -> String { return "\(username())@\(freeEmailDomain())" } @@ -122,7 +122,7 @@ public class Internet { - returns: Returns a random company e-mail address. */ - public class func companyEmail() -> String { + open class func companyEmail() -> String { return "\(username())@\(domainName())" } @@ -131,7 +131,7 @@ public class Internet { - returns: Returns a random free e-mail domain. */ - public class func freeEmailDomain() -> String { + open class func freeEmailDomain() -> String { return dataProvider().freeEmailDomains().random()! } @@ -140,7 +140,7 @@ public class Internet { - returns: Returns a random safe e-mail domain. */ - public class func safeEmailDomain() -> String { + open class func safeEmailDomain() -> String { return [ "example.com", "example.org", "example.net" ].random()! } @@ -149,10 +149,10 @@ public class Internet { - returns: Returns a random username. */ - public class func username() -> String { + open class func username() -> String { let result = dataProvider().usernameFormats().random()! - return result.numerify().lexify().lowercaseString.stringByReplacingOccurrencesOfString(" ", withString: ".") + return result.numerify().lexify().lowercased().replacingOccurrences(of: " ", with: ".") } /** @@ -165,8 +165,8 @@ public class Internet { - returns: Returns a password of at least `minLength` and at most `maxLength` characters. */ - public class func password(minLength : Int = 6, maxLength : Int = 20) -> String { - let format = Array(count: Int.random(minLength, max: maxLength), repeatedValue: "*").joinWithSeparator("") + open class func password(minLength : Int = 6, maxLength : Int = 20) -> String { + let format = Array(repeating: "*", count: Int.random(min: minLength, max: maxLength)).joined(separator: "") return format.lexify() } @@ -176,7 +176,7 @@ public class Internet { - returns: Returns a random domain name. */ - public class func domainName() -> String { + open class func domainName() -> String { return "\(domainWord()).\(tld())" } @@ -185,8 +185,8 @@ public class Internet { - returns: Returns a random domain word. */ - public class func domainWord() -> String { - return "\(Person.lastName())".lowercaseString.stringByReplacingOccurrencesOfString(" ", withString: "-") + open class func domainWord() -> String { + return "\(Person.lastName())".lowercased().replacingOccurrences(of: " ", with: "-") } /** @@ -194,7 +194,7 @@ public class Internet { - returns: Returns a random TLD. */ - public class func tld() -> String { + open class func tld() -> String { return dataProvider().tlds().random()! } @@ -203,7 +203,7 @@ public class Internet { - returns: Returns a random URL. */ - public class func url() -> String { + open class func url() -> String { return dataProvider().urlFormats().random()! } @@ -216,12 +216,12 @@ public class Internet { - returns: Returns a random slug of `nbWords` words. */ - public class func slug(nbWords : Int = 6, variable : Bool = true) -> String { + open class func slug(_ nbWords : Int = 6, variable : Bool = true) -> String { if nbWords <= 0 { return "" } - return Lorem.words(variable ? nbWords.randomize(40) : nbWords).joinWithSeparator("-").lowercaseString + return Lorem.words(variable ? nbWords.randomize(40) : nbWords).joined(separator: "-").lowercased() } /** @@ -229,13 +229,13 @@ public class Internet { - returns: Returns a random IPv4 address. */ - public class func ipv4() -> String { + open class func ipv4() -> String { return [ - Int.random(0, max: 255), - Int.random(0, max: 255), - Int.random(0, max: 255), - Int.random(0, max: 255) - ].map(String.init).joinWithSeparator(".") + Int.random(min: 0, max: 255), + Int.random(min: 0, max: 255), + Int.random(min: 0, max: 255), + Int.random(min: 0, max: 255) + ].map(String.init).joined(separator: ".") } /** @@ -243,10 +243,10 @@ public class Internet { - returns: Returns a random IPv6 address. */ - public class func ipv6() -> String { - let components = (0..<8).map { _ in Int.random(0, max: 65535) } + open class func ipv6() -> String { + let components = (0..<8).map { _ in Int.random(min: 0, max: 65535) } - return components.map({ String(format: "%04x", arguments: [ $0 ]) }).joinWithSeparator(":") + return components.map({ String(format: "%04x", arguments: [ $0 ]) }).joined(separator: ":") } /** @@ -254,19 +254,19 @@ public class Internet { - returns: Returns a random local IPv4 address. */ - public class func localIpv4() -> String { + open class func localIpv4() -> String { var prefix : String = "" var components : [String] = [String]() - if Int.random(0, max: 1) == 0 { + if Int.random(min: 0, max: 1) == 0 { prefix = "10." - components = (0..<3).map({ _ in Int.random(0, max: 255) }).map(String.init) + components = (0..<3).map({ _ in Int.random(min: 0, max: 255) }).map(String.init) } else { prefix = "192.168." - components = (0..<2).map({ _ in Int.random(0, max: 255) }).map(String.init) + components = (0..<2).map({ _ in Int.random(min: 0, max: 255) }).map(String.init) } - return prefix + components.joinWithSeparator(".") + return prefix + components.joined(separator: ".") } /** @@ -274,13 +274,13 @@ public class Internet { - returns: Returns a random MAC address. */ - public class func mac() -> String { - let components = (0..<6).map { _ in Int.random(0, max: 255) } + open class func mac() -> String { + let components = (0..<6).map { _ in Int.random(min: 0, max: 255) } - return components.map({ String(format: "%02X", arguments: [ $0 ]) }).joinWithSeparator(":") + return components.map({ String(format: "%02X", arguments: [ $0 ]) }).joined(separator: ":") } - private class func dataProvider() -> Provider { + fileprivate class func dataProvider() -> Provider { return provider ?? Provider() } } diff --git a/Source/Classes/Lorem.swift b/Source/Classes/Lorem.swift index 68afa55..357eb1e 100644 --- a/Source/Classes/Lorem.swift +++ b/Source/Classes/Lorem.swift @@ -22,8 +22,8 @@ import Foundation -public class Lorem { - private static let wordList = [ +open class Lorem { + fileprivate static let wordList = [ "alias", "consequatur", "aut", "perferendis", "sit", "voluptatem", "accusantium", "doloremque", "aperiam", "eaque","ipsa", "quae", "ab", "illo", "inventore", "veritatis", "et", "quasi", "architecto", @@ -68,7 +68,7 @@ public class Lorem { - returns: Returns a random word. */ - public class func word() -> String { + open class func word() -> String { return wordList.random()! } @@ -79,7 +79,7 @@ public class Lorem { - returns: Returns an array of `count` words. */ - public class func words(count : Int = 3) -> [String] { + open class func words(_ count : Int = 3) -> [String] { return wordList.random(count) } @@ -90,8 +90,8 @@ public class Lorem { - returns: Returns a string of `count` words. */ - public class func words(count : Int = 3) -> String { - return words(count).joinWithSeparator(" ") + open class func words(_ count : Int = 3) -> String { + return words(count).joined(separator: " ") } /** @@ -103,7 +103,7 @@ public class Lorem { - returns: */ - public class func sentence(nbWords : Int = 6, variable : Bool = true) -> String { + open class func sentence(_ nbWords : Int = 6, variable : Bool = true) -> String { if nbWords <= 0 { return "" } @@ -120,7 +120,7 @@ public class Lorem { - returns: Returns an array of random sentences. */ - public class func sentences(nbSentences : Int = 3) -> [String] { + open class func sentences(_ nbSentences : Int = 3) -> [String] { return (0.. String { - return sentences(nbSentences).joinWithSeparator(" ") + open class func sentences(_ nbSentences : Int = 3) -> String { + return sentences(nbSentences).joined(separator: " ") } /** @@ -145,12 +145,12 @@ public class Lorem { - returns: Returns a paragraph with `nbSentences` random sentences. */ - public class func paragraph(nbSentences : Int = 3, variable : Bool = true) -> String { + open class func paragraph(_ nbSentences : Int = 3, variable : Bool = true) -> String { if nbSentences <= 0 { return "" } - return sentences(variable ? nbSentences.randomize(40) : nbSentences).joinWithSeparator(" ") + return sentences(variable ? nbSentences.randomize(40) : nbSentences).joined(separator: " ") } /** @@ -160,7 +160,7 @@ public class Lorem { - returns: Returns an array of `nbParagraphs` paragraphs. */ - public class func paragraphs(nbParagraphs : Int = 3) -> [String] { + open class func paragraphs(_ nbParagraphs : Int = 3) -> [String] { return (0.. String { - return paragraphs(nbParagraphs).joinWithSeparator("\n\n") + open class func paragraphs(_ nbParagraphs : Int = 3) -> String { + return paragraphs(nbParagraphs).joined(separator: "\n\n") } /** @@ -183,7 +183,7 @@ public class Lorem { - returns: Returns a string of at most `maxNbChars` characters. */ - public class func text(maxNbChars : Int = 200) -> String { + open class func text(_ maxNbChars : Int = 200) -> String { var result : [String] = [] if maxNbChars < 5 { @@ -198,7 +198,7 @@ public class Lorem { size += w.characters.count } - result.popLast() + _ = result.popLast() } } else if maxNbChars < 100 { while result.count == 0 { @@ -210,7 +210,7 @@ public class Lorem { size += s.characters.count } - result.popLast() + _ = result.popLast() } } else { while result.count == 0 { @@ -222,18 +222,18 @@ public class Lorem { size += p.characters.count } - result.popLast() + _ = result.popLast() } } - return result.joinWithSeparator("") + return result.joined(separator: "") } } extension String { var firstCapitalized : String { var string = self - string.replaceRange(string.startIndex...string.startIndex, with: String(string[string.startIndex]).capitalizedString) + string.replaceSubrange(string.startIndex...string.startIndex, with: String(string[string.startIndex]).capitalized) return string } diff --git a/Source/Classes/Person.swift b/Source/Classes/Person.swift index d806f66..dc16266 100644 --- a/Source/Classes/Person.swift +++ b/Source/Classes/Person.swift @@ -22,74 +22,74 @@ import Foundation -public class Person { +open class Person { // MARK: Enums public enum Gender { - case Male - case Female + case male + case female static func sample() -> Gender { - return [Gender.Male,Gender.Female].random()! + return [Gender.male,Gender.female].random()! } } // MARK: Provider - public class Provider { + open class Provider { public init() { // noop } - public func titleFormats() -> [String] { + open func titleFormats() -> [String] { return [ Person.maleTitle(), Person.femaleTitle(), ] } - public func firstNameFormats() -> [String] { + open func firstNameFormats() -> [String] { return [ Person.maleFirstName(), Person.femaleFirstName(), ] } - public func maleNameFormats() -> [String] { + open func maleNameFormats() -> [String] { return [ "\(Person.maleFirstName()) \(Person.lastName())", ] } - public func femaleNameFormats() -> [String] { + open func femaleNameFormats() -> [String] { return [ "\(Person.femaleFirstName()) \(Person.lastName())" ] } - public func lastNames() -> [String] { + open func lastNames() -> [String] { return [ "Doe" ] } - public func maleFirstNames() -> [String] { + open func maleFirstNames() -> [String] { return [ "John" ] } - public func maleTitles() -> [String] { + open func maleTitles() -> [String] { return [ "Mr.", "Dr.", "Prof." ] } - public func femaleFirstNames() -> [String] { + open func femaleFirstNames() -> [String] { return [ "Jane" ] } - public func femaleTitles() -> [String] { + open func femaleTitles() -> [String] { return [ "Mrs.", "Ms.", "Miss", "Dr.", "Prof." ] } } // MARK: Variables - public static var provider : Provider? + open static var provider : Provider? // MARK: Generators @@ -100,10 +100,10 @@ public class Person { - returns: Returns a random name for a person of the given gender. */ - public class func name(gender : Gender? = nil) -> String { + open class func name(_ gender : Gender? = nil) -> String { switch gender ?? Gender.sample() { - case .Male: return dataProvider().maleNameFormats().random()! - case .Female: return dataProvider().femaleNameFormats().random()! + case .male: return dataProvider().maleNameFormats().random()! + case .female: return dataProvider().femaleNameFormats().random()! } } @@ -115,10 +115,10 @@ public class Person { - returns: Returns a random first name for a person of the given gender. */ - public class func firstName(gender : Gender? = nil) -> String { + open class func firstName(_ gender : Gender? = nil) -> String { switch gender ?? Gender.sample() { - case .Male: return maleFirstName() - case .Female: return femaleFirstName() + case .male: return maleFirstName() + case .female: return femaleFirstName() } } @@ -127,7 +127,7 @@ public class Person { - returns: Returns a random last name. */ - public class func lastName() -> String { + open class func lastName() -> String { return dataProvider().lastNames().random()! } @@ -138,10 +138,10 @@ public class Person { - returns: Returns a random title for a person of the given gender. */ - public class func title(gender : Gender? = nil) -> String { + open class func title(_ gender : Gender? = nil) -> String { switch gender ?? Gender.sample() { - case .Male: return maleTitle() - case .Female: return femaleTitle() + case .male: return maleTitle() + case .female: return femaleTitle() } } @@ -150,7 +150,7 @@ public class Person { - returns: Returns a random title for a male person. */ - public class func maleTitle() -> String { + open class func maleTitle() -> String { return dataProvider().maleTitles().random()! } @@ -159,7 +159,7 @@ public class Person { - returns: Returns a random male first name. */ - public class func maleFirstName() -> String { + open class func maleFirstName() -> String { return dataProvider().maleFirstNames().random()! } @@ -168,7 +168,7 @@ public class Person { - returns: Returns a random title for a female person. */ - public class func femaleTitle() -> String { + open class func femaleTitle() -> String { return dataProvider().femaleTitles().random()! } @@ -177,11 +177,11 @@ public class Person { - returns: Returns a random female first name. */ - public class func femaleFirstName() -> String { + open class func femaleFirstName() -> String { return dataProvider().femaleFirstNames().random()! } - private class func dataProvider() -> Provider { + fileprivate class func dataProvider() -> Provider { return provider ?? Provider() } } diff --git a/Source/Classes/Uuid.swift b/Source/Classes/Uuid.swift index 32e93fe..35a6808 100644 --- a/Source/Classes/Uuid.swift +++ b/Source/Classes/Uuid.swift @@ -22,13 +22,13 @@ import Foundation -public class Uuid { +open class Uuid { /** Return a random UUID (version 4) - returns: Returns a random version 4 UUID. */ - public class func uuid() -> String { - return NSUUID().UUIDString.lowercaseString + open class func uuid() -> String { + return NSUUID().uuidString.lowercased() } } diff --git a/Source/Configuration.swift b/Source/Configuration.swift index 2a6cee8..4da9b39 100644 --- a/Source/Configuration.swift +++ b/Source/Configuration.swift @@ -22,9 +22,9 @@ import Foundation -public class Configuration { - public class func localize(locale : NSLocale? = nil) { - let localization = locale != nil ? locale!.localeIdentifier : NSLocale.currentLocale().localeIdentifier +open class Configuration { + open class func localize(_ locale : Locale? = nil) { + let localization = locale != nil ? locale!.identifier : Locale.current.identifier switch localization { case "en_US": diff --git a/Source/Extensions/Array.swift b/Source/Extensions/Array.swift index 04d0be2..5eed369 100644 --- a/Source/Extensions/Array.swift +++ b/Source/Extensions/Array.swift @@ -61,7 +61,7 @@ public extension Array { - returns: Returns a random subset of `cnt` elements from the array. */ - public func random(cnt : Int = 1) -> [Element] { + public func random(_ cnt : Int = 1) -> [Element] { let result = shuffled() return (cnt > result.count) ? result : Array(result[0.. Character { - return Character(UnicodeScalar(Int.random(97, max: 122))) + return Character(UnicodeScalar(Int.random(min: 97, max: 122))!) } /** @@ -38,6 +38,6 @@ public extension Character { - returns: Returns a random ASCII character. */ public static func randomAscii() -> Character { - return Character(UnicodeScalar(Int.random(33, max: 126))) + return Character(UnicodeScalar(Int.random(min: 33, max: 126))!) } -} \ No newline at end of file +} diff --git a/Source/Extensions/Double.swift b/Source/Extensions/Double.swift index ccdb482..a8a8385 100644 --- a/Source/Extensions/Double.swift +++ b/Source/Extensions/Double.swift @@ -32,8 +32,8 @@ public extension Double { - returns: Returns a random double with `decimals` decimals between `min` and `max`. */ - public static func random(decimals : Int? = nil, min : Double = 0, max : Double? = nil) -> Double { - let digits = decimals != nil ? decimals! : Int.random(1, max: 9) + public static func random(_ decimals : Int? = nil, min : Double = 0, max : Double? = nil) -> Double { + let digits = decimals != nil ? decimals! : Int.random(min: 1, max: 9) var maximum = max != nil ? max! : Double(Int.number()) var minimum = min @@ -55,9 +55,9 @@ public extension Double { - returns: Returns the value rounded to the given number of decimals. */ - public func decimals(decimals : Int) -> Double { + public func decimals(_ decimals : Int) -> Double { let multiplier = pow(10, Double(decimals)) - - return round(self * multiplier) / multiplier + + return (self * multiplier).rounded() / multiplier } } diff --git a/Source/Extensions/Int.swift b/Source/Extensions/Int.swift index c350b29..d70ddf4 100644 --- a/Source/Extensions/Int.swift +++ b/Source/Extensions/Int.swift @@ -37,7 +37,7 @@ public extension Int { precondition(min <= max, "attempt to call random() with min > max") let diff = UInt(bitPattern: max &- min) - let result = UInt.random(0, max: diff) + let result = UInt.random(min: 0, max: diff) return min + Int(bitPattern: result) } @@ -49,16 +49,16 @@ public extension Int { - returns: Returns a random number with exactly `digits` digits. */ - public static func number(digits : Int? = nil) -> Int { - let nbDigits = digits != nil ? digits! : Int.random(1, max: 9) + public static func number(_ digits : Int? = nil) -> Int { + let nbDigits = digits != nil ? digits! : Int.random(min: 1, max: 9) let maximum = pow(10, Double(nbDigits)) - 1 - let result = Int.random(Int(pow(10, Double(nbDigits - 1))), max: Int(maximum)) + let result = Int.random(min: Int(pow(10, Double(nbDigits - 1))), max: Int(maximum)) return result } - public func randomize(variation : Int) -> Int { - let multiplier = Double(Int.random(100 - variation, max: 100 + variation)) / 100 + public func randomize(_ variation : Int) -> Int { + let multiplier = Double(Int.random(min: 100 - variation, max: 100 + variation)) / 100 let randomized = Double(self) * multiplier return Int(randomized) + 1 @@ -71,7 +71,7 @@ private extension UInt { if min == UInt.min && max == UInt.max { var result : UInt = 0 - arc4random_buf(&result, sizeofValue(result)) + arc4random_buf(&result, MemoryLayout.size(ofValue: result)) return result } else { @@ -80,7 +80,7 @@ private extension UInt { var result : UInt = 0 repeat { - arc4random_buf(&result, sizeofValue(result)) + arc4random_buf(&result, MemoryLayout.size(ofValue: result)) } while result >= limit result = result % range diff --git a/Source/Extensions/NSDate.swift b/Source/Extensions/NSDate.swift index cb67123..0b0211f 100644 --- a/Source/Extensions/NSDate.swift +++ b/Source/Extensions/NSDate.swift @@ -22,7 +22,7 @@ import Foundation -public extension NSDate { +public extension Date { /** Generate a random date and time between two time intervals. @@ -31,7 +31,7 @@ public extension NSDate { - returns: Returns a random date and time between two time intervals. */ - public static func random(min : NSTimeInterval? = nil, max : NSTimeInterval? = nil) -> NSDate { + public static func random(min : TimeInterval? = nil, max : TimeInterval? = nil) -> Date { var minimum = min != nil ? Int(min!) : Int.random() var maximum = max != nil ? Int(max!) : Int.random() @@ -41,6 +41,6 @@ public extension NSDate { maximum = tmp } - return NSDate(timeIntervalSince1970: NSTimeInterval(Int.random(minimum, max: maximum))) + return Date(timeIntervalSince1970: TimeInterval(Int.random(min: minimum, max: maximum))) } } diff --git a/Source/Extensions/String.swift b/Source/Extensions/String.swift index e238bd1..0997dee 100644 --- a/Source/Extensions/String.swift +++ b/Source/Extensions/String.swift @@ -47,11 +47,11 @@ public extension String { public func numerify() -> String { return characters.map { switch $0 { - case "#": return String(Int.random(0, max: 9)) - case "%": return String(Int.random(1, max: 9)) + case "#": return String(Int.random(min: 0, max: 9)) + case "%": return String(Int.random(min: 1, max: 9)) default: return String($0) } - }.joinWithSeparator("") + }.joined(separator: "") } /** @@ -71,7 +71,7 @@ public extension String { case "*": return String(Character.randomAscii()) default: return String($0) } - }.joinWithSeparator("") + }.joined(separator: "") } /** @@ -82,7 +82,7 @@ public extension String { - returns: Returns an array of strings. */ - public func split(separator : String) -> [String] { - return componentsSeparatedByString(separator) + public func split(_ separator : String) -> [String] { + return components(separatedBy: separator) } } diff --git a/Source/Extensions/UIColor.swift b/Source/Extensions/UIColor.swift index 1452813..5f86d00 100644 --- a/Source/Extensions/UIColor.swift +++ b/Source/Extensions/UIColor.swift @@ -30,11 +30,11 @@ public extension UIColor { - returns: Returns a random color. */ - public static func random(alpha : Double = 1.0) -> UIColor { + public static func random(_ alpha : Double = 1.0) -> UIColor { let (red, green, blue) = ( - Double(Int.random(0, max: 255)), - Double(Int.random(0, max: 255)), - Double(Int.random(0, max: 255)) + Double(Int.random(min: 0, max: 255)), + Double(Int.random(min: 0, max: 255)), + Double(Int.random(min: 0, max: 255)) ) return UIColor( diff --git a/Source/Extensions/UIImage.swift b/Source/Extensions/UIImage.swift index 9fd2a50..536c67d 100644 --- a/Source/Extensions/UIImage.swift +++ b/Source/Extensions/UIImage.swift @@ -62,8 +62,8 @@ public extension UIImage { url += "?\(Int.number(5))" - if let URL = NSURL(string: url) { - if let data = NSData(contentsOfURL: URL) { + if let URL = URL(string: url) { + if let data = try? Data(contentsOf: URL) { return UIImage(data: data) } } @@ -83,15 +83,15 @@ public extension UIImage { - returns: Returns a random avatar. */ public static func avatar( - username : String? = nil, + _ username : String? = nil, size : Int = 256 ) -> UIImage? { let user = username != nil ? username! : Internet.username() let pixels = size > 400 ? 400 : size let url = "http://api.adorable.io/avatars/\(pixels)/\(user)" - if let URL = NSURL(string: url) { - if let data = NSData(contentsOfURL: URL) { + if let URL = URL(string: url) { + if let data = try? Data(contentsOf: URL) { return UIImage(data: data) } } diff --git a/Source/Localizations/en_US/en_US.Company.swift b/Source/Localizations/en_US/en_US.Company.swift index 65a747d..2b697ad 100644 --- a/Source/Localizations/en_US/en_US.Company.swift +++ b/Source/Localizations/en_US/en_US.Company.swift @@ -22,10 +22,10 @@ import Foundation -public extension en_US { - public class Company { - public class Provider : Faker.Company.Provider { - override public func formats() -> [String] { +extension en_US { + open class Company { + open class Provider : Faker.Company.Provider { + override open func formats() -> [String] { return [ "\(Faker.Person.lastName()) \(Faker.Company.companySuffix())", "\(Faker.Person.lastName())-\(Faker.Person.lastName())", @@ -33,7 +33,7 @@ public extension en_US { ] } - override public func suffixes() -> [String] { + override open func suffixes() -> [String] { return [ "Inc", "and Sons", "LLC", "Group", "PLC", "Ltd" ] } } diff --git a/Source/Localizations/en_US/en_US.Person.swift b/Source/Localizations/en_US/en_US.Person.swift index af84b8b..d1a69df 100644 --- a/Source/Localizations/en_US/en_US.Person.swift +++ b/Source/Localizations/en_US/en_US.Person.swift @@ -22,18 +22,18 @@ import Foundation -public extension en_US { - public class Person { - public class Provider : Faker.Person.Provider { - override public func lastNames() -> [String] { +extension en_US { + open class Person { + open class Provider : Faker.Person.Provider { + override open func lastNames() -> [String] { return "Abbott,Abernathy,Abshire,Adams,Altenwerth,Anderson,Ankunding,Armstrong,Auer,Aufderhar,Bahringer,Bailey,Balistreri,Barrows,Bartell,Bartoletti,Barton,Bashirian,Batz,Bauch,Baumbach,Bayer,Beahan,Beatty,Bechtelar,Becker,Bednar,Beer,Beier,Berge,Bergnaum,Bergstrom,Bernhard,Bernier,Bins,Blanda,Blick,Block,Bode,Boehm,Bogan,Bogisich,Borer,Bosco,Botsford,Boyer,Boyle,Bradtke,Brakus,Braun,Breitenberg,Brekke,Brown,Bruen,Buckridge,Carroll,Carter,Cartwright,Casper,Cassin,Champlin,Christiansen,Cole,Collier,Collins,Conn,Connelly,Conroy,Considine,Corkery,Cormier,Corwin,Cremin,Crist,Crona,Cronin,Crooks,Cruickshank,Cummerata,Cummings,Dach,D'Amore,Daniel,Dare,Daugherty,Davis,Deckow,Denesik,Dibbert,Dickens,Dicki,Dickinson,Dietrich,Donnelly,Dooley,Douglas,Doyle,DuBuque,Durgan,Ebert,Effertz,Eichmann,Emard,Emmerich,Erdman,Ernser,Fadel,Fahey,Farrell,Fay,Feeney,Feest,Feil,Ferry,Fisher,Flatley,Frami,Franecki,Friesen,Fritsch,Funk,Gaylord,Gerhold,Gerlach,Gibson,Gislason,Gleason,Gleichner,Glover,Goldner,Goodwin,Gorczany,Gottlieb,Goyette,Grady,Graham,Grant,Green,Greenfelder,Greenholt,Grimes,Gulgowski,Gusikowski,Gutkowski,Gutmann,Haag,Hackett,Hagenes,Hahn,Haley,Halvorson,Hamill,Hammes,Hand,Hane,Hansen,Harber,Harris,Hartmann,Harvey,Hauck,Hayes,Heaney,Heathcote,Hegmann,Heidenreich,Heller,Herman,Hermann,Hermiston,Herzog,Hessel,Hettinger,Hickle,Hilll,Hills,Hilpert,Hintz,Hirthe,Hodkiewicz,Hoeger,Homenick,Hoppe,Howe,Howell,Hudson,Huel,Huels,Hyatt,Jacobi,Jacobs,Jacobson,Jakubowski,Jaskolski,Jast,Jenkins,Jerde,Johns,Johnson,Johnston,Jones,Kassulke,Kautzer,Keebler,Keeling,Kemmer,Kerluke,Kertzmann,Kessler,Kiehn,Kihn,Kilback,King,Kirlin,Klein,Kling,Klocko,Koch,Koelpin,Koepp,Kohler,Konopelski,Koss,Kovacek,Kozey,Krajcik,Kreiger,Kris,Kshlerin,Kub,Kuhic,Kuhlman,Kuhn,Kulas,Kunde,Kunze,Kuphal,Kutch,Kuvalis,Labadie,Lakin,Lang,Langosh,Langworth,Larkin,Larson,Leannon,Lebsack,Ledner,Leffler,Legros,Lehner,Lemke,Lesch,Leuschke,Lind,Lindgren,Littel,Little,Lockman,Lowe,Lubowitz,Lueilwitz,Luettgen,Lynch,Macejkovic,Maggio,Mann,Mante,Marks,Marquardt,Marvin,Mayer,Mayert,McClure,McCullough,McDermott,McGlynn,McKenzie,McLaughlin,Medhurst,Mertz,Metz,Miller,Mills,Mitchell,Moen,Mohr,Monahan,Moore,Morar,Morissette,Mosciski,Mraz,Mueller,Muller,Murazik,Murphy,Murray,Nader,Nicolas,Nienow,Nikolaus,Nitzsche,Nolan,Oberbrunner,O'Connell,O'Conner,O'Hara,O'Keefe,O'Kon,Okuneva,Olson,Ondricka,O'Reilly,Orn,Ortiz,Osinski,Pacocha,Padberg,Pagac,Parisian,Parker,Paucek,Pfannerstill,Pfeffer,Pollich,Pouros,Powlowski,Predovic,Price,Prohaska,Prosacco,Purdy,Quigley,Quitzon,Rath,Ratke,Rau,Raynor,Reichel,Reichert,Reilly,Reinger,Rempel,Renner,Reynolds,Rice,Rippin,Ritchie,Robel,Roberts,Rodriguez,Rogahn,Rohan,Rolfson,Romaguera,Roob,Rosenbaum,Rowe,Ruecker,Runolfsdottir,Runolfsson,Runte,Russel,Rutherford,Ryan,Sanford,Satterfield,Sauer,Sawayn,Schaden,Schaefer,Schamberger,Schiller,Schimmel,Schinner,Schmeler,Schmidt,Schmitt,Schneider,Schoen,Schowalter,Schroeder,Schulist,Schultz,Schumm,Schuppe,Schuster,Senger,Shanahan,Shields,Simonis,Sipes,Skiles,Smith,Smitham,Spencer,Spinka,Sporer,Stamm,Stanton,Stark,Stehr,Steuber,Stiedemann,Stokes,Stoltenberg,Stracke,Streich,Stroman,Strosin,Swaniawski,Swift,Terry,Thiel,Thompson,Tillman,Torp,Torphy,Towne,Toy,Trantow,Tremblay,Treutel,Tromp,Turcotte,Turner,Ullrich,Upton,Vandervort,Veum,Volkman,Von,VonRueden,Waelchi,Walker,Walsh,Walter,Ward,Waters,Watsica,Weber,Wehner,Weimann,Weissnat,Welch,West,White,Wiegand,Wilderman,Wilkinson,Will,Williamson,Willms,Windler,Wintheiser,Wisoky,Wisozk,Witting,Wiza,Wolf,Wolff,Wuckert,Wunsch,Wyman,Yost,Yundt,Zboncak,Zemlak,Ziemann,Zieme,Zulauf".split(",") } - override public func maleFirstNames() -> [String] { + override open func maleFirstNames() -> [String] { return "Aaron,Abdiel,Abdul,Abdullah,Abe,Abel,Abelardo,Abner,Abraham,Adalberto,Adam,Adan,Adelbert,Adolf,Adolfo,Adolph,Adolphus,Adonis,Adrain,Adrian,Adriel,Adrien,Afton,Agustin,Ahmad,Ahmed,Aidan,Aiden,Akeem,Al,Alan,Albert,Alberto,Albin,Alden,Alec,Alejandrin,Alek,Alessandro,Alex,Alexander,Alexandre,Alexandro,Alexie,Alexis,Alexys,Alexzander,Alf,Alfonso,Alfonzo,Alford,Alfred,Alfredo,Ali,Allan,Allen,Alphonso,Alvah,Alvis,Amani,Amari,Ambrose,Americo,Amir,Amos,Amparo,Anastacio,Anderson,Andre,Andres,Andrew,Andy,Angel,Angelo,Angus,Anibal,Ansel,Ansley,Anthony,Antone,Antonio,Antwan,Antwon,Arch,Archibald,Arden,Arely,Ari,Aric,Ariel,Arjun,Arlo,Armand,Armando,Armani,Arnaldo,Arne,Arno,Arnold,Arnoldo,Arnulfo,Aron,Art,Arthur,Arturo,Arvel,Arvid,Ashton,August,Augustus,Aurelio,Austen,Austin,Austyn,Avery,Axel,Ayden,Bailey,Barney,Baron,Barrett,Barry,Bart,Bartholome,Barton,Baylee,Beau,Bell,Ben,Benedict,Benjamin,Bennett,Bennie,Benny,Benton,Bernard,Bernardo,Bernhard,Bernie,Berry,Berta,Bertha,Bertram,Bertrand,Bill,Billy,Blair,Blaise,Blake,Blaze,Bo,Bobbie,Bobby,Boris,Boyd,Brad,Braden,Bradford,Bradley,Bradly,Brady,Braeden,Brain,Brando,Brandon,Brandt,Brannon,Branson,Brant,Braulio,Braxton,Brayan,Brendan,Brenden,Brendon,Brennan,Brennon,Brent,Bret,Brett,Brian,Brice,Brock,Broderick,Brody,Brook,Brooks,Brown,Bruce,Bryce,Brycen,Bryon,Buck,Bud,Buddy,Buford,Burley,Buster,Cade,Caden,Caesar,Cale,Caleb,Camden,Cameron,Camren,Camron,Camryn,Candelario,Candido,Carey,Carleton,Carlo,Carlos,Carmel,Carmelo,Carmine,Carol,Carroll,Carson,Carter,Cary,Casey,Casimer,Casimir,Casper,Ceasar,Cecil,Cedrick,Celestino,Cesar,Chad,Chadd,Chadrick,Chaim,Chance,Chandler,Charles,Charley,Charlie,Chase,Chauncey,Chaz,Chelsey,Chesley,Chester,Chet,Chris,Christ,Christian,Christop,Christophe,Christopher,Cicero,Cielo,Clair,Clark,Claud,Claude,Clay,Clemens,Clement,Cleo,Cletus,Cleve,Cleveland,Clifford,Clifton,Clint,Clinton,Clovis,Cloyd,Clyde,Coby,Cody,Colby,Cole,Coleman,Colin,Collin,Colt,Colten,Colton,Columbus,Conner,Connor,Conor,Conrad,Constantin,Consuelo,Cooper,Corbin,Cordelia,Cordell,Cornelius,Cornell,Cortez,Cory,Coty,Coy,Craig,Crawford,Cristian,Cristina,Cristobal,Cristopher,Cruz,Cullen,Curt,Curtis,Cyril,Cyrus,Dagmar,Dale,Dallas,Dallin,Dalton,Dameon,Damian,Damien,Damion,Damon,Dan,Dane,D'angelo,Dangelo,Danial,Danny,Dante,Daren,Darian,Darien,Dario,Darion,Darius,Daron,Darrel,Darrell,Darren,Darrick,Darrin,Darrion,Darron,Darryl,Darwin,Daryl,Dashawn,Dave,David,Davin,Davion,Davon,Davonte,Dawson,Dax,Dayne,Dayton,Dean,Deangelo,Declan,Dedric,Dedrick,Dee,Deion,Dejon,Dejuan,Delaney,Delbert,Dell',Delmer,Demarco,Demarcus,Demario,Demetrius,Demond,Denis,Dennis,Deon,Deondre,Deontae,Deonte,Dereck,Derek,Derick,Deron,Derrick,Deshaun,Deshawn,Desmond,Destin,Devan,Devante,Deven,Devin,Devon,Devonte,Devyn,Dewayne,Dewitt,Dexter,Diamond,Diego,Dillan,Dillon,Dimitri,Dino,Dion,Dock',Domenic,Domenick,Domenico,Domingo,Dominic,Don,Donald,Donato,Donavon,Donnell,Donnie,Donny,Dorcas,Dorian,Doris,Dorthy,Doug,Douglas,Doyle,Drake,Dudley,Duncan,Durward,Dustin,Dusty,Dwight,Dylan,Earl,Earnest,Easter,Easton,Ed,Edd,Eddie,Edgar,Edgardo,Edison,Edmond,Edmund,Eduardo,Edward,Edwardo,Edwin,Efrain,Efren,Einar,Eino,Eladio,Elbert,Eldon,Eldred,Eleazar,Eli,Elian,Elias,Eliezer,Elijah,Eliseo,Elliot,Elliott,Ellis,Ellsworth,Elmer,Elmo,Elmore,Eloy,Elroy,Elton,Elvis,Elwin,Elwyn,Emanuel,Emerald,Emerson,Emery,Emil,Emile,Emiliano,Emilio,Emmanuel,Emmet,Emmett,Emmitt,Emory,Enid,Enoch,Enos,Enrico,Enrique,Ephraim,Eriberto,Eric,Erich,Erick,Erik,Erin,Erling,Ernest,Ernesto,Ernie,Ervin,Erwin,Esteban,Estevan,Ethan,Ethel,Eugene,Eusebio,Evan,Evans,Everardo,Everett,Evert,Ewald,Ewell,Ezekiel,Ezequiel,Ezra,Fabian,Faustino,Fausto,Favian,Federico,Felipe,Felix,Felton,Fermin,Fern,Fernando,Ferne,Fidel,Filiberto', 'Finn,Flavio',Fletcher,Florencio,Florian,Floy,Floyd,Ford,Forest,Forrest,Foster,Francesco,Francis,Francisco,Franco,Frank,Frankie,Franz,Fred,Freddie,Freddy,Frederic,Frederick,Frederik,Fredrick,Fredy,Freeman,Friedrich,Fritz,Furman,Gabe,Gabriel,Gaetano,Gage,Gardner,Garett,Garfield,Garland,Garnet,Garnett,Garret,Garrett,Garrick,Garrison,Garry,Garth,Gaston,Gavin,Gay,Gayle,Gaylord,Gene,General,Gennaro,Geo,Geoffrey,George,Geovanni,Geovanny,Geovany,Gerald,Gerard,Gerardo,Gerhard,German,Gerson,Gianni,Gideon,Gilbert,Gilberto,Giles,Gillian,Gino,Giovani,Giovanni,Giovanny',Giuseppe,Glen,Glennie,Godfrey,Golden,Gonzalo,Gordon,Grady,Graham,Grant,Granville,Grayce,Grayson,Green,Greg,Gregg,Gregorio,Gregory,Greyson,Griffin,Grover,Guido,Guillermo,Guiseppe,Gunnar,Gunner,Gus,Gussie,Gust,Gustave,Guy,Hadley,Hailey,Hal,Haleigh,Haley,Halle,Hank,Hans,Hardy,Harley,Harmon,Harold,Harrison,Harry,Harvey,Haskell,Hassan,Hayden,Hayley,Hazel,Hazle,Heber,Hector,Helmer,Henderson,Henri,Henry,Herbert,Herman,Hermann,Herminio,Hershel,Hester,Hilario,Hilbert,Hillard,Hilton,Hipolito,Hiram,Hobart,Holden,Hollis,Horace,Horacio,Houston,Howard,Howell,Hoyt,Hubert,Hudson,Hugh,Humberto,Hunter,Hyman,Ian,Ibrahim,Ignacio,Ignatius,Ike,Imani,Immanuel,Irving,Irwin,Isaac,Isac,Isadore,Isai,Isaiah,Isaias,Isidro,Ismael,Isom,Israel,Issac,Izaiah,Jabari,Jace,Jacey,Jacinto,Jack,Jackson,Jacques,Jaden,Jadon,Jaeden,Jaiden,Jaime,Jairo,Jake,Jakob,Jaleel,Jalen,Jalon,Jamaal,Jamal,Jamar,Jamarcus,Jamel,Jameson,Jamey,Jamie,Jamil,Jamir,Jamison,Jan,Janick,Jaquan,Jared,Jaren,Jarod,Jaron,Jarred,Jarrell,Jarret,Jarrett,Jarrod,Jarvis,Jasen,Jasmin,Jason,Jasper,Javier,Javon,Javonte,Jay,Jayce,Jaycee', 'Jayde,Jayden,Jaydon,Jaylan,Jaylen,Jaylin,Jaylon,Jayme,Jayson,Jean,Jed,Jedediah,Jedidiah,Jeff,Jefferey,Jeffery,Jeffrey,Jeffry,Jennings,Jensen,Jerad,Jerald,Jeramie,Jeramy,Jerel,Jeremie,Jeremy,Jermain,Jermey,Jerod,Jerome,Jeromy,Jerrell,Jerrod,Jerrold,Jerry,Jess,Jesse,Jessie,Jessy,Jesus,Jett,Jettie,Jevon,Jillian,Jimmie,Jimmy,Jo,Joan,Joany,Joaquin,Jocelyn,Joe,Joel', 'Joesph,Joey,Johan,Johann,Johathan,John,Johnathan,Johnathon,Johnnie,Johnny,Johnpaul,Johnson,Jon,Jonas,Jonatan,Jonathan,Jonathon,Jordan,Jordi,Jordon,Jordy,Jordyn,Jorge,Jose,Joseph,Josh,Joshua,Joshuah,Josiah,Josue,Jovan,Jovani,Jovanny,Jovany,Judah,Judd,Judge,Judson,Jules,Julian,Julien,Julio,Julius,Junior,Junius,Justen,Justice,Juston,Justus,Justyn,Juvenal,Juwan,Kacey,Kade,Kaden,Kadin,Kale,Kaleb,Kaleigh,Kaley,Kameron,Kamren,Kamron,Kamryn,Kane,Kareem,Karl,Karley,Karson,Kay,Kayden,Kayleigh,Kayley,Keagan,Keanu,Keaton,Keegan,Keeley,Keenan,Keith,Kellen,Kelley,Kelton,Kelvin,Ken,Kendall,Kendrick,Kennedi,Kennedy,Kenneth,Kennith,Kenny,Kenton,Kenyon,Keon,Keshaun,Keshawn,Keven,Kevin,Kevon,Keyon,Keyshawn,Khalid,Khalil,Kian,Kiel,Kieran,Kiley,Kim,King,Kip,Kirk,Kobe,Koby,Kody,Kolby,Kole,Korbin,Korey,Kory,Kraig,Kris,Kristian,Kristofer,Kristoffer,Kristopher,Kurt,Kurtis,Kyle,Kyleigh,Kyler,Ladarius,Lafayette,Lamar,Lambert,Lamont,Lance,Landen,Lane,Laron,Larry,Larue,Laurel,Lavern,Laverna,Laverne,Lavon,Lawrence,Lawson,Layne,Lazaro,Lee,Leif,Leland,Lemuel,Lennie,Lenny,Leo,Leon,Leonard,Leonardo,Leone,Leonel,Leopold,Leopoldo,Lesley,Lester,Levi,Lew,Lewis,Lexus,Liam,Lincoln,Lindsey,Linwood,Lionel,Lisandro,Llewellyn,Lloyd,Logan,Lon,London,Lonnie,Lonny,Lonzo,Lorenz,Lorenza,Lorenzo,Louie,Louisa,Lourdes,Louvenia,Lowell,Loy,Loyal,Lucas,Luciano,Lucio,Lucious,Lucius,Ludwig,Luigi,Luis,Lukas,Lula,Luther,Lyric,Mac,Macey,Mack,Mackenzie,Madisen,Madison,Madyson,Magnus,Major,Makenna,Malachi,Malcolm,Mallory,Manley,Manuel,Manuela,Marc,Marcel,Marcelino,Marcellus,Marcelo,Marco,Marcos,Marcus,Mariano,Mario,Mark,Markus,Marley,Marlin,Marlon,Marques,Marquis,Marshall,Martin,Marty,Marvin,Mason,Mateo,Mathew,Mathias,Matt,Matteo,Maurice,Mauricio,Maverick,Mavis,Max,Maxime,Maximilian,Maximillian,Maximo,Maximus,Maxine,Maxwell,Maynard,Mckenna,Mckenzie,Mekhi,Melany,Melvin,Melvina,Merl,Merle,Merlin,Merritt,Mervin,Micah,Michael,Michale,Micheal,Michel,Miguel,Mike,Mikel,Milan,Miles,Milford,Miller,Milo,Milton,Misael,Mitchel,Mitchell,Modesto,Mohamed,Mohammad,Mohammed,Moises,Monroe,Monserrat,Monserrate,Montana,Monte,Monty,Morgan,Moriah,Morris,Mortimer,Morton,Mose,Moses,Moshe,Muhammad,Murl,Murphy,Murray,Mustafa,Myles', 'Myrl,Myron,Napoleon,Narciso,Nash,Nasir,Nat,Nathan,Nathanael,Nathanial,Nathaniel,Nathen,Neal,Ned,Neil,Nels,Nelson,Nestor,Newell,Newton,Nicholas,Nicholaus,Nick,Nicklaus,Nickolas,Nico,Nicola,Nicolas,Nigel,Nikko,Niko,Nikolas,Nils,Noah,Noble,Noe,Noel,Nolan,Norbert,Norberto,Norris,Norval,Norwood,Obie,Oda,Odell,Okey,Ola,Olaf,Ole,Olen,Olin,Oliver,Omari,Omer,Oral,Oran,Oren,Orin,Orion,Orland,Orlando,Orlo,Orrin,Orval,Orville,Osbaldo,Osborne,Oscar,Osvaldo,Oswald,Oswaldo,Otho,Otis,Ottis,Otto,Owen,Pablo,Paolo,Paris,Parker,Patrick,Paul,Paxton,Payton,Pedro,Percival,Percy,Perry,Pete,Peter,Peyton,Philip,Pierce,Pierre,Pietro,Porter,Presley,Preston,Price,Prince,Quentin,Quincy,Quinn,Quinten,Quinton,Rafael,Raheem,Rahul,Raleigh,Ralph,Ramiro,Ramon,Randal,Randall,Randi,Randy,Ransom,Raoul,Raphael,Rashad,Rashawn,Rasheed,Raul,Raven,Ray,Raymond,Raymundo,Reagan,Reece,Reed,Reese,Regan,Reggie,Reginald,Reid,Reilly',Reinhold,Remington,Rene,Reuben,Rex,Rey,Reyes,Reymundo,Reynold,Rhett,Rhiannon,Ricardo,Richard,Richie,Richmond,Rick,Rickey,Rickie,Ricky,Rico,Rigoberto,Riley,Robb,Robbie,Robert,Roberto,Robin,Rocio,Rocky,Rod,Roderick,Rodger,Rodolfo,Rodrick,Rodrigo,Roel,Rogelio,Roger,Rogers,Rolando,Rollin,Roman,Ron,Ronaldo,Ronny,Roosevelt,Rory,Rosario,Roscoe,Rosendo,Ross,Rowan,Rowland,Roy,Royal,Royce,Ruben,Rudolph,Rudy,Rupert,Russ,Russel,Russell,Rusty,Ryan,Ryann,Ryder,Rylan,Ryleigh,Ryley,Sage,Saige,Salvador,Salvatore,Sam,Samir,Sammie,Sammy,Samson,Sanford,Santa,Santiago,Santino,Santos,Saul,Savion,Schuyler,Scot,Scottie,Scotty,Seamus,Sean,Sebastian,Sedrick,Selmer,Seth,Shad,Shane,Shaun,Shawn,Shayne,Sheldon,Sheridan,Sherman,Sherwood,Sid,Sidney,Sigmund,Sigrid,Sigurd,Silas,Sim,Simeon,Skye,Skylar,Sofia,Soledad,Solon,Sonny,Spencer,Stan,Stanford,Stanley,Stanton,Stefan,Stephan,Stephen,Stephon,Sterling,Steve,Stevie,Stewart,Stone,Stuart,Sven,Sydney,Sylvan,Sylvester,Tad,Talon,Tanner,Tate,Tatum,Taurean,Tavares,Taylor,Ted,Terence,Terrance,Terrell,Terrence,Terrill,Terry,Tevin,Thad,Thaddeus,Theo,Theodore,Theron,Thomas,Thurman,Tillman,Timmothy,Timmy,Timothy,Tito,Titus,Tobin,Toby,Tod,Tom,Tomas,Tommie,Toney,Toni,Tony,Torey,Torrance,Torrey,Toy,Trace,Tracey,Travis,Travon,Tre,Tremaine,Tremayne,Trent,Trenton,Trever,Trevion,Trevor,Trey', 'Tristian,Tristin,Triston,Troy,Trystan,Turner',Tyler,Tyree,Tyreek,Tyrel,Tyrell,Tyrese,Tyrique,Tyshawn,Tyson,Ubaldo,Ulices,Ulises,Unique,Urban,Uriah,Uriel,Valentin,Van,Vance,Vaughn,Vern,Verner,Vernon,Vicente,Victor,Vidal,Vince,Vincent,Vincenzo,Vinnie,Virgil,Vito,Vladimir,Wade,Waino,Waldo,Walker,Wallace,Walter,Walton,Ward,Warren,Watson,Waylon,Wayne,Webster,Weldon,Wellington,Wendell,Werner,Westley,Weston,Wilber,Wilbert,Wilburn,Wiley,Wilford,Wilfred,Wilfredo,Wilfrid,Wilhelm,Will,Willard,William,Willis,Willy,Wilmer,Wilson,Wilton,Winfield,Winston,Woodrow,Wyatt,Wyman,Xavier,Xzavier,Xander,Zachariah,Zachary,Zachery,Zack,Zackary,Zackery,Zakary,Zander,Zane,Zechariah,Zion".split(",") } - override public func femaleFirstNames() -> [String] { + override open func femaleFirstNames() -> [String] { return "Aaliyah,Abagail,Abbey,Abbie,Abbigail,Abby,Abigail,Abigale,Abigayle,Ada,Adah,Adaline,Addie,Addison,Adela,Adele,Adelia,Adeline,Adell,Adella,Adelle,Aditya,Adriana,Adrianna,Adrienne,Aglae,Agnes,Agustina,Aida,Aileen,Aimee,Aisha,Aiyana,Alaina,Alana,Alanis,Alanna,Alayna,Alba,Alberta,Albertha,Albina,Alda,Aleen,Alejandra,Alena,Alene,Alessandra,Alessia,Aletha,Alexa,Alexandra,Alexandrea,Alexandria,Alexandrine,Alexane,Alexanne,Alfreda,Alia,Alice,Alicia,Alisa,Alisha,Alison,Alivia,Aliya,Aliyah,Aliza,Alize,Allene,Allie,Allison,Ally,Alta,Althea,Alva,Alvena,Alvera,Alverta,Alvina,Alyce,Alycia,Alysa,Alysha,Alyson,Alysson,Amalia,Amanda,Amara,Amaya,Amber,Amelia,Amelie,Amely,America,Amie,Amina,Amira,Amiya,Amy,Amya,Ana,Anabel,Anabelle,Anahi,Anais,Anastasia,Andreane,Andreanne,Angela,Angelica,Angelina,Angeline,Angelita,Angie,Anika,Anissa,Anita,Aniya,Aniyah,Anjali,Anna,Annabel,Annabell,Annabelle,Annalise,Annamae,Annamarie,Anne,Annetta,Annette,Annie,Antoinette,Antonetta,Antonette,Antonia,Antonietta,Antonina,Anya,April,Ara,Araceli,Aracely,Ardella,Ardith,Ariane,Arianna,Arielle,Arlene,Arlie,Arvilla,Aryanna,Asa,Asha,Ashlee,Ashleigh,Ashley,Ashly,Ashlynn,Ashtyn,Asia,Assunta,Astrid,Athena,Aubree,Aubrey,Audie,Audra,Audreanne,Audrey,Augusta,Augustine,Aurelia,Aurelie,Aurore,Autumn,Ava,Avis,Ayana,Ayla,Aylin,Baby,Bailee,Barbara,Beatrice,Beaulah,Bella,Belle,Berenice,Bernadette,Bernadine,Berneice,Bernice,Berniece,Bernita,Bert,Beryl,Bessie,Beth,Bethany,Bethel,Betsy,Bette,Bettie,Betty,Bettye,Beulah,Beverly,Bianka,Billie,Birdie,Blanca,Blanche,Bonita,Bonnie,Brandi,Brandy,Brandyn,Breana,Breanna,Breanne,Brenda,Brenna,Bria,Briana,Brianne,Bridget,Bridgette,Bridie,Brielle,Brigitte,Brionna,Brisa,Britney,Brittany,Brooke,Brooklyn,Bryana,Bulah,Burdette,Burnice,Caitlyn,Caleigh,Cali,Calista,Callie,Camila,Camilla,Camille,Camylle,Candace,Candice,Candida,Cara,Carissa,Carlee,Carley,Carli,Carlie,Carlotta,Carmela,Carmella,Carmen,Carolanne,Carole,Carolina,Caroline,Carolyn,Carolyne,Carrie,Casandra,Cassandra,Cassandre,Cassidy,Cassie,Catalina,Caterina,Catharine,Catherine,Cathrine,Cathryn,Cathy,Cayla,Cecelia,Cecile,Cecilia,Celestine,Celia,Celine,Chanel,Chanelle,Charity,Charlene,Charlotte,Chasity,Chaya,Chelsea,Chelsie,Cheyanne,Cheyenne,Chloe,Christa,Christelle,Christiana,Christina,Christine,Christy,Chyna,Ciara,Cierra,Cindy,Citlalli,Claire,Clara,Clarabelle,Clare,Clarissa,Claudia,Claudie,Claudine,Clementina,Clementine,Clemmie,Cleora,Cleta,Clotilde,Colleen,Concepcion,Connie,Constance,Cora,Coralie,Cordia,Cordie,Corene,Corine,Corrine,Cortney,Courtney,Creola,Cristal,Crystal,Crystel,Cydney,Cynthia,Dahlia,Daija,Daisha,Daisy,Dakota,Damaris,Dana,Dandre,Daniela,Daniella,Danielle,Danika,Dannie,Danyka,Daphne,Daphnee,Daphney,Darby,Dariana,Darlene,Dasia,Dawn,Dayana,Dayna,Deanna,Deborah,Deja,Dejah,Delfina,Delia,Delilah,Della,Delores,Delpha,Delphia,Delphine,Delta,Demetris,Dena,Desiree,Dessie,Destany,Destinee,Destiney,Destini,Destiny,Diana,Dianna,Dina,Dixie,Dolly,Dolores,Domenica,Dominique,Donna,Dora,Dorothea,Dorothy,Dorris,Dortha,Dovie,Drew,Duane,Dulce,Earlene,Earline,Earnestine,Ebba,Ebony,Eda,Eden,Edna,Edwina,Edyth,Edythe,Effie,Eileen,Elaina,Elda,Eldora,Eldridge,Eleanora,Eleanore,Electa,Elena,Elenor,Elenora,Eleonore,Elfrieda,Eliane,Elinor,Elinore,Elisa,Elisabeth,Elise,Elisha,Elissa,Eliza,Elizabeth,Ella,Ellen,Ellie,Elmira,Elna,Elnora,Elody,Eloisa,Eloise,Elouise,Elsa,Else,Elsie,Elta,Elva,Elvera,Elvie,Elyse,Elyssa,Elza,Emelia,Emelie,Emely,Emie,Emilia,Emilie,Emily,Emma,Emmalee,Emmanuelle,Emmie,Emmy,Ena,Enola,Era,Erica,Ericka,Erika,Erna,Ernestina,Ernestine,Eryn,Esmeralda,Esperanza,Esta,Estefania,Estel,Estell,Estella,Estelle,Esther,Estrella,Etha,Ethelyn,Ethyl,Ettie,Eudora,Eugenia,Eula,Eulah,Eulalia,Euna,Eunice,Eva,Evalyn,Evangeline,Eve,Eveline,Evelyn,Everette,Evie,Fabiola,Fae,Fannie,Fanny,Fatima,Fay,Faye,Felicia,Felicita,Felicity,Felipa,Filomena,Fiona,Flavie,Fleta,Flo,Florence,Florida,Florine,Flossie,Frances,Francesca,Francisca,Freda,Frederique,Freeda,Freida,Frida,Frieda,Gabriella,Gabrielle,Gail,Genesis,Genevieve,Genoveva,Georgette,Georgiana,Georgianna,Geraldine,Gerda,Germaine,Gerry,Gertrude,Gia,Gilda,Gina,Giovanna,Gisselle,Gladyce,Gladys,Glenda,Glenna,Gloria,Golda,Grace,Gracie,Graciela,Gregoria,Greta,Gretchen,Guadalupe,Gudrun,Gwen,Gwendolyn,Hailee,Hailie,Halie,Hallie,Hanna,Hannah,Harmony,Hassie,Hattie,Haven,Haylee,Haylie,Heath,Heather,Heaven,Heidi,Helen,Helena,Helene,Helga,Hellen,Heloise,Henriette,Hermina,Herminia,Herta,Hertha,Hettie,Hilda,Hildegard,Hillary,Hilma,Hollie,Holly,Hope,Hortense,Hosea,Hulda,Icie,Ida,Idell,Idella,Ila,Ilene,Iliana,Ima,Imelda,Imogene,Ines,Irma,Isabel,Isabell,Isabella,Isabelle,Isobel,Itzel,Iva,Ivah,Ivory,Ivy,Izabella,Jacinthe,Jackeline,Jackie,Jacklyn,Jacky,Jaclyn,Jacquelyn,Jacynthe,Jada,Jade,Jadyn,Jaida,Jailyn,Jakayla,Jalyn,Jammie,Jana,Janae,Jane,Janelle,Janessa,Janet,Janice,Janie,Janis,Janiya,Jannie,Jany,Jaquelin,Jaqueline,Jaunita,Jayda,Jayne,Jazlyn,Jazmin,Jazmyn,Jazmyne,Jeanette,Jeanie,Jeanne,Jena,Jenifer,Jennie,Jennifer,Jennyfer,Jermaine,Jessica,Jessika,Jessyca,Jewel,Jewell,Joana,Joanie,Joanne,Joannie,Joanny,Jodie,Jody,Joelle,Johanna,Jolie,Jordane,Josefa,Josefina,Josephine,Josiane,Josianne,Josie,Joy,Joyce,Juana,Juanita,Jude,Judy,Julia,Juliana,Julianne,Julie,Juliet,June,Justina,Justine,Kaci,Kacie,Kaela,Kaelyn,Kaia,Kailee,Kailey,Kailyn,Kaitlin,Kaitlyn,Kali,Kallie,Kamille,Kara,Karelle,Karen,Kari,Kariane,Karianne,Karina,Karine,Karlee,Karli,Karlie,Karolann,Kasandra,Kasey,Kassandra,Katarina,Katelin,Katelyn,Katelynn,Katharina,Katherine,Katheryn,Kathleen,Kathlyn,Kathryn,Kathryne,Katlyn,Katlynn,Katrina,Katrine,Kattie,Kavon,Kaya,Kaycee,Kayla,Kaylah,Kaylee,Kayli,Kaylie,Kaylin,Keara,Keely,Keira,Kelli,Kellie,Kelly,Kelsi,Kelsie,Kendra,Kenna,Kenya,Kenyatta,Kiana,Kianna,Kiara,Kiarra,Kiera,Kimberly,Kira,Kirsten,Kirstin,Kitty,Krista,Kristin,Kristina,Kristy,Krystal,Krystel,Krystina,Kyla,Kylee,Kylie,Kyra,Lacey,Lacy,Laila,Laisha,Laney,Larissa,Laura,Lauren,Laurence,Lauretta,Lauriane,Laurianne,Laurie,Laurine,Laury,Lauryn,Lavada,Lavina,Lavinia,Lavonne,Layla,Lea,Leann,Leanna,Leanne,Leatha,Leda,Leila,Leilani,Lela,Lelah,Lelia,Lempi,Lenna,Lenora,Lenore,Leola,Leonie,Leonor,Leonora,Leora,Lera,Leslie,Lesly,Lessie,Leta,Letha,Letitia,Lexi,Lexie,Lia,Liana,Libbie,Libby,Lila,Lilian,Liliana,Liliane,Lilla,Lillian,Lilliana,Lillie,Lilly,Lily,Lilyan,Lina,Linda,Lindsay,Linnea,Linnie,Lisa,Lisette,Litzy,Liza,Lizeth,Lizzie,Lois,Lola,Lolita,Loma,Lonie,Lora,Loraine,Loren,Lorena,Lori,Lorine,Lorna,Lottie,Lou,Loyce,Lucie,Lucienne,Lucile,Lucinda,Lucy,Ludie,Lue,Luella,Luisa,Lulu,Luna,Lupe,Lura,Lurline,Luz,Lyda,Lydia,Lyla,Lynn,Lysanne,Mabel,Mabelle,Mable,Maci,Macie,Macy,Madaline,Madalyn,Maddison,Madeline,Madelyn,Madelynn,Madge,Madie,Madilyn,Madisyn,Madonna,Mae,Maegan,Maeve,Mafalda,Magali,Magdalen,Magdalena,Maggie,Magnolia,Maia,Maida,Maiya,Makayla,Makenzie,Malika,Malinda,Mallie,Malvina,Mandy,Mara,Marcelina,Marcella,Marcelle,Marcia,Margaret,Margarete,Margarett,Margaretta,Margarette,Margarita,Marge,Margie,Margot,Margret,Marguerite,Maria,Mariah,Mariam,Marian,Mariana,Mariane,Marianna,Marianne,Maribel,Marie,Mariela,Marielle,Marietta,Marilie,Marilou,Marilyne,Marina,Marion,Marisa,Marisol,Maritza,Marjolaine,Marjorie,Marjory,Marlee,Marlen,Marlene,Marquise,Marta,Martina,Martine,Mary,Maryam,Maryjane,Maryse,Mathilde,Matilda,Matilde,Mattie,Maud,Maude,Maudie,Maureen,Maurine,Maxie,Maximillia,May,Maya,Maybell,Maybelle,Maye,Maymie,Mayra,Mazie,Mckayla,Meagan,Meaghan,Meda,Megane,Meggie,Meghan,Melba,Melisa,Melissa,Mellie,Melody,Melyna,Melyssa,Mercedes,Meredith,Mertie,Meta,Mia,Micaela,Michaela,Michele,Michelle,Mikayla,Millie,Mina,Minerva,Minnie,Miracle,Mireille,Mireya,Missouri,Misty,Mittie,Modesta,Mollie,Molly,Mona,Monica,Monique,Mossie,Mozell,Mozelle,Muriel,Mya,Myah,Mylene,Myra,Myriam,Myrna,Myrtice,Myrtie,Myrtis,Myrtle,Nadia,Nakia,Name,Nannie,Naomi,Naomie,Natalia,Natalie,Natasha,Nayeli,Nedra,Neha,Nelda,Nella,Nelle,Nellie,Neoma,Nettie,Neva,Nia,Nichole,Nicole,Nicolette,Nikita,Nikki,Nina,Noelia,Noemi,Noemie,Noemy,Nola,Nona,Nora,Norene,Norma,Nova,Novella,Nya,Nyah,Nyasia,Oceane,Ocie,Octavia,Odessa,Odie,Ofelia,Oleta,Olga,Ollie,Oma,Ona,Onie,Opal,Ophelia,Ora,Orie,Orpha,Otha,Otilia,Ottilie,Ova,Ozella,Paige,Palma,Pamela,Pansy,Pascale,Pasquale,Pat,Patience,Patricia,Patsy,Pattie,Paula,Pauline,Pearl,Pearlie,Pearline,Peggie,Penelope,Petra,Phoebe,Phyllis,Pink,Pinkie,Piper,Polly,Precious,Princess,Priscilla,Providenci,Prudence,Queen,Queenie,Rachael,Rachel,Rachelle,Rae,Raegan,Rafaela,Rahsaan,Raina,Ramona,Raphaelle,Raquel,Reanna,Reba,Rebeca,Rebecca,Rebeka,Rebekah,Reina,Renee,Ressie,Reta,Retha,Retta,Reva,Reyna,Rhea,Rhianna,Rhoda,Rita,River,Roberta,Robyn,Roma,Romaine,Rosa,Rosalee,Rosalia,Rosalind,Rosalinda,Rosalyn,Rosamond,Rosanna,Rose,Rosella,Roselyn,Rosemarie,Rosemary,Rosetta,Rosie,Rosina,Roslyn,Rossie,Rowena,Roxane,Roxanne,Rozella,Rubie,Ruby,Rubye,Ruth,Ruthe,Ruthie,Rylee,Sabina,Sabrina,Sabryna,Sadie,Sadye,Sallie,Sally,Salma,Samanta,Samantha,Samara,Sandra,Sandrine,Sandy,Santina,Sarah,Sarai,Sarina,Sasha,Savanah,Savanna,Savannah,Scarlett,Selena,Selina,Serena,Serenity,Shaina,Shakira,Shana,Shanel,Shanelle,Shania,Shanie,Shaniya,Shanna,Shannon,Shanny,Shanon,Shany,Sharon,Shawna,Shaylee,Shayna,Shea,Sheila,Shemar,Shirley,Shyann,Shyanne,Sibyl,Sienna,Sierra,Simone,Sincere,Sister,Skyla,Sonia,Sonya,Sophia,Sophie,Stacey,Stacy,Stefanie,Stella,Stephania,Stephanie,Stephany,Summer,Sunny,Susan,Susana,Susanna,Susie,Suzanne,Syble,Sydnee,Sydni,Sydnie,Sylvia,Tabitha,Talia,Tamara,Tamia,Tania,Tanya,Tara,Taryn,Tatyana,Taya,Teagan,Telly,Teresa,Tess,Tessie,Thalia,Thea,Thelma,Theodora,Theresa,Therese,Theresia,Thora,Tia,Tiana,Tianna,Tiara,Tierra,Tiffany,Tina,Tomasa,Tracy,Tressa,Tressie,Treva,Trinity,Trisha,Trudie,Trycia,Twila,Tyra,Una,Ursula,Vada,Valentina,Valentine,Valerie,Vallie,Vanessa,Veda,Velda,Vella,Velma,Velva,Vena,Verda,Verdie,Vergie,Verla,Verlie,Verna,Vernice,Vernie,Verona,Veronica,Vesta,Vicenta,Vickie,Vicky,Victoria,Vida,Vilma,Vincenza,Viola,Violet,Violette,Virgie,Virginia,Virginie,Vita,Viva,Vivian,Viviane,Vivianne,Vivien,Vivienne,Wanda,Wava,Wendy,Whitney,Wilhelmine,Willa,Willie,Willow,Wilma,Winifred,Winnifred,Winona,Yadira,Yasmeen,Yasmin,Yasmine,Yazmin,Yesenia,Yessenia,Yolanda,Yoshiko,Yvette,Yvonne,Zaria,Zelda,Zella,Zelma,Zena,Zetta,Zita,Zoe,Zoey,Zoie,Zoila,Zola,Zora,Zula".split(",") } } diff --git a/Source/Localizations/nl_NL/nl_NL.Company.swift b/Source/Localizations/nl_NL/nl_NL.Company.swift index 24b7128..8b45db6 100644 --- a/Source/Localizations/nl_NL/nl_NL.Company.swift +++ b/Source/Localizations/nl_NL/nl_NL.Company.swift @@ -22,10 +22,10 @@ import Foundation -public extension nl_NL { - public class Company { - public class Provider : Faker.Company.Provider { - override public func formats() -> [String] { +extension nl_NL { + open class Company { + open class Provider : Faker.Company.Provider { + override open func formats() -> [String] { return [ "\(Faker.Person.lastName()) \(Faker.Company.companySuffix())", "\(Faker.Person.lastName()) \(Faker.Person.lastName()) \(Faker.Company.companySuffix())", @@ -33,7 +33,7 @@ public extension nl_NL { ] } - override public func suffixes() -> [String] { + override open func suffixes() -> [String] { return [ "VOF", "CV", "LLP", "BV", "NV", "IBC", "CSL", "EESV", "SE", "CV", "Stichting", "& Zonen", "& Zn" ] } } diff --git a/Source/Localizations/nl_NL/nl_NL.Internet.swift b/Source/Localizations/nl_NL/nl_NL.Internet.swift index 8af50e9..1dc2f8b 100644 --- a/Source/Localizations/nl_NL/nl_NL.Internet.swift +++ b/Source/Localizations/nl_NL/nl_NL.Internet.swift @@ -22,14 +22,14 @@ import Foundation -public extension nl_NL { - public class Internet { - public class Provider : Faker.Internet.Provider { - override public func tlds() -> [String] { +extension nl_NL { + open class Internet { + open class Provider : Faker.Internet.Provider { + override open func tlds() -> [String] { return [ "com", "com", "com", "net", "org", "nl", "nl", "nl" ] } - override public func freeEmailDomains() -> [String] { + override open func freeEmailDomains() -> [String] { return [ "gmail.com", "hotmail.nl", "live.nl", "yahoo.nl" ] } } diff --git a/Source/Localizations/nl_NL/nl_NL.Person.swift b/Source/Localizations/nl_NL/nl_NL.Person.swift index fb46a45..3f38fcc 100644 --- a/Source/Localizations/nl_NL/nl_NL.Person.swift +++ b/Source/Localizations/nl_NL/nl_NL.Person.swift @@ -22,18 +22,18 @@ import Foundation -public extension nl_NL { - public class Person { - public class Provider : Faker.Person.Provider { - public func titles() -> [String] { +extension nl_NL { + open class Person { + open class Provider : Faker.Person.Provider { + open func titles() -> [String] { return [ "mr.", "dr.", "ir.", "drs", "bacc.", "kand.", "dr.h.c.", "prof.", "ds.", "ing.", "bc." ] } - override public func lastNames() -> [String] { + override open func lastNames() -> [String] { return "de Jong,Jansen,de Vries,van de Berg,van den Berg,van der Berg,van Dijk,Bakker,Janssen,Visser,Smit,Meijer,Meyer,de Boer,Mulder,de Groot,Bos,Vos,Peters,Hendriks,van Leeuwen,Dekker,Brouwer,de Wit,Dijkstra,Smits,de Graaf,van der Meer,van der Linden,Kok,Jacobs,de Haan,Vermeulen,van den Heuvel,van de Veen,van der Veen,van den Broek,de Bruijn,de Bruyn,de Bruin,van der Heijden,van der Heyden,Schouten,van Beek,Willems,van Vliet,van de Ven,van der Ven,Hoekstra,Maas,Verhoeven,Koster,van Dam,van de Wal,van der Wal,Prins,Blom,Huisman,Peeters,de Jonge,Kuipers,van Veen,Post,Kuiper,Veenstra,Kramer,van de Brink,van den Brink,Scholten,van Wijk,Postma,Martens,Vink,de Ruiter,Timmermans,Groen,Gerritsen,Jonker,van Loon,Boer,van de Velde,van den Velde,van der Velde,van de Velden,van den Velden,van der Velden,Willemsen,Smeets,de Lange,de Vos,Bosch,van Dongen,Schipper,de Koning,van der Laan,Koning,Driessen,van Doorn,Hermans,Evers,van den Bosch,van der Meulen,Hofman,Bosman,Wolters,Sanders,van der Horst,Mol,Kuijpers,Molenaar,van de Pol,van den Pol,van der Pol,de Leeuw,Verbeek".split(",") } - override public func maleNameFormats() -> [String] { + override open func maleNameFormats() -> [String] { return [ "\(Faker.Person.maleFirstName()) \(Faker.Person.lastName())", "\(Faker.Person.maleFirstName()) \(Faker.Person.lastName())", @@ -42,7 +42,7 @@ public extension nl_NL { ] } - override public func femaleNameFormats() -> [String] { + override open func femaleNameFormats() -> [String] { return [ "\(Faker.Person.femaleFirstName()) \(Faker.Person.lastName())", "\(Faker.Person.femaleFirstName()) \(Faker.Person.lastName())", @@ -51,19 +51,19 @@ public extension nl_NL { ] } - override public func maleTitles() -> [String] { + override open func maleTitles() -> [String] { return titles() } - override public func maleFirstNames() -> [String] { + override open func maleFirstNames() -> [String] { return "Daan,Bram,Sem,Lucas,Milan,Levi,Luuk,Thijs,Jayden,Tim,Finn,Stijn,Thomas,Lars,Ruben,Jesse,Noah,Julian,Max,Liam,Mees,Sam,Sven,Gijs,Luca,Teun,Tijn,Siem,Mats,Jens,Benjamin,Adam,Ryan,Jan,Floris,David,Olivier,Cas,Tygo,Dylan,Ties,Tom,Pepijn,Daniël,Hugo,Thijmen,Dean,Boaz,Jasper,Nick,Willem,Roan,Dex,Niels,Guus,Stan,Koen,Mohamed,Joep,Johannes,Jurre,Pim,Niek,Robin,Bas,Rayan,Damian,Jelle,Noud,Pieter,Vince,Dani,Joris,Jason,Timo,Mick,Quinten,Joshua,Simon,Tobias,Kyan,Hidde,Mohammed,Jack,Quinn,Rens,Samuel,Alexander,Hendrik,Xavi,Joey,Fabian,Justin,Keano,Cornelis,Fedde,Casper,Morris,Mike,Nathan,Jacob,Mika,Owen,Abel,Emir,Sepp,Twan,Aiden,Jonathan,Muhammed,Job,Mason,Stef,Chris,Gerrit,Jesper,Lukas,Valentijn,Melle,Wessel,Jip,Luc,Rick,Sil,Loek,Dylano,Florian,Kevin,Jort,Julius,Daniel,Maarten,Matthijs,Jamie,Jelte,Tycho,Amir,Boris,Thijn,Sep,Wout,Sjoerd,Joël,Aron,Bart,James,Kai,Lorenzo,Raf,Lenn,Marijn,Sebastiaan,Senn,Jim,Brent,Rafael,Tijs,Imran,Nout,Thom,Aaron,Dirk,Oscar,Jay,Ravi,Ali,Sami,Kian,Wouter,Giovanni,Ian,Laurens,Leon,Milo,Kay,Alex,Amin,Jayson,Berat,Jules,Sander,Seth,Ben,Jonas,Jordy,Mathijs,Colin,Tijmen,Marinus,Wesley,Yusuf,Maurits,Bjorn,Bryan,Joost,Riley,Victor,Felix,Ibrahim,Luka,Bastiaan,Hamza,Mark,Arthur,Bradley,Dave,Rowan,Collin,Luke,Merijn,Vigo,Beau,Bilal,Jorn,Vincent,Matthias,Ayden,Maxim,Yassin,Dion,Jake,Kyano,Kick,Mustafa,Michael,Youssef,Elias,Naud,Senna,Brian,Jari,Mehmet,Micha,Stefan,Arie,Duuk,Zakaria,Ayoub,Faas,Olaf,Tristan,Mads,Berend,Mart,Sten,Ivan,Philip,Giel,Lex,Rik,Tyler".split(",") } - override public func femaleTitles() -> [String] { + override open func femaleTitles() -> [String] { return titles() } - override public func femaleFirstNames() -> [String] { + override open func femaleFirstNames() -> [String] { return "Emma,Sophie,Julia,Anna,Lisa,Isa,Eva,Saar,Lotte,Tess,Lynn,Fleur,Sara,Lieke,Noa,Fenna,Sarah,Mila,Sanne,Roos,Elin,Zoë,Evi,Maud,Jasmijn,Femke,Nina,Anne,Noor,Amy,Sofie,Olivia,Feline,Liv,Esmee,Nora,Iris,Lina,Luna,Naomi,Elise,Amber,Yara,Charlotte,Lana,Milou,Isabel,Isabella,Eline,Floor,Lara,Anouk,Fenne,Vera,Nikki,Loïs,Liz,Maria,Tessa,Jill,Laura,Puck,Sophia,Hannah,Evy,Lizzy,Fay,Veerle,Bente,Nienke,Linde,Romy,Senna,Isis,Bo,Sterre,Benthe,Lauren,Julie,Norah,Merel,Ilse,Marit,Nova,Rosalie,Lena,Fiene,Lise,Demi,Johanna,Suze,Vajèn,Ella,Mirthe,Lola,Indy,Emily,Kiki,Sofia,Isabelle,Myrthe,Yfke,Jade,Cato,Lize,Danique,Guusje,Elisa,Esmée,Elena,Rosa,Suus,Fien,Britt,Quinty,Robin,Hanna,Elisabeth,Silke,Pien,Amira,Elize,Faye,Hailey,Madelief,Aya,Louise,Meike,Elif,Jaylinn,Daphne,Lily,Liza,Juul,Lieve,Valerie,Josephine,Mara,Sam,Kate,Jolie,Phileine,Ise,Amélie,Cornelia,Dewi,Livia,Stella,Mia,Noortje,Ashley,Janne,Alicia,Ivy,Janna,Nynke,Kaylee,Lisanne,Azra,Maartje,Megan,Jet,Victoria,Kayleigh,Floortje,Chloë,Pleun,Alyssa,Jennifer,Mare,Renske,Aimée,Juliette,Kim,Fem,Mette,Dina,Tara,Michelle,Esther,Jenna,Lot,Elizabeth,Merle,Dana,Eliza,Karlijn,Bibi,Melissa,Yasmin,Annabel,Carlijn,Imke,Evie,Fabiënne,Linn,Zeynep,Kyra,Aylin,Zara,Lois,Zoey,Ceylin,Chloé,Joëlle,Joy,Noëlle,Féline,Yasmine,Evelien,Ize,Mirte,Ninthe,Ecrin,Kyara,Maya,Nisa,Leah,Maryam,Angelina,Catharina,Lindsey,Loes,Yinthe,Sienna,Adriana,Esila,Jente,Lizz,Lucy,Nadine,Selina,Fatima,Maaike,Aaliyah,Amina,Inaya,Selena,Frederique,Pippa,Puk,Sylvie,Annemijn,Helena,Jayda,Nadia,Amelia,Jinthe,Jolijn,Maja,Tirza".split(",") } }