Merge Turbo and Strada config into Hotwire config

Source/Bridge/Message.swift

@@ -60,7 +60,7 @@ public extension Message {
     {
         let updatedData: String?
         do {
-            let jsonData = try Strada.config.jsonEncoder.encode(data)
+            let jsonData = try Hotwire.config.jsonEncoder.encode(data)
             updatedData = String(data: jsonData, encoding: .utf8)
         } catch {
             logger.error("Error encoding codable object: \(String(describing: data)) -> \(error)")
@@ -79,7 +79,7 @@ public extension Message {
         }
 
         do {
-            let decoder = Strada.config.jsonDecoder
+            let decoder = Hotwire.config.jsonDecoder
             return try decoder.decode(T.self, from: data)
         } catch {
             logger.error("Error decoding json: \(jsonData) -> \(error)")

Source/Bridge/Strada.swift

@@ -1,8 +1,6 @@
 import Foundation
 
 public enum Strada {
-    public static var config: StradaConfig = .init()
-
     public static func userAgentSubstring(for componentTypes: [BridgeComponent.Type]) -> String {
         let components = componentTypes.map { $0.name }.joined(separator: " ")
         return "bridge-components: [\(components)]"

Source/HotwireConfig.swift

@@ -2,6 +2,12 @@ import UIKit
 import WebKit
 
 public struct HotwireConfig {
+    public typealias WebViewBlock = (_ configuration: WKWebViewConfiguration) -> WKWebView
+
+    /// Override to set a custom user agent.
+    /// - Important: Include "Turbo Native" to use `turbo_native_app?` on your Rails server.
+    public var userAgent = "Turbo Native iOS"
+
     /// When enabled, adds a `UIBarButtonItem` of type `.done` to the left
     /// navigation bar button item on screens presented modally.
     public var showDoneButtonOnModals = false
@@ -13,55 +19,68 @@ public struct HotwireConfig {
     /// connecting, disconnecting, receiving/sending messages, and more.
     public var debugLoggingEnabled = false {
         didSet {
-            Turbo.config.debugLoggingEnabled = debugLoggingEnabled
-            Strada.config.debugLoggingEnabled = debugLoggingEnabled
+            TurboLogger.debugLoggingEnabled = debugLoggingEnabled
+            StradaLogger.debugLoggingEnabled = debugLoggingEnabled
         }
     }
 
     // MARK: Turbo
 
-    /// Override to set a custom user agent.
-    /// - Important: Include "Turbo Native" to use `turbo_native_app?` on your Rails server.
-    public var userAgent = Turbo.config.userAgent {
-        didSet { Turbo.config.userAgent = userAgent }
-    }
+    /// Configure options for matching path rules.
+    public var pathConfiguration = PathConfiguration()
 
     /// The view controller used in `TurboNavigator` for web requests. Must be
     /// a `VisitableViewController` or subclass.
-    public var defaultViewController = Turbo.config.defaultViewController {
-        didSet { Turbo.config.defaultViewController = defaultViewController }
+    public var defaultViewController: (URL) -> VisitableViewController = { url in
+        VisitableViewController(url: url)
     }
 
-    /// Optionally customize the web views used by each Turbo Session.
-    /// Ensure you return a new instance each time.
-    public var makeCustomWebView = Turbo.config.makeCustomWebView {
-        didSet { Turbo.config.makeCustomWebView = makeCustomWebView }
+    /// The navigation controller used in `TurboNavigator` for the main and modal stacks.
+    /// Must be a `UINavigationController` or subclass.
+    public var defaultNavigationController: () -> UINavigationController = {
+        UINavigationController()
     }
 
-    /// Enable or disable debug logging for Turbo visits.
-    public var turboDebugLoggingEnabled = Turbo.config.debugLoggingEnabled {
-        didSet { Turbo.config.debugLoggingEnabled = turboDebugLoggingEnabled }
+    /// Optionally customize the web views used by each Turbo Session.
+    /// Ensure you return a new instance each time.
+    public var makeCustomWebView: WebViewBlock = { (configuration: WKWebViewConfiguration) in
+        WKWebView(frame: .zero, configuration: configuration)
     }
 
     // MARK: Bridge
 
     /// Set a custom JSON encoder when parsing bridge payloads.
     /// The custom encoder can be useful when you need to apply specific
     /// encoding strategies, like snake case vs. camel case
-    public var bridgeJsonEncoder = Strada.config.jsonEncoder {
-        didSet { Strada.config.jsonEncoder = bridgeJsonEncoder }
-    }
+    public var jsonEncoder = JSONEncoder()
 
     /// Set a custom JSON decoder when parsing bridge payloads.
     /// The custom decoder can be useful when you need to apply specific
     /// decoding strategies, like snake case vs. camel case
-    public var bridgeJsonDecoder = Strada.config.jsonDecoder {
-        didSet { Strada.config.jsonDecoder = bridgeJsonDecoder }
+    public var jsonDecoder = JSONDecoder()
+
+    // MARK: - Internal
+
+    public func makeWebView() -> WKWebView {
+        makeCustomWebView(makeWebViewConfiguration())
     }
 
-    /// Enable or disable debug logging for bridge elements connecting,
-    /// disconnecting, receiving/sending messages, and more.
-    public var bridgeDebugLoggingEnabled = Strada.config.debugLoggingEnabled {
-        didSet { Strada.config.debugLoggingEnabled = bridgeDebugLoggingEnabled }
+    // MARK: - Private
+
+    private let sharedProcessPool = WKProcessPool()
+
+    // A method (not a property) because we need a new instance for each web view.
+    private func makeWebViewConfiguration() -> WKWebViewConfiguration {
+        let configuration = WKWebViewConfiguration()
+        configuration.applicationNameForUserAgent = userAgent
+        configuration.processPool = sharedProcessPool
+        return configuration
+    }
+}
+
+public extension HotwireConfig {
+    class PathConfiguration {
+        /// Enable to match the query string when applying rules in addition to the path.
+        public var matchQueryStrings = false
     }
 }

Source/Turbo/Path Configuration/PathConfiguration.swift

@@ -54,7 +54,7 @@ public final class PathConfiguration {
 
     /// Returns a merged dictionary containing all the properties that match this URL.
     public func properties(for url: URL) -> PathProperties {
-        if Turbo.config.pathConfiguration.matchQueryStrings, let query = url.query {
+        if Hotwire.config.pathConfiguration.matchQueryStrings, let query = url.query {
             return properties(for: "\(url.path)?\(query)")
         }
         return properties(for: url.path)

Source/Turbo/Turbo Navigator/TurboNavigationHierarchyController.swift

@@ -25,8 +25,8 @@ class TurboNavigationHierarchyController {
 
     init(
         delegate: TurboNavigationHierarchyControllerDelegate,
-        navigationController: UINavigationController = Turbo.config.defaultNavigationController(),
-        modalNavigationController: UINavigationController = Turbo.config.defaultNavigationController()
+        navigationController: UINavigationController = Hotwire.config.defaultNavigationController(),
+        modalNavigationController: UINavigationController = Hotwire.config.defaultNavigationController()
     ) {
         self.delegate = delegate
         self.navigationController = navigationController

Source/Turbo/Turbo Navigator/TurboNavigator.swift

@@ -29,10 +29,10 @@ public class TurboNavigator {
     ///   - pathConfiguration: _optional:_ remote configuration reference
     ///   - delegate: _optional:_ delegate to handle custom view controllers
     public convenience init(pathConfiguration: PathConfiguration? = nil, delegate: TurboNavigatorDelegate? = nil) {
-        let session = Session(webView: Turbo.config.makeWebView())
+        let session = Session(webView: Hotwire.config.makeWebView())
         session.pathConfiguration = pathConfiguration
 
-        let modalSession = Session(webView: Turbo.config.makeWebView())
+        let modalSession = Session(webView: Hotwire.config.makeWebView())
         modalSession.pathConfiguration = pathConfiguration
 
         self.init(session: session, modalSession: modalSession, delegate: delegate)
@@ -131,7 +131,7 @@ public class TurboNavigator {
     private func controller(for proposal: VisitProposal) -> UIViewController? {
         switch delegate.handle(proposal: proposal) {
         case .accept:
-            Turbo.config.defaultViewController(proposal.url)
+            Hotwire.config.defaultViewController(proposal.url)
         case .acceptCustom(let customViewController):
             customViewController
         case .reject:
@@ -289,7 +289,7 @@ extension TurboNavigator {
         guard let _ = session.activeVisitable?.visitableViewController,
               let url = session.activeVisitable?.visitableURL else { return }
 
-        let newSession = Session(webView: Turbo.config.makeWebView())
+        let newSession = Session(webView: Hotwire.config.makeWebView())
         newSession.pathConfiguration = session.pathConfiguration
         newSession.delegate = self
         newSession.webView.uiDelegate = webkitUIDelegate