Merge branch 'release/1.1' into develop

Author: Juanpe Catalán

Module VIPER.xctemplate/InputOutput/___FILEBASENAME___Presenter.swift

@@ -10,7 +10,7 @@
 
 import UIKit
 
-class ___FILEBASENAMEASIDENTIFIER___Presenter: ___FILEBASENAMEASIDENTIFIER___PresenterProtocol,___FILEBASENAMEASIDENTIFIER___InteractorOutputProtocol {
+class ___FILEBASENAMEASIDENTIFIER___Presenter: ___FILEBASENAMEASIDENTIFIER___PresenterProtocol, ___FILEBASENAMEASIDENTIFIER___InteractorOutputProtocol {
 
     weak private var view: ___FILEBASENAMEASIDENTIFIER___ViewProtocol?
     var interactor: ___FILEBASENAMEASIDENTIFIER___InteractorInputProtocol?

README.md

@@ -27,89 +27,9 @@ This template generates all files that you need to create a new VIPER module. Al
 
 This is an example, we're creating a Login module:
 
-**Protocols**
-```swift
-//MARK: Wireframe -
-protocol LoginWireframeProtocol: class {
-
-}
-//MARK: Presenter -
-protocol LoginPresenterProtocol: class {
-
-}
-
-//MARK: Interactor -
-protocol LoginInteractorProtocol: class {
-
-  var presenter: LoginPresenterProtocol?  { get set }
-}
-
-//MARK: View -
-protocol LoginViewProtocol: class {
-
-  var presenter: LoginPresenterProtocol?  { get set }
-}
-```
-
-**Interactor**
-```swift
-class LoginInteractor: LoginInteractorProtocol {
-
-    weak var presenter: LoginPresenterProtocol?
-}
-```
-
-**Presenter**
-```swift
-class LoginPresenter: LoginPresenterProtocol {
-
-    weak private var view: LoginViewProtocol?
-    private let interactor: LoginInteractorProtocol
-    private let router: LoginWireframeProtocol
+- ![Default, without divide](/assets/defaultOutput.md)
+- ![With divided Interactor (Input & Output)](/assets/inputOutput.md)
 
-    init(interface: LoginViewProtocol, interactor: LoginInteractorProtocol, router: LoginWireframeProtocol) {
-        self.view = interface
-        self.interactor = interactor
-        self.router = router
-
-        self.interactor.presenter = self
-    }
-}
-```
-
-**Wireframe**
-```swift
-class LoginRouter: LoginWireframeProtocol {
-
-    weak var viewController: UIViewController?
-
-    static func createModule() -> UIViewController {
-        
-        let view = LoginViewController(nibName: nil, bundle: nil)
-        let interactor = LoginInteractor()
-        let router = LoginRouter()
-        let presenter = LoginPresenter(interface: view, interactor: interactor, router: router)
-
-        view.presenter = presenter
-        interactor.presenter = presenter
-        router.viewController = view
-
-        return view
-    }
-}
-```
-
-**View**
-```swift
-class LoginViewController: UIViewController, LoginViewProtocol {
-
-	var presenter: LoginPresenterProtocol?
-
-	override func viewDidLoad() {
-        super.viewDidLoad()
-    }
-}
-```
 ## VIPER diagram overview
 ![Preview](/assets/viper_diagram.png)
 
@@ -127,7 +47,7 @@ Would you like decide what will be the next feature? now, you can do it [here](h
 
 * [x] Create bash script to install more easy
 * [ ] Add Dependency Injection Framework
-* [ ] Divide Interactor protocol (Input & Output)
+* [x] Divide Interactor protocol (Input & Output)
 * [ ] ~~Create groups in template~~ *(Only available for Project templates)*
 
 ## References

assets/defaultOutput.md

@@ -0,0 +1,85 @@
+## Default Login Module
+
+**Protocols**
+```swift
+//MARK: Wireframe -
+protocol LoginWireframeProtocol: class {
+
+}
+//MARK: Presenter -
+protocol LoginPresenterProtocol: class {
+
+}
+
+//MARK: Interactor -
+protocol LoginInteractorProtocol: class {
+
+var presenter: LoginPresenterProtocol?  { get set }
+}
+
+//MARK: View -
+protocol LoginViewProtocol: class {
+
+var presenter: LoginPresenterProtocol?  { get set }
+}
+```
+
+**Interactor**
+```swift
+class LoginInteractor: LoginInteractorProtocol {
+
+weak var presenter: LoginPresenterProtocol?
+}
+```
+
+**Presenter**
+```swift
+class LoginPresenter: LoginPresenterProtocol {
+
+weak private var view: LoginViewProtocol?
+private let interactor: LoginInteractorProtocol
+private let router: LoginWireframeProtocol
+
+init(interface: LoginViewProtocol, interactor: LoginInteractorProtocol, router: LoginWireframeProtocol) {
+self.view = interface
+self.interactor = interactor
+self.router = router
+
+self.interactor.presenter = self
+}
+}
+```
+
+**Wireframe**
+```swift
+class LoginRouter: LoginWireframeProtocol {
+
+weak var viewController: UIViewController?
+
+static func createModule() -> UIViewController {
+
+let view = LoginViewController(nibName: nil, bundle: nil)
+let interactor = LoginInteractor()
+let router = LoginRouter()
+let presenter = LoginPresenter(interface: view, interactor: interactor, router: router)
+
+view.presenter = presenter
+interactor.presenter = presenter
+router.viewController = view
+
+return view
+}
+}
+```
+
+**View**
+```swift
+class LoginViewController: UIViewController, LoginViewProtocol {
+
+var presenter: LoginPresenterProtocol?
+
+override func viewDidLoad() {
+super.viewDidLoad()
+}
+}
+```

assets/inputOutput.md

@@ -0,0 +1,94 @@
+## Login Module with divided Interactor (Input & Output)
+
+**Protocols**
+```swift
+//MARK: Wireframe -
+protocol LoginWireframeProtocol: class {
+
+}
+//MARK: Presenter -
+protocol LoginPresenterProtocol: class {
+
+var interactor: LoginInteractorInputProtocol? { get set }
+}
+
+//MARK: Interactor -
+protocol LoginInteractorOutputProtocol: class {
+
+/* Interactor -> Presenter */
+}
+
+protocol LoginInteractorInputProtocol: class {
+
+var presenter: LoginInteractorOutputProtocol?  { get set }
+
+/* Presenter -> Interactor */
+}
+
+//MARK: View -
+protocol LoginViewProtocol: class {
+
+var presenter: LoginPresenterProtocol?  { get set }
+
+/* Presenter -> ViewController */
+}
+```
+
+**Interactor**
+```swift
+class LoginInteractor: LoginInteractorInputProtocol {
+
+weak var presenter: LoginInteractorOutputProtocol?
+}
+```
+
+**Presenter**
+```swift
+class LoginPresenter: LoginPresenterProtocol, LoginInteractorOutputProtocol {
+
+weak private var view: LoginViewProtocol?
+var interactor: LoginInteractorInputProtocol?
+private let router: LoginWireframeProtocol
+
+init(interface: LoginViewProtocol, interactor: LoginInteractorInputProtocol?, router: LoginWireframeProtocol) {
+self.view = interface
+self.interactor = interactor
+self.router = router
+}
+}
+```
+
+**Wireframe**
+```swift
+class LoginRouter: LoginWireframeProtocol {
+
+weak var viewController: UIViewController?
+
+static func createModule() -> UIViewController {
+// Change to get view from storyboard if not using progammatic UI
+let view = LoginViewController(nibName: nil, bundle: nil)
+let interactor = LoginInteractor()
+let router = LoginRouter()
+let presenter = LoginPresenter(interface: view, interactor: interactor, router: router)
+
+view.presenter = presenter
+interactor.presenter = presenter
+router.viewController = view
+
+return view
+}
+}
+
+```
+
+**View**
+```swift
+class LoginViewController: UIViewController, LoginViewProtocol {
+
+var presenter: LoginPresenterProtocol?
+
+override func viewDidLoad() {
+super.viewDidLoad()
+}
+}
+```