Functional routers & parsers

DeepLinkHandling/Configuration.swift

@@ -0,0 +1,17 @@
+//
+//  Configuration.swift
+//  Deeper
+//
+//  Created by Ilya Puchka on 29/10/2017.
+//  Copyright © 2017 Ilya Puchka. All rights reserved.
+//
+
+import Foundation
+
+var clearDeeplinkHandling = true
+
+public func configure(clearDeeplinkHandling _clearDeeplinkHandling: Bool = true, logger _logger: Logger? = Logger()) {
+    clearDeeplinkHandling = _clearDeeplinkHandling
+    logger = _logger
+}
+

Deeper/DeepLinkHandler.swift → DeepLinkHandling/DeepLinkHandler.swift

@@ -50,9 +50,14 @@ extension DeepLinkHandler {
 
 open class AnyDeepLinkHandler<Intent>: DeepLinkHandler {
 
-    open var deeplinkHandling: DeepLinkHandling<Intent>?
+    open var deeplinkHandling: DeepLinkHandling<Intent>? {
+        didSet {
+            _setDeeplinkHandling(deeplinkHandling)
+        }
+    }
 
     private let _open: (DeepLink<Intent>, Bool) -> DeepLinkHandling<Intent>
+    private let _setDeeplinkHandling: (DeepLinkHandling<Intent>?) -> Void
 
     public init() {
         guard type(of: self) != AnyDeepLinkHandler<Intent>.self else {
@@ -61,11 +66,15 @@ open class AnyDeepLinkHandler<Intent>: DeepLinkHandler {
         self._open = { _, _ in
             fatalError("Do not call `super.open(deeplink:animated:) -> DeepLinkHandling<Intent>` when inheriting from AnyDeepLinkHandler")
         }
+        self._setDeeplinkHandling = { _ in }
     }
 
     /// Use this initialiser to wrap instances that are not subclasses of `AnyDeepLinkHandler`.
     public init<Handler: DeepLinkHandler>(_ handler: Handler) where Handler.Intent == Intent {
-        self._open = {
+        self._setDeeplinkHandling = { [unowned handler] deeplinkHandling in
+            handler.deeplinkHandling = deeplinkHandling
+        }
+        self._open = { [unowned handler] in
             let handling = handler.open(deeplink: $0, animated: $1)
             switch handling {
             case let .delayed(deeplink, animated, effect):

DeepLinkHandling/DeepLinkRouter.swift

@@ -0,0 +1,33 @@
+//
+//  DeepLinkRouter.swift
+//  Deeper
+//
+//  Created by Ilya Puchka on 29/10/2017.
+//  Copyright © 2017 Ilya Puchka. All rights reserved.
+//
+
+import Foundation
+
+public protocol DeepLinkRouter {
+    associatedtype Intent
+
+    var rootDeepLinkHandler: AnyDeepLinkHandler<Intent>? { get }
+
+    func openURL(_ url: URL) -> Intent?
+}
+
+extension DeepLinkRouter {
+
+    public func canOpen(url: URL) -> Bool {
+        return openURL(url) != nil
+    }
+
+    @discardableResult
+    public func open(url: URL) -> Bool {
+        guard let intent = openURL(url) else { return false }
+        let deeplink = DeepLink(url: url, intent: intent)
+        rootDeepLinkHandler?.open(deeplink: deeplink, animated: true) as Void?
+        return true
+    }
+
+}

DeepLinkHandling/Logger.swift

@@ -0,0 +1,21 @@
+//
+//  Logger.swift
+//  Deeper
+//
+//  Created by Ilya Puchka on 29/10/2017.
+//  Copyright © 2017 Ilya Puchka. All rights reserved.
+//
+
+import Foundation
+
+var logger: Logger? = Logger()
+
+open class Logger {
+
+    public init() {}
+
+    open func log<Handler: DeepLinkHandler>(deeplink: DeepLink<Handler.Intent>, result: DeepLinkHandling<Handler.Intent>, handler: Handler) {
+        print(result)
+    }
+
+}

Deeper/Utils.swift → DeepLinkHandling/Utils.swift

@@ -76,16 +76,3 @@ extension String {
         return items
     }
 }
-
-extension Array where Element == DeepLinkPathPattern {
-
-    var route: DeepLinkRoute {
-        if count == 1, case .string(let str)? = first {
-            return [.string(str)]
-        } else {
-            return DeepLinkRoute(pattern: self)
-        }
-    }
-
-}
-

Deeper.xcodeproj/xcshareddata/xcschemes/DeeperFunc.xcscheme

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0900"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6355F2081FA28632000A608E"
+               BuildableName = "DeeperFunc.framework"
+               BlueprintName = "DeeperFunc"
+               ReferencedContainer = "container:Deeper.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6355F2101FA28633000A608E"
+               BuildableName = "DeeperFuncTests.xctest"
+               BlueprintName = "DeeperFuncTests"
+               ReferencedContainer = "container:Deeper.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6355F2081FA28632000A608E"
+            BuildableName = "DeeperFunc.framework"
+            BlueprintName = "DeeperFunc"
+            ReferencedContainer = "container:Deeper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6355F2081FA28632000A608E"
+            BuildableName = "DeeperFunc.framework"
+            BlueprintName = "DeeperFunc"
+            ReferencedContainer = "container:Deeper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6355F2081FA28632000A608E"
+            BuildableName = "DeeperFunc.framework"
+            BlueprintName = "DeeperFunc"
+            ReferencedContainer = "container:Deeper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Deeper/DeepLinkRoute.swift

@@ -150,3 +150,15 @@ extension String {
         })
     }
 }
+
+extension Array where Element == DeepLinkPathPattern {
+
+    var route: DeepLinkRoute {
+        if count == 1, case .string(let str)? = first {
+            return [.string(str)]
+        } else {
+            return DeepLinkRoute(pattern: self)
+        }
+    }
+
+}

Deeper/Deeper.swift

@@ -6,24 +6,6 @@
 //  Copyright © 2017 Ilya Puchka. All rights reserved.
 //
 
-var clearDeeplinkHandling = true
-var logger: Logger? = Logger()
-
-public func configure(clearDeeplinkHandling: Bool = true, logger: Logger? = Logger()) {
-    Deeper.clearDeeplinkHandling = clearDeeplinkHandling
-    Deeper.logger = logger
-}
-
-open class Logger {
-
-    public init() {}
-
-    open func log<Handler: DeepLinkHandler>(deeplink: DeepLink<Handler.Intent>, result: DeepLinkHandling<Handler.Intent>, handler: Handler) {
-        print(result)
-    }
-
-}
-
 public func /(lhs: DeepLinkRoute, rhs: DeepLinkRoute) -> DeepLinkRoute {
     return DeepLinkRoute(pattern: lhs.pattern + rhs.pattern)
 }

Deeper/DeepLinkRouter.swift → Deeper/Router.swift

@@ -1,20 +1,21 @@
 //
-//  DeepLinkRouter.swift
+//  Router.swift
 //  Deeper
 //
 //  Created by Ilya Puchka on 09/10/2017.
 //  Copyright © 2017 Ilya Puchka. All rights reserved.
 //
 
-public class DeepLinkRouter<Handler: DeepLinkHandler> {
-    weak private(set) var rootDeepLinkHandler: Handler?
+public class Router<Intent>: DeepLinkRouter {
+
+    public private(set) var rootDeepLinkHandler: AnyDeepLinkHandler<Intent>?
     let scheme: String
 
-    public typealias HandlerClosure = (URL, [DeepLinkPatternParameter: String]) -> Handler.Intent?
+    public typealias HandlerClosure = (URL, [DeepLinkPatternParameter: String]) -> Intent?
     var routesHandlers: [DeepLinkRoute: HandlerClosure] = [:]
     var routesPreference: [DeepLinkRoute] = []
 
-    public init(scheme: String, rootDeepLinkHandler: Handler) {
+    public init(scheme: String, rootDeepLinkHandler: AnyDeepLinkHandler<Intent>) {
         self.scheme = scheme
         self.rootDeepLinkHandler = rootDeepLinkHandler
     }
@@ -24,26 +25,14 @@ public class DeepLinkRouter<Handler: DeepLinkHandler> {
         routes.forEach({ routesHandlers[$0] = handler })
     }
 
-    public func canOpen(url: URL) -> Bool {
-        return openURL(url) != nil
-    }
-
-    @discardableResult
-    public func open(url: URL) -> Bool {
-        guard let (_, intent) = openURL(url) else { return false }
-        let deeplink = DeepLink(url: url, intent: intent)
-        rootDeepLinkHandler?.open(deeplink: deeplink, animated: true) as Void?
-        return true
-    }
-
-    func openURL(_ url: URL) -> (DeepLinkPatternMatcher.Result, Handler.Intent)? {
+    public func openURL(_ url: URL) -> Intent? {
         guard url.scheme == scheme else { return nil }
 
         for route in routesPreference {
             let matcher = DeepLinkPatternMatcher(route: route, url: url)
             let result = matcher.match()
             if result.matched, let handler = routesHandlers[route], let intent = handler(url, result.params) {
-                return (result, intent)
+                return intent
             }
         }
         return nil