Merge pull request #16 from AppCron/swift3.1

Swift3.1

Author: Florian Rieger

README.md

@@ -1,5 +1,6 @@
 # ACInteractor
-[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://raw.githubusercontent.com/appcron/acinteractor/master/LICENSE)
+[![License](https://img.shields.io/badge/swift-3.1-orange.svg)](https://swift.org/blog/swift-3-1-released/)
+[![License](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/appcron/acinteractor/master/LICENSE)
 
 Swift Package for a Use Case centric architecture as proposed by Robert C. Martin and others.
 

Sources/InteractorExecuter.swift

@@ -1,31 +1,31 @@
 import Foundation
 
-open class InteractorExecuter {
+class InteractorExecuter {
 
-    fileprivate var interactors = Dictionary<String, AnyObject>()
+    private var interactors = Dictionary<String, AnyObject>()
 
     // MARK: Register
 
-    open func registerInteractor<InteractorProtocol: Interactor, Response>
+    func registerInteractor<InteractorProtocol: Interactor, Response>
         (_ interactor: InteractorProtocol, request: InteractorRequest<Response>)
     {
         let key = String(describing: request)
-        self.interactors[key] = InteractorWrapper(interactor: interactor)
+        interactors[key] = InteractorWrapper(interactor: interactor)
     }
 
     // MARK: Execute
 
-    open func execute<Request: ErrorRequest>(_ request: Request) {
+    func execute<Request: ErrorRequest>(_ request: Request) {
         let key = String(describing: request)
         let optionalValue = interactors[key]
 
         guard let value = optionalValue else {
-            self.fireIntactorNotRegisterdError(request)
+            fireIntactorNotRegisterdError(request)
             return
         }
 
         guard let wrapper = value as? InteractorWrapper<Request> else {
-            self.fireIntactorMismatchError(request)
+            fireIntactorMismatchError(request)
             return
         }
 
@@ -34,19 +34,19 @@ open class InteractorExecuter {
 
     // MARK: Error Handling
 
-    fileprivate func fireErrorOnRequest(_ request: ErrorRequest, errorMessage: String) {
+    private func fireErrorOnRequest(_ request: ErrorRequest, errorMessage: String) {
         let error = InteractorError(message: errorMessage)
         request.onError?(error)
     }
 
-    fileprivate func fireIntactorNotRegisterdError(_ request: ErrorRequest) {
+    private func fireIntactorNotRegisterdError(_ request: ErrorRequest) {
         let message = "ACInteractor.ACInteractorExcuter: No Interactor is registered for this request!"
-        self.fireErrorOnRequest(request, errorMessage: message)
+        fireErrorOnRequest(request, errorMessage: message)
     }
 
-    fileprivate func fireIntactorMismatchError(_ request: ErrorRequest) {
+    private func fireIntactorMismatchError(_ request: ErrorRequest) {
         let message = "ACInteractor.ACInteractorExcuter: Request does not match execute function of registered Interactor!"
-        self.fireErrorOnRequest(request, errorMessage: message)
+        fireErrorOnRequest(request, errorMessage: message)
     }
 
 }
@@ -57,8 +57,8 @@ open class InteractorExecuter {
 // Wrapper class for interactors.
 // This class is required as long as Swift does not support generic protocol types as variable types.
 // For instance:
-// let x = Interactor<RequestType> does not work
-// let x = InteractorWrapper<RequestType> does work
+// let x: Interactor<RequestType> does not work
+// let x: InteractorWrapper<RequestType> does work
 
 private class InteractorWrapper<Request> {
 

Sources/InteractorStatusInMemoryGateway.swift

@@ -2,10 +2,10 @@ import Foundation
 
 class InteractorStatusInMemoryGateway: InteractorStatusGateway {
 
-    fileprivate var running = false
+    private var running = false
 
     func isRunning() -> Bool {
-        return self.running
+        return running
     }
 
     func setRunning(_ running: Bool) {

Sources/LazyInteractor.swift

@@ -2,10 +2,10 @@ import Foundation
 
 class LazyInteractor<InteractorType: Interactor>: Interactor {
 
-    fileprivate(set) var lazyInstance: InteractorType?
-    fileprivate let factory: ((Void) -> InteractorType)
+    private(set) var lazyInstance: InteractorType?
+    private let factory: ((Void) -> InteractorType)
 
-    init(factory:@escaping ((Void) -> InteractorType)) {
+    init(factory: @escaping ((Void) -> InteractorType)) {
         self.factory = factory
     }
 
@@ -15,13 +15,13 @@ class LazyInteractor<InteractorType: Interactor>: Interactor {
         }
 
         let instance = factory()
-        self.lazyInstance = instance
+        lazyInstance = instance
 
         return instance
     }
 
     func execute(_ request: InteractorType.Request) {
-        self.getInteractor().execute(request)
+        getInteractor().execute(request)
     }
 
 }
@@ -30,7 +30,7 @@ class LazyInteractor<InteractorType: Interactor>: Interactor {
 extension LazyInteractor: ErrorHandler {
 
     func handleError(_ request: ErrorRequest, error: Error) {
-        self.getInteractor().handleError(request, error: error)
+        getInteractor().handleError(request, error: error)
     }
 
 }

Tests/ACInteractorTests/ErrorHandlerExtensionTests.swift

@@ -28,7 +28,7 @@ class ErrorHandlerExtensionTests: XCTestCase {
         interactor.handleError(request, error: error)
 
         // Assert
-        let errorResponse = onErrorResponse as? InteractorError
+        let errorResponse = onErrorResponse as InteractorError?
         XCTAssert(errorResponse === error)
     }
 
@@ -41,7 +41,7 @@ class ErrorHandlerExtensionTests: XCTestCase {
         interactor.handleError(request, error: nsError)
 
         // Assert
-        let errorResponse = onErrorResponse as? InteractorError
+        let errorResponse = onErrorResponse as InteractorError?
         XCTAssert(errorResponse === nsError)
     }
 
@@ -56,10 +56,4 @@ class ErrorHandlerExtensionTests: XCTestCase {
         }
     }
 
-    
-    // MARK: Test Error
-    
-    class TestError: Error {
-    }
-        
 }

Tests/ACInteractorTests/InteractorExecuterTests.swift

@@ -104,8 +104,8 @@ class InteractorTests: XCTestCase {
         }
 
     func execute(_ request: Request) {
-        self.numberOfExceuteCalls += 1
-        self.executedRequest = request
+        numberOfExceuteCalls += 1
+        executedRequest = request
         }
     }
 
@@ -117,8 +117,8 @@ class InteractorTests: XCTestCase {
         }
 
         func execute(_ request: Request) {
-            self.numberOfExceuteCalls += 1
-            self.executedRequest = request
+            numberOfExceuteCalls += 1
+            executedRequest = request
         }
     }
 

Tests/ACInteractorTests/LazyInteractorTests.swift

@@ -95,13 +95,13 @@ class LazyInteractorTests: XCTestCase {
         }
 
         func execute(_ request: Request) {
-            self.numberOfExceuteCalls += 1
-            self.executedRequest = request
+            numberOfExceuteCalls += 1
+            executedRequest = request
         }
 
         func handleError(_ request: ErrorRequest, error: Error) {
-            self.handledErrorRequest = request
-            self.handledError = error
+            handledErrorRequest = request
+            handledError = error
         }
     }