Add support for regular expressions

dhardiman · Apr 26, 2019 · 4dfabdc · 4dfabdc
1 parent 09c32b0
commit 4dfabdc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/Sources/Config/ConfigurationFile.swift b/Sources/Config/ConfigurationFile.swift
@@ -98,7 +98,7 @@ func parseNextProperty(properties: [String: Property], pair: (key: String, value
     var copy = properties
     if let typeHint = PropertyType(rawValue: typeHintValue) {
         switch typeHint {
-        case .string, .url, .encrypted, .encryptionKey, .colour, .image:
+        case .string, .url, .encrypted, .encryptionKey, .colour, .image, .regex:
             copy[pair.key] = ConfigurationProperty<String>(key: pair.key, typeHint: typeHintValue, dict: dict)
         case .double, .float:
             copy[pair.key] = ConfigurationProperty<Double>(key: pair.key, typeHint: typeHintValue, dict: dict)

diff --git a/Sources/Config/Property.swift b/Sources/Config/Property.swift
@@ -65,6 +65,7 @@ enum PropertyType: String {
     case colour = "Colour"
     case reference = "Reference"
     case image = "Image"
+    case regex = "Regex"
 
     var typeName: String {
         switch self {
@@ -76,6 +77,8 @@ enum PropertyType: String {
             return "UIColor"
         case .image:
             return "UIImage"
+        case .regex:
+            return "NSRegularExpression"
         default:
             return rawValue
         }
@@ -109,6 +112,8 @@ enum PropertyType: String {
             return #"UIImage(named: "\#(value)")!"#
         case .bool:
             return "\(value as! Bool)"
+        case .regex:
+            return "try! NSRegularExpression(pattern: \(stringValue()), options: [])"
         default:
             return "\(value)"
         }

diff --git a/Tests/ConfigTests/ConfigurationPropertyTests.swift b/Tests/ConfigTests/ConfigurationPropertyTests.swift
@@ -225,4 +225,13 @@ class ConfigurationPropertyTests: XCTestCase {
         let overriddenKeyValue = property?.keyValue(for: "hello")
         expect(overriddenKeyValue).to(equal("hello value"))
     }
+
+    func testItCanWriteARegexProperty() throws {
+        let imageProperty = ConfigurationProperty<String>(key: "test", typeHint: "Regex", dict: [
+            "defaultValue": "an\\sexpression",
+            ])
+        let expectedValue = ##"    static let test: NSRegularExpression = try! NSRegularExpression(pattern: #"an\sexpression"#, options: [])"##
+        let actualValue = try whenTheDeclarationIsWritten(for: imageProperty)
+        expect(actualValue).to(equal(expectedValue))
+    }
 }