Progress

Author: fileformat

Sources/App/TestRunner.swift

@@ -0,0 +1,83 @@
+import Foundation
+
+func RunTest(_ testInput: TestInput) -> TestOutput {
+
+    if testInput.regex == nil || testInput.regex == "" {
+        return TestOutput(success: false, html: nil, message: "No regular expression to test!")
+    }
+
+    let regexStr = testInput.regex ?? ""
+    let replacement = testInput.replacement ?? ""
+
+    var html = String()
+    html += "<table class=\"table table-bordered table-striped\" style=\"width:auto;\">"
+    html += "<tbody>"
+    html += "<tr>"
+    html += "<td>Regular Expression</td>"
+    html += "<td>\(escapeHtml(regexStr))</td>"
+    html += "</tr>"
+    if replacement != "" {
+        html += "<tr>"
+        html += "<td>Replacement</td>"
+        html += "<td>\(escapeHtml(replacement))</td>"
+        html += "</tr>"
+    }
+    html += "</tbody>"
+    html += "</table>"
+
+    do {
+        _ = try Regex(regexStr)
+    } catch {
+        return TestOutput(success: false, html: html, message: "Invalid regular expression! Error: \(error.localizedDescription)")
+    }
+
+    let regex = try! Regex(regexStr)
+
+    if testInput.input == nil || testInput.input!.count == 0 {
+        return TestOutput(success: false, html: html, message: nil)
+    }
+
+    html += "<table class=\"table table-bordered table-striped\" style=\"width:auto;\">"
+    html += "<thead>"
+    html += "<tr>"
+    html += "<th>Test</th>"
+    html += "<th>Target String</th>"
+    html += "<th>contains</th>"
+    html += "<th>replacingOccurrences</th>"
+    html += "<th>wholeMatch</th>"
+    html += "</tr>"
+    html += "</thead>"
+    html += "<tbody>"
+    var testIndex = 0;
+    for input in testInput.input! {
+        testIndex += 1
+        if input == "" {
+            continue
+        }
+        let contains = input.contains(regexStr)
+        let replace = input.replacingOccurrences(of: regexStr, with: replacement, options: testInput.option?.contains("i") == true ? .caseInsensitive : [])
+        let wholeMatch = input.wholeMatch(of: regex);
+        let wholeMatchStr = wholeMatch == nil ? "<i>nil</i>" : escapeHtml("\(wholeMatch)");
+        html += "<tr>"
+        html += "<td class=\"text-center\">\(testIndex)</td>"
+        html += "<td>\(escapeHtml(input))</td>"
+        html += "<td>\(contains ? "yes" : "no")</td>"
+        html += "<td>\(escapeHtml(replace))</td>"
+        html += "<td>\(wholeMatchStr)</td>"
+        html += "</tr>"
+    }
+    html += "</tbody>"
+    html += "</table>"
+
+    return TestOutput(success: true, html: html, message: nil)
+}
+
+import Foundation
+
+func escapeHtml(_ input: String) -> String {
+    var escapedString = input
+    escapedString = escapedString.replacingOccurrences(of: "&", with: "&amp;")
+    escapedString = escapedString.replacingOccurrences(of: "<", with: "&lt;")
+    escapedString = escapedString.replacingOccurrences(of: ">", with: "&gt;")
+    return escapedString
+}

Sources/App/configure.swift

@@ -4,7 +4,7 @@ import Vapor
 public func configure(_ app: Application) async throws {
     app.http.server.configuration.hostname = Environment.get("HOSTNAME") ?? "0.0.0.0"
     app.http.server.configuration.port = Environment.get("PORT").flatMap(Int.init) ?? 4000
-    app.http.server.configuration.serverName = "vapor"
+    app.http.server.configuration.serverName = "regexplanet-swift"
 
     // uncomment to serve files from /Public folder
     app.middleware.use(FileMiddleware(publicDirectory: app.directory.publicDirectory))

Sources/App/routes.swift

@@ -6,12 +6,18 @@ func routes(_ app: Application) throws {
         //LATER: req.redirect(to: "https://www.regexplanet.com/advanced/swift/index.html", redirectType: .normal)
     }
 
+    app.get("test.json") { req -> Response in
+        let testInput = try req.query.decode(TestInput.self)
+
+        let retVal = RunTest(testInput);
+
+        return try handleJsonp(req: req, from: retVal)
+    }
+
     app.post("test.json") { req -> Response in
         let testInput = try req.content.decode(TestInput.self)
-        let retVal = TestOutput(
-            success: true,
-            html: "\(testInput.regex): \(testInput.replacement)"
-        )
+
+        let retVal = RunTest(testInput);
 
         return try handleJsonp(req: req, from: retVal)
     }
@@ -36,15 +42,16 @@ struct JsonpParams: Content {
 }
 
 struct TestInput: Content {
-    let regex: String
-    let replacement: String
-    let options: [String]
-    let input: [String]
+    let regex: String?
+    let replacement: String?
+    let option: [String]?
+    let input: [String]?
 }
 
 struct TestOutput: Content {
     let success: Bool
-    let html: String
+    let html: String?
+    let message: String?
 }
 
 struct StatusResponse: Content {

TODO.md

@@ -2,9 +2,5 @@
 
 - [ ] LICENSE.txt
 - [ ] README
-- [ ] CloudRun service
-- [ ] Github Actions
-- [ ] status.json: https://github.com/vapor/university/blob/main/api/Sources/App/Controllers/Tutorials.swift
-- [ ] redirect for '/': req.redirect(to: "/some/new/path")
-- [ ] error handling, logging, cors: https://docs.vapor.codes/4.0/middleware/
+- [ ] test functionality
 - [ ] regex timeout

run.sh

@@ -7,6 +7,8 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+clear
+
 #
 # load an .env file if it exists
 #
@@ -16,4 +18,4 @@ if [ -f "${ENV_FILE}" ]; then
     export $(cat "${ENV_FILE}")
 fi
 
-swift run
+swift run