From e941da8ad31fe9cfe201574bf6c9c3f2c60fd0ca Mon Sep 17 00:00:00 2001 From: Vadym Markov Date: Fri, 6 May 2016 15:13:01 +0200 Subject: [PATCH 1/5] Carthage update --- Cartfile.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index e7c9c61..8850d21 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "hyperoslo/Sugar" "1.0.3" +github "hyperoslo/Sugar" "1.1.1" From c387221df585c8dd7bafecf42b03118f336b4c9f Mon Sep 17 00:00:00 2001 From: Vadym Markov Date: Fri, 6 May 2016 15:14:02 +0200 Subject: [PATCH 2/5] Switch to UIVIewController --- Sources/iOS/Routable.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/iOS/Routable.swift b/Sources/iOS/Routable.swift index 4681f8c..fbf2781 100644 --- a/Sources/iOS/Routable.swift +++ b/Sources/iOS/Routable.swift @@ -2,5 +2,5 @@ import UIKit public protocol Routable { - func resolve(arguments: [String: String], navigationController: UINavigationController?) + func resolve(arguments: [String: String], currentController: UIViewController) } From 0a562a5ce96d32c4da8aef2841839113c53fb671 Mon Sep 17 00:00:00 2001 From: Vadym Markov Date: Fri, 6 May 2016 15:14:11 +0200 Subject: [PATCH 3/5] Rename method --- Sources/iOS/Router.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/iOS/Router.swift b/Sources/iOS/Router.swift index e5165b0..43c0757 100644 --- a/Sources/iOS/Router.swift +++ b/Sources/iOS/Router.swift @@ -6,9 +6,9 @@ public struct Router { public init() {} - public func navigate(route: String, arguments: [String: String], navigationController: UINavigationController?) { + public func navigate(route: String, arguments: [String: String], from controller: UIViewController) { guard let route = routes[route] else { return } - route.resolve(arguments, navigationController: navigationController) + route.resolve(arguments, currentController: controller) } } From 1a86029cf9a5f0fa2e632a84627add7a82c14edd Mon Sep 17 00:00:00 2001 From: Vadym Markov Date: Fri, 6 May 2016 15:15:20 +0200 Subject: [PATCH 4/5] Update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c213778..e73c019 100644 --- a/README.md +++ b/README.md @@ -80,11 +80,11 @@ route handling code and avoid huge `switch` cases. in one place: ```swift struct ProfileRoute: Routable { - func resolve(arguments: [String: String], navigationController: UINavigationController?) { + func resolve(arguments: [String: String], currentController: UIViewController?) { guard let username = arguments["username"] else { return } let profileController = profileController(title: username) - navigationController?.pushViewController(profileController, animated: true) + currentController.navigationController?.pushViewController(profileController, animated: true) } } ``` From 80629dfa11fd1de57d3bd438e6f01830c7b78576 Mon Sep 17 00:00:00 2001 From: Vadym Markov Date: Fri, 6 May 2016 15:22:07 +0200 Subject: [PATCH 5/5] Fix tests --- CompassTests/iOS/TestRouter.swift | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CompassTests/iOS/TestRouter.swift b/CompassTests/iOS/TestRouter.swift index 9d53ec6..7583f33 100644 --- a/CompassTests/iOS/TestRouter.swift +++ b/CompassTests/iOS/TestRouter.swift @@ -6,7 +6,7 @@ class TestRoute: Routable { var resolved = false - func resolve(arguments: [String: String], navigationController: UINavigationController?) { + func resolve(arguments: [String: String], currentController controller: UIViewController) { resolved = true } } @@ -14,7 +14,7 @@ class TestRoute: Routable { class TestRouter: XCTestCase { var router: Router! - var navigationController = UINavigationController() + var controller = UIViewController() var route: TestRoute! override func setUp() { @@ -24,13 +24,13 @@ class TestRouter: XCTestCase { func testNavigateIfRouteRegistered() { router.routes["test"] = route - router.navigate("test", arguments: [:], navigationController: navigationController) + router.navigate("test", arguments: [:], from: controller) XCTAssertTrue(route.resolved) } func testNavigateIfRouteNotRegistered() { - router.navigate("test", arguments: [:], navigationController: navigationController) + router.navigate("test", arguments: [:], from: controller) XCTAssertFalse(route.resolved) } diff --git a/README.md b/README.md index e73c019..2772cf4 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ route handling code and avoid huge `switch` cases. in one place: ```swift struct ProfileRoute: Routable { - func resolve(arguments: [String: String], currentController: UIViewController?) { + func resolve(arguments: [String: String], currentController: UIViewController) { guard let username = arguments["username"] else { return } let profileController = profileController(title: username)