Fix more warning

.swiftlint.yml

@@ -10,6 +10,7 @@ excluded:
   - TMDBSwiftTests
   - TMDBSwiftTestable
   - TVDBSwiftTests
+  - TVDBSwiftTestable
   - CouchTrackerPlayground.playground
   - Project.swift
 

TVDBSwift/TVDBTokenRequestInterceptor.swift

@@ -8,7 +8,9 @@ final class TVDBTokenRequestInterceptor: RequestInterceptor {
     self.tvdb = tvdb
   }
 
-  func intercept<T>(target: T.Type, endpoint: Endpoint, done: @escaping MoyaProvider<T>.RequestResultClosure) where T: TVDBType {
+  func intercept<T>(target: T.Type,
+                    endpoint: Endpoint,
+                    done: @escaping MoyaProvider<T>.RequestResultClosure) where T: TVDBType {
     guard let tvdb = self.tvdb else {
       done(.failure(MoyaError.requestMapping(endpoint.url)))
       return

TVDBSwiftTestable/TVDBTestableBundle.swift

@@ -0,0 +1,15 @@
+public final class TVDBTestableBundle {
+    public static let bundle = Bundle(for: TVDBTestableBundle.self)
+
+    public static func url(forResource name: String) -> URL {
+        return bundle.url(forResource: name, withExtension: "json")!
+    }
+
+    public static func data(forResource name: String) throws -> Data {
+        return try Data(contentsOf: url(forResource: name))
+    }
+
+    public static func decode<T: Decodable>(resource name: String, decoder: JSONDecoder = .init()) throws -> T {
+        return try decoder.decode(T.self, from: data(forResource: name))
+    }
+}

TraktSwift/Models/Airs.swift

@@ -1,4 +1,4 @@
-public final class Airs: Codable, Hashable {
+public struct Airs: Codable, Hashable {
   public let day: String?
   public let time: String?
   public let timezone: String
@@ -7,29 +7,11 @@ public final class Airs: Codable, Hashable {
     case day, time, timezone
   }
 
-  public required init(from decoder: Decoder) throws {
+  public init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     day = try container.decodeIfPresent(String.self, forKey: .day)
     time = try container.decodeIfPresent(String.self, forKey: .time)
     timezone = try container.decode(String.self, forKey: .timezone)
   }
-
-  public var hashValue: Int {
-    var hash = timezone.hashValue
-
-    if let dayHash = day?.hashValue {
-      hash ^= dayHash
-    }
-
-    if let timeHash = time?.hashValue {
-      hash ^= timeHash
-    }
-
-    return hash
-  }
-
-  public static func == (lhs: Airs, rhs: Airs) -> Bool {
-    return lhs.hashValue == rhs.hashValue
-  }
 }

TraktSwift/Models/Base/BaseEpisode.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public final class BaseEpisode: Codable, Hashable {
+public struct BaseEpisode: Codable, Hashable {
   public let number: Int
   public let collectedAt: Date?
   public let plays: Int?
@@ -15,7 +15,7 @@ public final class BaseEpisode: Codable, Hashable {
     case completed
   }
 
-  public required init(from decoder: Decoder) throws {
+  public init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     number = try container.decode(Int.self, forKey: .number)
@@ -28,30 +28,4 @@ public final class BaseEpisode: Codable, Hashable {
     let lastWatchedAt = try container.decodeIfPresent(String.self, forKey: .lastWatchedAt)
     self.lastWatchedAt = TraktDateTransformer.dateTimeTransformer.transformFromJSON(lastWatchedAt)
   }
-
-  public var hashValue: Int {
-    var hash = number.hashValue
-
-    if let collectedAtHash = collectedAt?.hashValue {
-      hash = hash ^ collectedAtHash
-    }
-
-    if let playsHash = plays?.hashValue {
-      hash = hash ^ playsHash
-    }
-
-    if let lastWatchedAtHash = lastWatchedAt?.hashValue {
-      hash = hash ^ lastWatchedAtHash
-    }
-
-    if let completedHash = completed?.hashValue {
-      hash = hash ^ completedHash
-    }
-
-    return hash
-  }
-
-  public static func == (lhs: BaseEpisode, rhs: BaseEpisode) -> Bool {
-    return lhs.hashValue == rhs.hashValue
-  }
 }

TraktSwift/Models/Base/BaseIds.swift

@@ -29,22 +29,16 @@ public class BaseIds: Codable, Hashable, CustomStringConvertible {
     try container.encodeIfPresent(imdb, forKey: .imdb)
   }
 
-  public var hashValue: Int {
-    var hash = trakt.hashValue
-
-    if let tmdbHash = tmdb?.hashValue {
-      hash = hash ^ tmdbHash
-    }
-
-    if let imdbHash = imdb?.hashValue {
-      hash = hash ^ imdbHash
-    }
-
-    return hash
+  public func hash(into hasher: inout Hasher) {
+    hasher.combine(trakt)
+    hasher.combine(tmdb)
+    hasher.combine(imdb)
   }
 
   public static func == (lhs: BaseIds, rhs: BaseIds) -> Bool {
-    return lhs.hashValue == rhs.hashValue
+    return lhs.trakt == rhs.trakt &&
+      lhs.tmdb == rhs.tmdb &&
+      lhs.imdb == rhs.imdb
   }
 
   public var description: String {

TraktSwift/Models/Base/BaseMovie.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public final class BaseMovie: Codable, Hashable {
+public struct BaseMovie: Codable, Hashable {
   public let movie: Movie?
   public let collectedAt: Date?
   public let watchedAt: Date?
@@ -14,7 +14,7 @@ public final class BaseMovie: Codable, Hashable {
     case listedAt = "listed_at"
   }
 
-  public required init(from decoder: Decoder) throws {
+  public init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     movie = try container.decodeIfPresent(Movie.self, forKey: .movie)
@@ -28,34 +28,4 @@ public final class BaseMovie: Codable, Hashable {
     self.listedAt = TraktDateTransformer.dateTimeTransformer.transformFromJSON(listedAt)
     self.watchedAt = TraktDateTransformer.dateTimeTransformer.transformFromJSON(watchedAt)
   }
-
-  public var hashValue: Int {
-    var hash = 11
-
-    if let movieHash = movie?.hashValue {
-      hash ^= movieHash
-    }
-
-    if let collectedAtHash = collectedAt?.hashValue {
-      hash ^= collectedAtHash
-    }
-
-    if let watchedAtHash = watchedAt?.hashValue {
-      hash ^= watchedAtHash
-    }
-
-    if let listedAtHash = listedAt?.hashValue {
-      hash ^= listedAtHash
-    }
-
-    if let playsHash = plays?.hashValue {
-      hash ^= playsHash
-    }
-
-    return hash
-  }
-
-  public static func == (lhs: BaseMovie, rhs: BaseMovie) -> Bool {
-    return lhs.hashValue == rhs.hashValue
-  }
 }

TraktSwift/Models/Base/BaseSeason.swift

@@ -1,4 +1,4 @@
-public final class BaseSeason: Codable, Hashable {
+public struct BaseSeason: Codable, Hashable {
   public let number: Int
   public let episodes: [BaseEpisode]
   public let aired: Int?
@@ -8,32 +8,12 @@ public final class BaseSeason: Codable, Hashable {
     case number, episodes, aired, completed
   }
 
-  public required init(from decoder: Decoder) throws {
+  public init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     number = try container.decode(Int.self, forKey: .number)
     episodes = try container.decode([BaseEpisode].self, forKey: .episodes)
     aired = try container.decodeIfPresent(Int.self, forKey: .aired)
     completed = try container.decodeIfPresent(Int.self, forKey: .completed)
   }
-
-  public var hashValue: Int {
-    var hash = number.hashValue
-
-    if let airedHash = aired?.hashValue {
-      hash = hash ^ airedHash
-    }
-
-    if let completedHash = completed?.hashValue {
-      hash = hash ^ completedHash
-    }
-
-    episodes.forEach { hash = hash ^ $0.hashValue }
-
-    return hash
-  }
-
-  public static func == (lhs: BaseSeason, rhs: BaseSeason) -> Bool {
-    return lhs.hashValue == rhs.hashValue
-  }
 }

TraktSwift/Models/Base/BaseShow.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public final class BaseShow: Codable, Hashable {
+public struct BaseShow: Codable, Hashable {
   public let show: Show?
   public let seasons: [BaseSeason]?
   public let lastCollectedAt: Date?
@@ -21,7 +21,7 @@ public final class BaseShow: Codable, Hashable {
     case nextEpisode = "next_episode"
   }
 
-  public required init(from decoder: Decoder) throws {
+  public init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     show = try container.decodeIfPresent(Show.self, forKey: .show)
@@ -40,50 +40,4 @@ public final class BaseShow: Codable, Hashable {
     self.listedAt = TraktDateTransformer.dateTimeTransformer.transformFromJSON(listedAt)
     self.lastWatchedAt = TraktDateTransformer.dateTimeTransformer.transformFromJSON(lastWatchedAt)
   }
-
-  public var hashValue: Int {
-    var hash = 11
-
-    if let showHash = show?.hashValue {
-      hash = hash ^ showHash
-    }
-
-    seasons?.forEach { hash = hash ^ $0.hashValue }
-
-    if let lastCollectedAtHash = lastCollectedAt?.hashValue {
-      hash = hash ^ lastCollectedAtHash
-    }
-
-    if let listedAtHash = listedAt?.hashValue {
-      hash = hash ^ listedAtHash
-    }
-
-    if let playsHash = plays?.hashValue {
-      hash = hash ^ playsHash
-    }
-
-    if let lastWatchedAtHash = lastWatchedAt?.hashValue {
-      hash = hash ^ lastWatchedAtHash
-    }
-
-    if let airedHash = aired?.hashValue {
-      hash = hash ^ airedHash
-    }
-
-    if let completedHash = completed?.hashValue {
-      hash = hash ^ completedHash
-    }
-
-    hiddenSeasons?.forEach { hash = hash ^ $0.hashValue }
-
-    if let nextEpisodeHash = nextEpisode?.hashValue {
-      hash = hash ^ nextEpisodeHash
-    }
-
-    return hash
-  }
-
-  public static func == (lhs: BaseShow, rhs: BaseShow) -> Bool {
-    return lhs.hashValue == rhs.hashValue
-  }
 }

TraktSwift/Models/Base/BaseTrendingEntity.swift

@@ -1,11 +1,11 @@
 public class BaseTrendingEntity: Codable, Hashable {
   public let watchers: Int
 
-  public var hashValue: Int {
-    return watchers.hashValue
+  public func hash(into hasher: inout Hasher) {
+    hasher.combine(watchers)
   }
 
   public static func == (lhs: BaseTrendingEntity, rhs: BaseTrendingEntity) -> Bool {
-    return lhs.hashValue == rhs.hashValue
+    return lhs.watchers == rhs.watchers
   }
 }

TraktSwift/Models/Base/StandardMediaEntity.swift

@@ -1,12 +1,12 @@
 import Foundation
 
 public class StandardMediaEntity: Codable, Hashable {
-  public var title: String?
-  public var overview: String?
-  public var rating: Double?
-  public var votes: Int?
-  public var updatedAt: Date?
-  public var translations: [String]?
+  public let title: String?
+  public let overview: String?
+  public let rating: Double?
+  public let votes: Int?
+  public let updatedAt: Date?
+  public let translations: [String]?
 
   private enum CodingKeys: String, CodingKey {
     case title
@@ -40,35 +40,21 @@ public class StandardMediaEntity: Codable, Hashable {
     self.updatedAt = TraktDateTransformer.dateTimeTransformer.transformFromJSON(updatedAt)
   }
 
-  public var hashValue: Int {
-    var hash = 0
-
-    if let titleHash = title?.hashValue {
-      hash = hash ^ titleHash
-    }
-
-    if let overviewHash = overview?.hashValue {
-      hash = hash ^ overviewHash
-    }
-
-    if let ratingHash = rating?.hashValue {
-      hash = hash ^ ratingHash
-    }
-
-    if let votesHash = votes?.hashValue {
-      hash = hash ^ votesHash
-    }
-
-    if let updatedAtHash = updatedAt?.hashValue {
-      hash = hash ^ updatedAtHash
-    }
-
-    translations?.forEach { hash = hash ^ $0.hashValue }
-
-    return hash
+  public func hash(into hasher: inout Hasher) {
+    hasher.combine(title)
+    hasher.combine(overview)
+    hasher.combine(rating)
+    hasher.combine(votes)
+    hasher.combine(updatedAt)
+    hasher.combine(translations)
   }
 
   public static func == (lhs: StandardMediaEntity, rhs: StandardMediaEntity) -> Bool {
-    return lhs.hashValue == rhs.hashValue
+    return lhs.title == rhs.title &&
+      lhs.overview == rhs.overview &&
+      lhs.rating == rhs.rating &&
+      lhs.votes == rhs.votes &&
+      lhs.updatedAt == rhs.updatedAt &&
+      lhs.translations == rhs.translations
   }
 }