Merge branch release/0.8.3

Author: rakuyoMo

RaAPIWrapper.podspec

@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
 
   s.name             = 'RaAPIWrapper'
 
-  s.version          = '0.8.2'
+  s.version          = '0.8.3'
 
   s.summary          = 'Wrappers for requesting api.'
 

Sources/RequestInfo/APIParameter.swift

@@ -26,8 +26,9 @@ extension Array: APIParameter {
         (self as [Any?])
             .lazy
             .compactMap {
+                if let value = $0 as? Encodable { return value }
                 if let value = $0 as? APIParameter { return value.toParameters }
-                return $0 as? Encodable
+                return mapAnyObjectToEncodable($0 as? AnyObject)
             }
             .map { AnyEncodable($0) }
     }
@@ -39,9 +40,28 @@ extension Dictionary: APIParameter where Key == String {
     public var toParameters: Encodable {
         (self as [String: Any?])
             .compactMapValues {
+                if let value = $0 as? Encodable { return value }
                 if let value = $0 as? APIParameter { return value.toParameters }
-                return $0 as? Encodable
+                return mapAnyObjectToEncodable($0 as? AnyObject)
             }
             .mapValues { AnyEncodable($0) }
     }
 }
+
+// MARK: - Tools
+
+fileprivate extension APIParameter {
+    func mapAnyObjectToEncodable(_ value: AnyObject?) -> Encodable? {
+        guard let _value = value else { return nil }
+        
+        if let result = _value as? String { return result }
+        if let result = _value as? Int { return result }
+        if let result = _value as? Double { return result }
+        if let result = _value as? Bool { return result }
+        if let result = _value as? Data { return result }
+        if let result = _value as? [String: Any] { return result.toParameters }
+        if let result = _value as? [Any] { return result.toParameters }
+        
+        return nil
+    }
+}

Sources/RequestInfo/APIRequestInfo.swift

@@ -58,3 +58,11 @@ extension APIRequestInfo: Hashable {
         hasher.combine(ObjectIdentifier(self))
     }
 }
+
+// MARK: - CustomStringConvertible
+
+extension APIRequestInfo: CustomStringConvertible {
+    public var description: String {
+        "specialBaseURL: \(specialBaseURL?.absoluteString ?? "nil"); path: \(path); method: \(method.rawValue); header: \(header?.description ?? "nil"); parameters: \(String(describing: parameters)); parameterEncoding: \(String(describing: parameterEncoding))"
+    }
+}