Merge pull request #3 from BinaryBirds/feature/trailingSlash

Implemented possibility to disable trailing slashes

Author: viaszkadi

Sources/SwiftHttp/HttpUrl.swift

@@ -31,6 +31,9 @@ public struct HttpUrl {
     /// Fragment of the url, e.g. `#foo`
     public private(set) var fragment: String?
 
+    /// Appends trailing slash at the end of the path, e.g. `localhost.com/any/path/`
+    public private(set) var isTrailingSlashEnabled: Bool
+    
     ///
     /// Initialize a HttpUrl object
     ///
@@ -41,21 +44,24 @@ public struct HttpUrl {
     /// - Parameter resource: The  resource, default: `nil`
     /// - Parameter query: The  query, default: `[:]`
     /// - Parameter fragment: The  fragment, default: `nil`
+    /// - Parameter trailingSlashEnabled: Sets  ``HttpUrl/isTrailingSlashEnabled``, default: `true`
     ///
     public init(scheme: String = "https",
                 host: String,
                 port: Int = 80,
                 path: [String] = [],
                 resource: String? = nil,
                 query: [String : String] = [:],
-                fragment: String? = nil) {
+                fragment: String? = nil,
+                trailingSlashEnabled: Bool = true) {
         self.scheme = scheme
         self.host = host
         self.port = port
         self.path = path
         self.resource = resource
         self.query = query
         self.fragment = fragment
+        self.isTrailingSlashEnabled = trailingSlashEnabled
     }
 }
 
@@ -139,7 +145,9 @@ public extension HttpUrl {
             path += (resource.hasPrefix("/") ? resource : "/" + resource)
         }
         else {
-            path += "/"
+            if isTrailingSlashEnabled {
+                path += "/"
+            }
         }
         components.path = path
         components.fragment = fragment

Tests/SwiftHttpTests/HttpUrlTests.swift

@@ -27,5 +27,15 @@ final class HttpUrlTests: XCTestCase {
         ])
         XCTAssertEqual(query2Url.url.absoluteString, "https://jsonplaceholder.typicode.com/todos/?foo=1")
     }
+    
+    func testTrailingSlash() {
+        let baseUrl = HttpUrl(host: "jsonplaceholder.typicode.com", trailingSlashEnabled: false)
+        
+        let todosUrl = baseUrl.path("todos")
+        XCTAssertEqual(todosUrl.url.absoluteString, "https://jsonplaceholder.typicode.com/todos")
+
+        let query1Url = baseUrl.path("todos").query("foo", "bar")
+        XCTAssertEqual(query1Url.url.absoluteString, "https://jsonplaceholder.typicode.com/todos?foo=bar")
+    }
 }