Add parameters support

devxoul · Nov 15, 2017 · 9fe6233 · 9fe6233
1 parent 57c0b76
commit 9fe6233
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 28 deletions.
diff --git a/Sources/MoyaSugar/Parameters.swift b/Sources/MoyaSugar/Parameters.swift
@@ -7,23 +7,24 @@ import Moya
 ///
 /// ```
 /// JSONEncoding() => [
-///   "key1": "value1"
-///   "key2": "value2"
+///   "key1": "value1",
+///   "key2": "value2",
+///   "key3": nil,      // will be ignored
 /// ]
 /// ```
 public struct Parameters {
   public var encoding: Alamofire.ParameterEncoding
   public var values: [String: Any]
 
-  public init(encoding: Alamofire.ParameterEncoding, values: [String: Any]) {
+  public init(encoding: Alamofire.ParameterEncoding, values: [String: Any?]) {
     self.encoding = encoding
-    self.values = values
+    self.values = filterNil(values)
   }
 }
 
 extension Parameters: ExpressibleByDictionaryLiteral {
-  public init(dictionaryLiteral elements: (String, Any)...) {
-    var values: [String: Any] = [:]
+  public init(dictionaryLiteral elements: (String, Any?)...) {
+    var values: [String: Any?] = [:]
     for (key, value) in elements {
       values[key] = value
     }
@@ -33,6 +34,16 @@ extension Parameters: ExpressibleByDictionaryLiteral {
 
 infix operator =>
 
-public func => (encoding: Alamofire.ParameterEncoding, values: [String: Any]) -> Parameters {
+public func => (encoding: Alamofire.ParameterEncoding, values: [String: Any?]) -> Parameters {
   return Parameters(encoding: encoding, values: values)
 }
+
+/// Returns a new dictinoary by filtering out nil values.
+private func filterNil(_ dictionary: [String: Any?]) -> [String: Any] {
+  var newDictionary: [String: Any] = [:]
+  for (key, value) in dictionary {
+    guard let value = value else { continue }
+    newDictionary[key] = value
+  }
+  return newDictionary
+}
diff --git a/Sources/MoyaSugar/SugarTargetType.swift b/Sources/MoyaSugar/SugarTargetType.swift
@@ -15,6 +15,7 @@ public protocol SugarTargetType: TargetType {
   /// }
   /// ```
   var route: Route { get }
+  var parameters: Parameters? { get }
 }
 
 public extension SugarTargetType {
@@ -33,4 +34,9 @@ public extension SugarTargetType {
   public var method: Moya.Method {
     return self.route.method
   }
+
+  public var task: Task {
+    guard let parameters = self.parameters else { return .requestPlain }
+    return .requestParameters(parameters: parameters.values, encoding: parameters.encoding)
+  }
 }
diff --git a/Tests/MoyaSugarTests/GitHubAPI.swift b/Tests/MoyaSugarTests/GitHubAPI.swift
@@ -45,29 +45,23 @@ enum GitHubAPI: SugarTargetType, Then {
     }
   }
 
-  var task: Task {
+  var parameters: Parameters? {
     switch self {
-    case .url: return .requestPlain
-    case .index: return .requestPlain
-    case .userRepos: return .requestPlain
+    case .url: return nil
+    case .index: return nil
+    case .userRepos: return nil
 
-    case .createIssue(_, _, let title, let body):
-      return .requestParameters(
-        parameters: filterNil([
-          "title": title,
-          "body": body,
-        ]),
-        encoding: JSONEncoding()
-      )
+    case let .createIssue(_, _, title, body):
+      return JSONEncoding() => [
+        "title": title,
+        "body": body,
+      ]
 
-    case .editIssue(_, _, _, let title, let body):
-      return .requestParameters(
-        parameters: filterNil([
-          "title": title,
-          "body": body,
-        ]),
-        encoding: URLEncoding()
-      )
+    case let .editIssue(_, _, _, title, body):
+      return URLEncoding() => [
+        "title": title,
+        "body": body,
+      ]
     }
   }
 
@@ -81,4 +75,3 @@ enum GitHubAPI: SugarTargetType, Then {
     return Data()
   }
 }
-