Merge pull request #25 from hyperoslo/improve/routable

Improve/routable

Cartfile.resolved

@@ -1 +1 @@
-github "hyperoslo/Sugar" "1.0.3"
+github "hyperoslo/Sugar" "1.1.1"

CompassTests/iOS/TestRouter.swift

@@ -6,15 +6,15 @@ class TestRoute: Routable {
 
   var resolved = false
 
-  func resolve(arguments: [String: String], navigationController: UINavigationController?) {
+  func resolve(arguments: [String: String], currentController controller: UIViewController) {
     resolved = true
   }
 }
 
 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)
   }

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)
   }
 }
 ```

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)
 }

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)
   }
 }