既存コードをAPI Guidelineに準拠させる

Documentation/ThreadBlock.md

@@ -6,6 +6,9 @@ Sync ver
 ```swift
 static func syncFetchWeather(_ jsonString: String) throws -> String
 ```
+
+このメソッドは、値を返すまでに少し時間がかかります。
+
 [APIの概要](YumemiWeather.md)  
 
 ## 課題

Example/Example/Model/DisasterModel.swift

@@ -20,15 +20,15 @@ class DisasterModelImpl: DisasterModel {
     }
 
     func fetchDisaster(completion: ((String) -> Void)?) {
-        self.fetchDisasterHandler = completion
-        self.yumemiDisaster.fetchDisaster()
+        fetchDisasterHandler = completion
+        yumemiDisaster.fetchDisaster()
     }
 }
 
 extension DisasterModelImpl: YumemiDisasterHandleDelegate {
 
     func handle(disaster: String) {
-        self.fetchDisasterHandler?(disaster)
+        fetchDisasterHandler?(disaster)
     }
 
 }

Example/Example/UI/Weather/WeatherViewController.swift

@@ -30,7 +30,7 @@ class WeatherViewController: UIViewController {
         super.viewDidLoad()
 
         NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification, object: nil, queue: nil) { [unowned self] notification in
-            self.loadWeather(notification.object)
+            loadWeather(notification.object)
         }
     }
 
