Don't return nil with empty parameters in URL.replacing(queryParameters:) (#54)

Author: stephanheilner

Swiftification.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "Swiftification"
-  s.version      = "11.0.0"
+  s.version      = "11.0.1"
   s.summary      = "Swift extensions to make life more pleasant."
   s.authors      = 'Hilton Campbell', 'Stephan Heilner', 'Branden Russell', 'Nick Shelley', 'Rhett Rogers'
   s.homepage     = "https://github.com/CrossWaterBridge/Swiftification"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.source       = { :git => "https://github.com/CrossWaterBridge/Swiftification.git", :tag => s.version.to_s }
   s.ios.deployment_target = '10.0'
-  s.osx.deployment_target = '10.13'
+  s.osx.deployment_target = '10.11'
   s.tvos.deployment_target = '10.0'
   s.source_files = 'Swiftification/*.swift'
   s.requires_arc = true

Swiftification/URL.swift

@@ -25,7 +25,8 @@ import Foundation
 public extension URL {
 
     func replacing(queryParameters parameters: [String: String]) -> URL? {
-        guard !parameters.isEmpty, var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else { return nil }
+        guard !parameters.isEmpty else { return self }
+        guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else { return nil }
         components.queryItems = parameters.map { URLQueryItem(name: $0, value: $1) }.sorted { $0.name < $1.name }
         return components.url
     }

SwiftificationTests/URLTests.swift

@@ -25,9 +25,14 @@ import Swiftification
 
 class URLTests: XCTestCase {
 
-    func testAppendingQueryString() {
+    func testReplacingQueryString() {
         let url = URL(string: "http://www.google.com")
         XCTAssertEqual(URL(string: "http://www.google.com?test1=true&test2=false"), url?.replacing(queryParameters: ["test1": "true", "test2": "false" ]))
     }
 
+    func testURLReplacingQueryStringNoParameters() {
+        let url = URL(string: "http://www.google.com")
+        let replacedURL = url?.replacing(queryParameters: [:])
+        XCTAssertEqual(replacedURL, url)
+    }
 }