Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

attemp to fix linked issue to similar path #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Ambassador/Router.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ open class Router: WebApp {
}

private func matchRoute(to searchPath: String) -> (WebApp, [String])? {
for (path, route) in routes {
if let handler = routes[searchPath] {
return (handler, [searchPath])
}
let sortedRoutes = routes.sorted { (a, b) -> Bool in
a.key.count > b.key.count
}
for (path, route) in sortedRoutes {
let regex = try! NSRegularExpression(pattern: path, options: [])
let matches = regex.matches(
in: searchPath,
Expand Down
51 changes: 51 additions & 0 deletions AmbassadorTests/RouterTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,57 @@ class RouterTests: XCTestCase {
XCTAssertEqual(receivedData.last?.count, 0)
}

func test2Paths() {
let router = Router()
router["/path/to/1"] = DataResponse() { environ -> Data in
return Data("first".utf8)
}

router["/path/to"] = DataResponse() { environ -> Data in
return Data("second".utf8)
}

var receivedStatus: [String] = []
let startResponse = { (status: String, headers: [(String, String)]) in
receivedStatus.append(status)
}

var receivedData: [Data] = []
let sendBody = { (data: Data) in
receivedData.append(data)
}
let environ: [String: Any] = [
"REQUEST_METHOD": "GET",
"SCRIPT_NAME": "",
"PATH_INFO": "/",
]
router.app(
environ,
startResponse: startResponse,
sendBody: sendBody
)
XCTAssertEqual(receivedStatus.count, 1)
XCTAssertEqual(receivedStatus.last, "404 Not found")
XCTAssertEqual(receivedData.count, 1)
XCTAssertEqual(receivedData.last?.count, 0)

let environ2: [String: Any] = [
"REQUEST_METHOD": "GET",
"SCRIPT_NAME": "",
"PATH_INFO": "/path/to/1",
]
router.app(
environ2,
startResponse: startResponse,
sendBody: sendBody
)
XCTAssertEqual(receivedStatus.count, 2)
XCTAssertEqual(receivedStatus.last, "200 OK")
XCTAssertEqual(receivedData.count, 3)
XCTAssertEqual(String(bytes: receivedData[1], encoding: String.Encoding.utf8), "first")
XCTAssertEqual(receivedData.last?.count, 0)
}

func testRegularExpressionRouting() {
let router = Router()
var receivedCaptures: [String]?
Expand Down