简化URLTargetType

lixiang1994 · Dec 16, 2021 · f9f66d3 · f9f66d3
1 parent 66c80dc
commit f9f66d3
Show file tree

Hide file tree

Showing 10 changed files with 191 additions and 179 deletions.
diff --git a/Apis.podspec b/Apis.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "Apis"
-s.version      = "1.0.0"
+s.version      = "1.1.0"
 s.summary      = "基于URLNavigator抽象的URL路由组件 灵感来自Moya 配置化 插件化."
 
 s.homepage     = "https://github.com/lixiang1994/Apis"

diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Apis (1.0.0)
+  - Apis (1.1.0)
   - SnapKit (5.0.1)
 
 DEPENDENCIES:
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Apis: ecfe56226311038186e77c4d5ac87b447dcec059
+  Apis: 681bea8ec9f382fa3eba50404325a5514d391fd2
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
 
 PODFILE CHECKSUM: 199c77b4710d6bba7448d0daa0a0ecd06f10ef6c

diff --git a/Demo/Pods/Local Podspecs/Apis.podspec.json b/Demo/Pods/Local Podspecs/Apis.podspec.json
diff --git a/Demo/Pods/Manifest.lock b/Demo/Pods/Manifest.lock
diff --git a/Demo/Pods/Pods.xcodeproj/project.pbxproj b/Demo/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Demo/Pods/Target Support Files/Apis/Apis-Info.plist b/Demo/Pods/Target Support Files/Apis/Apis-Info.plist
diff --git a/Demo/Pods/Target Support Files/Pods-Demo/Pods-Demo-acknowledgements.markdown b/Demo/Pods/Target Support Files/Pods-Demo/Pods-Demo-acknowledgements.markdown
diff --git a/Demo/Pods/Target Support Files/Pods-Demo/Pods-Demo-acknowledgements.plist b/Demo/Pods/Target Support Files/Pods-Demo/Pods-Demo-acknowledgements.plist
diff --git a/README.md b/README.md
@@ -94,51 +94,28 @@ private let schemes = "router"
 
 extension RouterTarget: URLTargetType {
     
-    static var activated: [URLPattern] {
+    static var bindings: [URLPatternBinding<RouterTarget>] {
         return [
-            "http://<path:_>",
-            "https://<path:_>",
-            schemes + "://open/none",
-            schemes + "://open/fast",
-            schemes + "://open/live",
-            schemes + "://open/needlogin"
+            .init("http://<path:_>") { source in
+                guard let url = source.url.value else { return .none }
+                return .open_http(url: url)
+            },
+            .init("https://<path:_>") { source in
+                guard let url = source.url.value else { return .none }
+                return .open_https(url: url)
+            },
+            .init(schemes + "://open/none") {
+                return .open_none
+            },
+            .init(schemes + "://open/live") { source in
+                guard let id = source.url.queryParameters["id"] else { return nil }
+                return .open_live(id: id)
+            },
+            .init(schemes + "://open/some") {
+                return .open_some
+            }
         ]
     }
-    
-    var pattern: String {
-        switch self {
-        case .open_http:        return "http://<path:_>"
-        case .open_https:       return "https://<path:_>"
-        case .open_none:        return schemes + "://open/none"
-        case .open_live:        return schemes + "://open/live"
-        case .open_some:        return schemes + "://open/some"
-        }
-    }
-    
-    init?(pattern: URLPattern, url: URLConvertible, values: [String : Any]) {
-        switch pattern {
-        case "http://<path:_>":
-            guard let url = url.value else { return nil }
-            self = .open_http(url: url)
-            
-        case "https://<path:_>":
-            guard let url = url.value else { return nil }
-            self = .open_https(url: url)
-            
-        case schemes + "://open/none":
-            self = .open_none
-            
-        case schemes + "://open/live":
-            guard let id = url.queryParameters["id"] else { return nil }
-            self = .open_live(id: id)
-            
-        case schemes + "://open/some":
-            self = .open_some
-            
-        default:
-            return nil
-        }
-    }
 }
 ```
 

diff --git a/README_CN.md b/README_CN.md
@@ -96,54 +96,29 @@ extension SFSafariViewController: Routerable { }
 private let schemes = "router"
 
 extension RouterTarget: URLTargetType {
-    
-    // 激活的URL模板集合
-    static var activated: [URLPattern] {
+    // URL模板绑定 不同的模板返回不同的Target
+    static var bindings: [URLPatternBinding<RouterTarget>] {
         return [
-            "http://<path:_>",
-            "https://<path:_>",
-            schemes + "://open/none",
-            schemes + "://open/fast",
-            schemes + "://open/live",
-            schemes + "://open/needlogin"
+            .init("http://<path:_>") { source in
+                guard let url = source.url.value else { return .none }
+                return .open_http(url: url)
+            },
+            .init("https://<path:_>") { source in
+                guard let url = source.url.value else { return .none }
+                return .open_https(url: url)
+            },
+            .init(schemes + "://open/none") {
+                return .open_none
+            },
+            .init(schemes + "://open/live") { source in
+                guard let id = source.url.queryParameters["id"] else { return nil }
+                return .open_live(id: id)
+            },
+            .init(schemes + "://open/some") {
+                return .open_some
+            }
         ]
     }
-    
-    // URL模板
-    var pattern: String {
-        switch self {
-        case .open_http:        return "http://<path:_>"
-        case .open_https:       return "https://<path:_>"
-        case .open_none:        return schemes + "://open/none"
-        case .open_live:        return schemes + "://open/live"
-        case .open_some:        return schemes + "://open/some"
-        }
-    }
-    
-    init?(pattern: URLPattern, url: URLConvertible, values: [String : Any]) {
-        switch pattern {
-        case "http://<path:_>":
-            guard let url = url.value else { return nil }
-            self = .open_http(url: url)
-            
-        case "https://<path:_>":
-            guard let url = url.value else { return nil }
-            self = .open_https(url: url)
-            
-        case schemes + "://open/none":
-            self = .open_none
-            
-        case schemes + "://open/live":
-            guard let id = url.queryParameters["id"] else { return nil }
-            self = .open_live(id: id)
-            
-        case schemes + "://open/some":
-            self = .open_some
-            
-        default:
-            return nil
-        }
-    }
 }
 ```