Просмотр исходного кода

[Issue #91] Fixing optional HTTP method in Printable and DebugPrintable

Mattt Thompson 11 лет назад
Родитель
Сommit
59503b763a
1 измененных файлов с 11 добавлено и 5 удалено
  1. 11 5
      Source/Alamofire.swift

+ 11 - 5
Source/Alamofire.swift

@@ -828,12 +828,18 @@ extension Request {
 
 extension Request: Printable {
     public var description: String {
-        var description = "\(self.request.HTTPMethod) \(self.request.URL)"
+        var components: [String] = []
+        if self.request.HTTPMethod != nil {
+            components.append(self.request.HTTPMethod!)
+        }
+
+        components.append(self.request.URL.absoluteString!)
+
         if self.response != nil {
-            description += " (\(self.response?.statusCode))"
+            components.append("\(self.response!.statusCode)")
         }
 
-        return description
+        return join(" ", components)
     }
 }
 
@@ -843,8 +849,8 @@ extension Request: DebugPrintable {
 
         let URL = self.request.URL
 
-        if self.request.HTTPMethod != "GET" {
-            components.append("-X \(self.request.HTTPMethod)")
+        if self.request.HTTPMethod != nil && self.request.HTTPMethod != "GET" {
+            components.append("-X \(self.request.HTTPMethod!)")
         }
 
         if let credentialStorage = self.session.configuration.URLCredentialStorage {