Added matcher for host

Vinyl/RequestMatcherRegistry.swift

@@ -11,6 +11,7 @@ import Foundation
 public enum RequestMatcherType {
     case method
     case url
+    case host
     case path
     case query
     case headers
@@ -42,6 +43,8 @@ public struct RequestMatcherRegistry {
             return MethodRequestMatcher()
         case .url:
             return URLRequestMatcher()
+        case .host:
+            return HostRequestMatcher()
         case .path:
             return PathRequestMatcher()
         case .query:
@@ -65,13 +68,19 @@ private struct MethodRequestMatcher: RequestMatcher {
     }
 }
 
-private  struct URLRequestMatcher: RequestMatcher {
+private struct URLRequestMatcher: RequestMatcher {
     func match(lhs: Request, rhs: Request) -> Bool {
         return lhs.url == rhs.url
     }
 }
 
-private  struct PathRequestMatcher: RequestMatcher {
+private struct HostRequestMatcher: RequestMatcher {
+    func match(lhs: Request, rhs: Request) -> Bool {
+        return lhs.url?.host == rhs.url?.host
+    }
+}
+
+private struct PathRequestMatcher: RequestMatcher {
     func match(lhs: Request, rhs: Request) -> Bool {
         return lhs.url?.path == rhs.url?.path
     }

VinylTests/Arbitrary.swift

@@ -88,6 +88,26 @@ let pathParameterGen: Gen<String> = pathParameterGenArray.map { xs in
     }
 }
 
+func pathParameterGenArrayMinimumSize(_ minimumSize: Int) -> Gen<[String]> {
+    return Gen.sized { sz in
+        return parameterGen.proliferate(withSize: max(sz + 1, minimumSize))
+    }
+}
+
+func pathParameterGenMinimumSize(_ minimumSize: Int) -> Gen<String> {
+    return pathParameterGenArrayMinimumSize(minimumSize).map { xs in
+        return xs.reduce("?") {
+            switch $0 {
+            case "?":
+                return $0 + $1
+            default:
+                return $0 + "&" + $1
+            }
+        }
+    }
+}
+
+
 private func curry<A, B, C>(_ f : @escaping (A, B) -> C) -> (A) -> (B) -> C {
     return { a in { b in f(a, b) } }
 }

VinylTests/RequestMatcherRegistryTests.swift

@@ -24,7 +24,7 @@ extension Dictionary {
 class RequestMatcherRegistryTests: XCTestCase {
     func testProperties() {
         property("Requests with identical paths and query parameters should match") <- forAllNoShrink(
-              Gen<RequestMatcherType>.fromElements(of: [RequestMatcherType.path, .query, .body])
+              Gen<RequestMatcherType>.fromElements(of: [.path, .query, .body])
             , urlStringGen
             , urlPathGen
             , pathParameterGen
@@ -41,6 +41,48 @@ class RequestMatcherRegistryTests: XCTestCase {
 
             return registry.matchableRequests(request: aRequest, with: anotherRequest)
         }
+
+        property("Requests with different order of query parameters should not match by URL")  <- forAllNoShrink(
+            Gen<RequestMatcherType>.fromElements(of: [.url, .path, .query, .body])
+            , urlStringGen
+            , urlPathGen
+            , pathParameterGenMinimumSize(2)
+            , Optional<String>.arbitrary
+        ) { (type, url, path, params, body) in
+            let registry = RequestMatcherRegistry(types: [type])
+            let commonData = body?.data(using: .utf8)
+
+            var aRequest = URLRequest(url: URL(string: url + path + params )!)
+            aRequest.httpBody = commonData
+
+            let shuffledParams = "?" + params.dropFirst().components(separatedBy: "&").reversed().joined(separator: "&")
+
+            var anotherRequest = URLRequest(url: URL(string: url + path + shuffledParams)!)
+            anotherRequest.httpBody = commonData
+
+            return registry.matchableRequests(request: aRequest, with: anotherRequest)
+        }.expectFailure
+
+        property("Requests with different order of query parameters should match by Host")  <- forAllNoShrink(
+            Gen<RequestMatcherType>.fromElements(of: [.host, .path, .query, .body])
+            , urlStringGen
+            , urlPathGen
+            , pathParameterGenMinimumSize(2)
+            , Optional<String>.arbitrary
+        ) { (type, url, path, params, body) in
+            let registry = RequestMatcherRegistry(types: [type])
+            let commonData = body?.data(using: .utf8)
+
+            var aRequest = URLRequest(url: URL(string: url + path + params )!)
+            aRequest.httpBody = commonData
+
+            let shuffledParams = "?" + params.dropFirst().components(separatedBy: "&").reversed().joined(separator: "&")
+
+            var anotherRequest = URLRequest(url: URL(string: url + path + shuffledParams)!)
+            anotherRequest.httpBody = commonData
+
+            return registry.matchableRequests(request: aRequest, with: anotherRequest)
+        }
 
         property("Requests with identical headers should match") <- forAllNoShrink(
               urlStringGen