From 7fe541ae8da705202cece959370ba4b92ac669aa Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Sun, 22 Nov 2015 23:19:35 +0100 Subject: [PATCH 1/2] Remove delimiter from argument keys --- Source/Compass.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Compass.swift b/Source/Compass.swift index cbfd2e5..c172445 100644 --- a/Source/Compass.swift +++ b/Source/Compass.swift @@ -32,7 +32,7 @@ public struct Compass { if queryArguments.count == routeArguments.count { for (index, key) in routeArguments.enumerate() { - arguments[key] = index <= queryArguments.count && "\(query):" != prefix + arguments[String(key.characters.dropFirst().dropLast())] = index <= queryArguments.count && "\(query):" != prefix ? queryArguments[index] : nil } completion(route: route, arguments: arguments) From 7e4c0b30b4ec9b9fcae0f2e143abf00decc3a535 Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Sun, 22 Nov 2015 23:19:42 +0100 Subject: [PATCH 2/2] Fix test --- Pod/Tests/TestCompass.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pod/Tests/TestCompass.swift b/Pod/Tests/TestCompass.swift index 5901b91..3db8148 100644 --- a/Pod/Tests/TestCompass.swift +++ b/Pod/Tests/TestCompass.swift @@ -23,7 +23,7 @@ class TestCompass: XCTestCase { let url = NSURL(string: "compassTests://profile:testUser")! Compass.parse(url) { route, arguments in XCTAssertEqual("profile:{user}", route) - XCTAssertEqual(arguments["{user}"], "testUser") + XCTAssertEqual(arguments["user"], "testUser") } }