Modified a Param component of the BodyBuilder to a Field component (#22)

Author: devyhan

.swiftpm/xcode/package.xcworkspace/xcuserdata/ijaewon.xcuserdatad/UserInterfaceState.xcuserstate

@@ -76,9 +76,9 @@ Request {
 Request {
   ...
   Body {
-    Param("VALUE", forKey: "KEY")
-    Param("VALUE1", forKey: "KEY1")
-    Param("VALUE2", forKey: "KEY2")
+    Field("VALUE", forKey: "KEY")
+    Field("VALUE1", forKey: "KEY1")
+    Field("VALUE2", forKey: "KEY2")
     ...
   }
   ...
@@ -240,13 +240,13 @@ enum APIs: RouterProtocol {
             Path("orgs/\(organizationName)/repos")
           }
           Body {
-            Param(repositoryInfo.name, forKey: "name")
-            Param(repositoryInfo.description, forKey: "description")
-            Param(repositoryInfo.homePage, forKey: "homepage")
-            Param(repositoryInfo.private, forKey: "private")
-            Param(repositoryInfo.hasIssues, forKey: "has_issues")
-            Param(repositoryInfo.hasProjects, forKey: "has_projects")
-            Param(repositoryInfo.hasWiki, forKey: "has_wiki")
+            Field(repositoryInfo.name, forKey: "name")
+            Field(repositoryInfo.description, forKey: "description")
+            Field(repositoryInfo.homePage, forKey: "homepage")
+            Field(repositoryInfo.private, forKey: "private")
+            Field(repositoryInfo.hasIssues, forKey: "has_issues")
+            Field(repositoryInfo.hasProjects, forKey: "has_projects")
+            Field(repositoryInfo.hasWiki, forKey: "has_wiki")
           }
         }
       case let .searchRepositories(query):

README.md

@@ -45,23 +45,3 @@ public extension Body {
     self = body
   }
 }
-
-public struct Param: BodyProtocol {
-  private let value: Any
-  private let key: String
-
-  public init(_ value: Any, forKey key: String) {
-    self.value = value
-    self.key = key
-  }
-
-  public func build(_ body: inout Body) {
-    var dictionary: Dictionary<String, Any> = [:]
-    for item in body.body {
-      dictionary.updateValue(item.value, forKey: item.key)
-    }
-    dictionary.updateValue(value, forKey: key)
-    body = Body(dictionary)
-  }
-}
-

Sources/APIRouter/BodyBuilder.swift

@@ -46,21 +46,32 @@ public extension Header {
   }
 }
 
-public struct Field: HeaderProtocol {
-  private let value: String
+public struct Field: HeaderProtocol, BodyProtocol {
+  private let value: Any
   private let key: String
 
-  public init(_ value: String, forKey key: String) {
+  public init(_ value: Any, forKey key: String) {
     self.value = value
     self.key = key
   }
 
   public func build(_ header: inout Header) {
-    var headers: [String: String] = [:]
+    var headers: Dictionary<String, String> = [:]
     for item in header.headers {
-      headers.updateValue(item.value, forKey: item.key)
+      headers.updateValue(String(item.value), forKey: item.key)
+    }
+    if let value = value as? String {
+      headers.updateValue(String(value), forKey: key)
     }
-    headers.updateValue(value, forKey: key)
     header = Header(headers)
   }
+  
+  public func build(_ body: inout Body) {
+    var dictionary: Dictionary<String, Any> = [:]
+    for item in body.body {
+      dictionary.updateValue(item.value, forKey: item.key)
+    }
+    dictionary.updateValue(value, forKey: key)
+    body = Body(dictionary)
+  }
 }

Sources/APIRouter/HeaderBuilder.swift

@@ -13,9 +13,9 @@ final class BodyBuilderTests: XCTestCase {
           Body {
             switch self {
             case .one:
-              Param("VALUE", forKey: "OPTIONONE")
+              Field("VALUE", forKey: "OPTIONONE")
             case .two:
-              Param("VALUE", forKey: "OPTIONTWO")
+              Field("VALUE", forKey: "OPTIONTWO")
             }
           }
         }
@@ -40,9 +40,9 @@ final class BodyBuilderTests: XCTestCase {
         Request {
           Body {
             if self == .one {
-              Param("VALUE", forKey: "OPTIONONE")
+              Field("VALUE", forKey: "OPTIONONE")
             } else {
-              Param("VALUE", forKey: "OPTIONTWO")
+              Field("VALUE", forKey: "OPTIONTWO")
             }
           }
         }
@@ -69,7 +69,7 @@ final class BodyBuilderTests: XCTestCase {
     let request = Request {
       Body {
         for param in params {
-          Param(param.value, forKey: param.key)
+          Field(param.value, forKey: param.key)
         }
       }
     }

Tests/APIRouterTests/BodyBuilderTests.swift

@@ -6,7 +6,7 @@ final class RequestBuilderTests: XCTestCase {
   func testGeneratedHttpRequestBodyWithBodyBuilder() {
     let request = Request {
       Body {
-        Param("VALUE", forKey: "KEY")
+        Field("VALUE", forKey: "KEY")
       }
     }
 

Tests/APIRouterTests/RequestBuilderTests.swift

@@ -7,7 +7,7 @@ final class RouterBuilderTests: XCTestCase {
     let router = Router {
       Request {
         Body {
-          Param("VALUE", forKey: "KEY")
+          Field("VALUE", forKey: "KEY")
         }
         Method(.get)
         Header {
@@ -40,7 +40,7 @@ final class RouterBuilderTests: XCTestCase {
       BaseURL("https://www.baseurl.com")
       Request {
         Body {
-          Param("VALUE", forKey: "KEY")
+          Field("VALUE", forKey: "KEY")
         }
         Method(.get)
         Header {
@@ -77,7 +77,7 @@ final class RouterBuilderTests: XCTestCase {
           case .one:
             Request {
               Body {
-                Param("VALUE", forKey: "KEY")
+                Field("VALUE", forKey: "KEY")
               }
               Method(.get)
               Header {
@@ -91,7 +91,7 @@ final class RouterBuilderTests: XCTestCase {
           case .two:
             Request {
               Body {
-                Param("VALUE", forKey: "KEY")
+                Field("VALUE", forKey: "KEY")
               }
               Method(.get)
               Header {