More Hashable models using Swift 4.1

Author: alexruperez

.swift-version

@@ -1 +1 @@
-4.0
+4.1

Core/NetAuthorization.swift

@@ -8,12 +8,10 @@
 
 import Foundation
 
-public enum NetAuthorization {
+public enum NetAuthorization: Hashable {
     case none, basic(user: String, password: String), bearer(token: String), custom(String)
 }
 
-extension NetAuthorization: Equatable {}
-
 extension NetAuthorization: RawRepresentable {
 
     private struct StringValue {

Core/NetCacheControl.swift

@@ -8,12 +8,10 @@
 
 import Foundation
 
-public enum NetCacheControl {
+public enum NetCacheControl: Equatable {
     case maxAge(TimeInterval), maxStale(TimeInterval?), minFresh(TimeInterval), noCache, noStore, noTransform, onlyIfCached, custom(String)
 }
 
-extension NetCacheControl: Equatable {}
-
 extension NetCacheControl: RawRepresentable {
 
     private struct StringValue {

Core/NetContentType.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public enum NetContentType {
+public enum NetContentType: Hashable {
     case aac, avi, bin, bmp, csv, form, formURL, gif, html, ico, ics, jpeg, js, json, mpeg, mpkg, ogx, pdf, pkcs7, plist, png, rar, rtf, svg, tar, tiff, ttf, txt, wav, weba, webm, webp, wildcard, xhtml, xml, zip, custom(String)
 }
 

Core/NetMultipartFormData.swift

@@ -21,7 +21,7 @@ public class NetMultipartFormData {
     }
 
     struct BoundaryGenerator {
-        enum BoundaryType {
+        enum BoundaryType: Hashable {
             case initial, encapsulated, final
         }
 

Core/NetReachability.swift

@@ -11,11 +11,11 @@ import SystemConfiguration
 
 public class NetReachability {
 
-    public enum Connection {
+    public enum Connection: Hashable {
         case ethernetOrWiFi, wwan
     }
 
-    public enum Status {
+    public enum Status: Hashable {
         case unknown, unreachable, reachable(Connection)
     }
 
@@ -146,23 +146,6 @@ public class NetReachability {
 
 }
 
-extension NetReachability.Status: Equatable {
-
-    public static func ==(lhs: NetReachability.Status, rhs: NetReachability.Status) -> Bool {
-        switch (lhs, rhs) {
-        case (.unknown, .unknown):
-            return true
-        case (.unreachable, .unreachable):
-            return true
-        case let (.reachable(lhsConnectionType), .reachable(rhsConnectionType)):
-            return lhsConnectionType == rhsConnectionType
-        default:
-            return false
-        }
-    }
-
-}
-
 extension NetReachability.Status: CustomStringConvertible {
 
     public var description: String {

Core/NetRequest.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct NetRequest {
+public struct NetRequest: Hashable {
 
     public typealias NetContentLength = UInt64
 
@@ -66,6 +66,10 @@ public struct NetRequest {
 
     public let authorization: NetAuthorization
 
+    public var hashValue: Int {
+        return url.hashValue + httpMethod.hashValue
+    }
+
 }
 
 extension NetRequest {
@@ -165,19 +169,3 @@ extension NetRequest: CustomDebugStringConvertible {
     }
 
 }
-
-extension NetRequest: Hashable {
-
-    public var hashValue: Int {
-        return url.hashValue + httpMethod.hashValue
-    }
-
-}
-
-extension NetRequest: Equatable {
-
-    public static func ==(lhs: NetRequest, rhs: NetRequest) -> Bool {
-        return lhs.url == rhs.url && lhs.httpMethod == rhs.httpMethod
-    }
-
-}

Core/NetResponse.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct NetResponse {
+public struct NetResponse: Equatable {
 
     public let url: URL?
 
@@ -32,6 +32,13 @@ public struct NetResponse {
 
     let responseObject: Any?
 
+    public static func ==(lhs: NetResponse, rhs: NetResponse) -> Bool {
+        guard lhs.url != nil && rhs.url != nil else {
+            return false
+        }
+        return lhs.url == rhs.url
+    }
+
 }
 
 extension NetResponse {
@@ -81,17 +88,6 @@ extension NetResponse {
 
 }
 
-extension NetResponse: Equatable {
-
-    public static func ==(lhs: NetResponse, rhs: NetResponse) -> Bool {
-        guard lhs.url != nil && rhs.url != nil else {
-            return false
-        }
-        return lhs.url == rhs.url
-    }
-
-}
-
 extension NetResponse: CustomStringConvertible {
 
     public var description: String {

Stub/NetStub.swift

@@ -13,7 +13,7 @@ open class NetStub: Net {
         case response(NetResponse), error(NetError)
     }
 
-    public enum AsyncBehavior {
+    public enum AsyncBehavior: Equatable {
         case immediate(DispatchQueue?), delayed(DispatchQueue?, DispatchTimeInterval)
     }