@@ -39,11 +39,11 @@ class WeatherViewController: UIViewController {
     }
 
     @IBAction func dismiss(_ sender: Any) {
-        self.dismiss(animated: true, completion: nil)
+        dismiss(animated: true, completion: nil)
     }
 
     @IBAction func loadWeather(_ sender: Any?) {
-        self.activityIndicator.startAnimating()
+        activityIndicator.startAnimating()
         weatherModel.fetchWeather(at: "tokyo", date: Date()) { result in
             DispatchQueue.main.async {
                 self.activityIndicator.stopAnimating()
@@ -58,9 +58,9 @@ class WeatherViewController: UIViewController {
     func handleWeather(result: Result<Response, WeatherError>) {
         switch result {
         case .success(let response):
-            self.weatherImageView.set(weather: response.weather)
-            self.minTempLabel.text = String(response.minTemp)
-            self.maxTempLabel.text = String(response.maxTemp)
+            weatherImageView.set(weather: response.weather)
+            minTempLabel.text = String(response.minTemp)
+            maxTempLabel.text = String(response.maxTemp)
 
         case .failure(let error):
             let message: String
@@ -79,7 +79,7 @@ class WeatherViewController: UIViewController {
                     print("Close ViewController by \(alertController)")
                 }
             })
-            self.present(alertController, animated: true, completion: nil)
+            present(alertController, animated: true, completion: nil)
         }
     }
 }
@@ -88,14 +88,14 @@ private extension UIImageView {
     func set(weather: Weather) {
         switch weather {
         case .sunny:
-            self.image = R.image.sunny()
-            self.tintColor = R.color.red()
+            image = R.image.sunny()
+            tintColor = R.color.red()
         case .cloudy:
-            self.image = R.image.cloudy()
-            self.tintColor = R.color.gray()
+            image = R.image.cloudy()
+            tintColor = R.color.gray()
         case .rainy:
-            self.image = R.image.rainy()
-            self.tintColor = R.color.blue()
+            image = R.image.rainy()
+            tintColor = R.color.blue()
         }
     }
 }

Example/ExampleTests/WeatherViewControllerTests.swift

@@ -12,66 +12,90 @@ import YumemiWeather
 
 class WeatherViewControllerTests: XCTestCase {
 
-    var weahterViewController: WeatherViewController!
-    var weahterModel: WeatherModelMock!
+    var weatherViewController: WeatherViewController!
+    var weatherModel = WeatherModelMock()
 
     override func setUpWithError() throws {
-        weahterModel = WeatherModelMock()
-        weahterViewController = R.storyboard.weather.instantiateInitialViewController()!
-        weahterViewController.weatherModel = weahterModel
-        _ = weahterViewController.view
+        weatherViewController = R.storyboard.weather.instantiateInitialViewController()!
+        weatherViewController.weatherModel = weatherModel
+        weatherViewController.disasterModel = DisasterModelMock()
+
+        weatherViewController.loadViewIfNeeded()
     }
 
     override func tearDownWithError() throws {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
 
-    func test_天気予報がsunnyだったらImageViewのImageにsunnyが設定されること_TintColorがredに設定されること() throws {
-        weahterModel.fetchWeatherImpl = { _ in
-            Response(weather: .sunny, maxTemp: 0, minTemp: 0, date: Date())
+    @MainActor
+    func test_天気予報がsunnyだったらImageViewのImageにsunnyが設定されること_TintColorがredに設定されること() async throws {
+        weatherModel.fetchWeatherImpl = { _ in
+            let response = Response(weather: .sunny, maxTemp: 0, minTemp: 0, date: Date())
+            return Result.success(response)
         }
 
-        weahterViewController.loadWeather()
-        XCTAssertEqual(weahterViewController.weatherImageView.tintColor, R.color.red())
-        XCTAssertEqual(weahterViewController.weatherImageView.image, R.image.sunny())
+        weatherViewController.loadWeather(self)
+        await Task.yield()
+
+        XCTAssertEqual(weatherViewController.weatherImageView.tintColor, R.color.red())
+        XCTAssertEqual(weatherViewController.weatherImageView.image, R.image.sunny())
     }
 
-    func test_天気予報がcloudyだったらImageViewのImageにcloudyが設定されること_TintColorがgrayに設定されること() throws {
-        weahterModel.fetchWeatherImpl = { _ in
-            Response(weather: .cloudy, maxTemp: 0, minTemp: 0, date: Date())
+    @MainActor
+    func test_天気予報がcloudyだったらImageViewのImageにcloudyが設定されること_TintColorがgrayに設定されること() async throws {
+        weatherModel.fetchWeatherImpl = { _ in
+            let response = Response(weather: .cloudy, maxTemp: 0, minTemp: 0, date: Date())
+            return Result.success(response)
         }
 
-        weahterViewController.loadWeather()
-        XCTAssertEqual(weahterViewController.weatherImageView.tintColor, R.color.gray())
-        XCTAssertEqual(weahterViewController.weatherImageView.image, R.image.cloudy())
+        weatherViewController.loadWeather(self)
+        await Task.yield()
+
+        XCTAssertEqual(weatherViewController.weatherImageView.tintColor, R.color.gray())
+        XCTAssertEqual(weatherViewController.weatherImageView.image, R.image.cloudy())
     }
 
-    func test_天気予報がrainyだったらImageViewのImageにrainyが設定されること_TintColorがblueに設定されること() throws {
-        weahterModel.fetchWeatherImpl = { _ in
-            Response(weather: .rainy, maxTemp: 0, minTemp: 0, date: Date())
+    @MainActor
+    func test_天気予報がrainyだったらImageViewのImageにrainyが設定されること_TintColorがblueに設定されること() async throws {
+        weatherModel.fetchWeatherImpl = { _ in
+            let response = Response(weather: .rainy, maxTemp: 0, minTemp: 0, date: Date())
+            return Result.success(response)
         }
 
-        weahterViewController.loadWeather()
-        XCTAssertEqual(weahterViewController.weatherImageView.tintColor, R.color.blue())
-        XCTAssertEqual(weahterViewController.weatherImageView.image, R.image.rainy())
+        weatherViewController.loadWeather(self)
+        await Task.yield()
+
+        XCTAssertEqual(weatherViewController.weatherImageView.tintColor, R.color.blue())
+        XCTAssertEqual(weatherViewController.weatherImageView.image, R.image.rainy())
     }
 
-    func test_最高気温_最低気温がUILabelに設定されること() throws {
-        weahterModel.fetchWeatherImpl = { _ in
-            Response(weather: .rainy, maxTemp: 100, minTemp: -100, date: Date())
+    @MainActor
+    func test_最高気温_最低気温がUILabelに設定されること() async throws {
+        weatherModel.fetchWeatherImpl = { _ in
+            let response = Response(weather: .rainy, maxTemp: 100, minTemp: -100, date: Date())
+            return Result.success(response)
         }
 
-        weahterViewController.loadWeather()
-        XCTAssertEqual(weahterViewController.minTempLabel.text, "-100")
-        XCTAssertEqual(weahterViewController.maxTempLabel.text, "100")
+        weatherViewController.loadWeather(self)
+        await Task.yield()
+
+        XCTAssertEqual(weatherViewController.minTempLabel.text, "-100")
+        XCTAssertEqual(weatherViewController.maxTempLabel.text, "100")
     }
 }
 
 class WeatherModelMock: WeatherModel {
 
-    var fetchWeatherImpl: ((Request) throws -> Response)!
+    var fetchWeatherImpl: ((Request) -> Result<Response, WeatherError>)!
 
-    func fetchWeather(_ request: Request) throws -> Response {
-        return try fetchWeatherImpl(request)
+    func fetchWeather(at area: String, date: Date, completion: @escaping (Result<Response, WeatherError>) -> Void) {
+        completion(fetchWeatherImpl(Request(area: area, date: date)))
+    }
+}
+
+final class DisasterModelMock: DisasterModel {
+
+    func fetchDisaster(completion: ((String) -> Void)?) {
+        completion?("只今、災害情報はありません。")
     }
 }

Sources/YumemiWeather/YumemiDisaster.swift

@@ -18,7 +18,7 @@ public class YumemiDisaster {
     public init() {}
 
     public func fetchDisaster() {
-        self.delegate?.handle(disaster: "只今、災害情報はありません。")
+        delegate?.handle(disaster: "只今、災害情報はありません。")
     }
 
 }

Sources/YumemiWeather/YumemiWeather.swift

@@ -25,59 +25,10 @@ public enum YumemiWeatherError: Swift.Error {
 
 final public class YumemiWeather {
 
-    static let apiDuration: TimeInterval = 2
-
-    private static let dateFormatter: DateFormatter = {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
-        return dateFormatter
-    }()
-
-    static let decoder: JSONDecoder = {
-        let decoder = JSONDecoder()
-        decoder.dateDecodingStrategy = .formatted(dateFormatter)
-        return decoder
-    }()
-
-    static let encoder: JSONEncoder = {
-        let encoder = JSONEncoder()
-        encoder.keyEncodingStrategy = .convertToSnakeCase
-        encoder.dateEncodingStrategy = .formatted(dateFormatter)
-        return encoder
-    }()
-
-    /// 引数の値でResponse構造体を作成する。引数がnilの場合はランダムに値を作成する。
-    /// - Parameters:
-    ///   - weatherCondition: 天気状況を表すenum
-    ///   - maxTemperature: 最高気温
-    ///   - minTemperature: 最低気温
-    ///   - date: 日付
-    ///   - seed: シード値
-    /// - Returns: Response構造体
-
-    static func makeRandomResponse(weatherCondition: WeatherCondition? = nil, maxTemperature: Int? = nil, minTemperature: Int? = nil, date: Date? = nil, seed: Int? = nil) -> Response {
-        return makeRandomResponse(weatherCondition: weatherCondition, maxTemperature: maxTemperature, minTemperature: minTemperature, date: date, seed: seed ?? Int.random(in: Int.min...Int.max))
-    }
-
-    private static func makeRandomResponse(weatherCondition: WeatherCondition?, maxTemperature: Int?, minTemperature: Int?, date: Date?, seed seedValue: Int) -> Response {
-        var generator = SeedRandomNumberGenerator(seed: seedValue)
-        let weatherCondition = weatherCondition ?? WeatherCondition.allCases.randomElement(using: &generator)!
-        let maxTemperature = maxTemperature ?? Int.random(in: 10...40, using: &generator)
-        let minTemperature = minTemperature ?? Int.random(in: -40..<maxTemperature, using: &generator)
-        let date = date ?? Date()
-
-        return Response(
-            weatherCondition: weatherCondition.rawValue,
-            maxTemperature: maxTemperature,
-            minTemperature: minTemperature,
-            date: date
-        )
-    }
-
     /// 擬似 天気予報 API Simple ver
     /// - Returns: 天気状況を表す文字列 "sunny" or "cloudy" or "rainy"
     public static func fetchWeatherCondition() -> String {
-        return self.makeRandomResponse().weatherCondition
+        return makeRandomResponse().weatherCondition
     }
 
     /// 擬似 天気予報 API Throws ver
@@ -90,7 +41,7 @@ final public class YumemiWeather {
             throw YumemiWeatherError.unknownError
         }
 
-        return self.makeRandomResponse().weatherCondition
+        return makeRandomResponse().weatherCondition
     }
 
     /// 擬似 天気予報 API JSON ver
@@ -153,13 +104,8 @@ final public class YumemiWeather {
     /// - Returns: Weather レスポンスの JSON 文字列
     public static func syncFetchWeather(_ jsonString: String) throws -> String {
         Thread.sleep(forTimeInterval: apiDuration)
-        return try self.fetchWeather(jsonString)
+        return try fetchWeather(jsonString)
     }
-
-
-    /// - Throws: YumemiWeatherError パラメータが正常でもランダムにエラーが発生する
-    /// - Parameter jsonString: 地域と日付を含む JSON 文字列
-    /// - Returns: Weather レスポンスの JSON 文字列
 
     /// 擬似 天気予報 API Callback ver
     ///
@@ -187,10 +133,10 @@ final public class YumemiWeather {
         DispatchQueue.global().asyncAfter(deadline: .now() + apiDuration) {
             do {
                 let response = try fetchWeather(jsonString)
-                completion(Result.success(response))
+                completion(.success(response))
             }
-            catch let error where error is YumemiWeatherError {
-                completion(Result.failure(error as! YumemiWeatherError))
+            catch let error as YumemiWeatherError {
+                completion(.failure(error))
             }
             catch {
                 fatalError()
@@ -228,3 +174,57 @@ final public class YumemiWeather {
         }
     }
 }
+
+extension YumemiWeather {
+
+    static let apiDuration: TimeInterval = 2
+
+    private static let dateFormatter: DateFormatter = {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
+        return dateFormatter
+    }()
+
+    static let decoder: JSONDecoder = {
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = .formatted(dateFormatter)
+        return decoder
+    }()
+
+    static let encoder: JSONEncoder = {
+        let encoder = JSONEncoder()
+        encoder.keyEncodingStrategy = .convertToSnakeCase
+        encoder.dateEncodingStrategy = .formatted(dateFormatter)
+        return encoder
+    }()
+
+    /// 引数の値でResponse構造体を作成する。引数がnilの場合はランダムに値を作成する。
+    /// - Parameters:
+    ///   - weatherCondition: 天気状況を表すenum
+    ///   - maxTemperature: 最高気温
+    ///   - minTemperature: 最低気温
+    ///   - date: 日付
+    ///   - seed: シード値
+    /// - Returns: Response構造体
+
+    static func makeRandomResponse(
+        weatherCondition: WeatherCondition? = nil,
+        maxTemperature: Int? = nil,
+        minTemperature: Int? = nil,
+        date: Date? = nil,
+        seed: Int? = nil
+    ) -> Response {
+        var generator = SeedRandomNumberGenerator(seed: seed ?? Int.random(in: Int.min...Int.max))
+        let weatherCondition = weatherCondition ?? WeatherCondition.allCases.randomElement(using: &generator)!
+        let maxTemperature = maxTemperature ?? Int.random(in: 10...40, using: &generator)
+        let minTemperature = minTemperature ?? Int.random(in: -40..<maxTemperature, using: &generator)
+        let date = date ?? Date()
+
+        return Response(
+            weatherCondition: weatherCondition.rawValue,
+            maxTemperature: maxTemperature,
+            minTemperature: minTemperature,
+            date: date
+        )
+    }
+}