vipergen 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63d3d600a323f49c0d30b5ce4bffb88d588963f
-  data.tar.gz: bb2773bac66525a309dcb13e5e1b9a3d49aaffc9
+  metadata.gz: 57e481b334e4e929326fdb7b3552341d6aba3fb9
+  data.tar.gz: 91ffbdeee7885f026dbf6c98394624b54ee0024c
 SHA512:
-  metadata.gz: 57a82ac765eede2fe27dbc8cae1d1e8110140bb2c0efc18bba561ae360dfb93d1c2d2752e1c992bd5c5aabc6cd1d81a617f76e962941f79c19e3327e1930b8dd
-  data.tar.gz: fe635ff1a3d51544fe87f3209895888899e788f15c67d89ce54a5666ac77334cc9b85c78385a36a9416df2e740c520f67962ff468eebf5800bfdedfeac26e36a
+  metadata.gz: ec4be53a4f8552ef8d29ee80ae091f0a88b00617479577788028b3fd56309c5be81fe3dfe36a8a9643d8e576dbb01a0b434e7302676958410f276a93a4d9de9b
+  data.tar.gz: f5632d720eb3d684b6d0244b23ebb9312cbe71ef0dcb2c5c94d950b0cddb27f9202fd674c51a48c6ce545e3dedd5ce93932d44828767f5b6c74736b2e0a4ad03

data/lib/templates/default/objc/Presenter/VIPERPresenter.h

@@ -6,13 +6,13 @@
 #import <Foundation/Foundation.h>
 #import "VIPERProtocols.h"
 
-@class VIPERWireframe;
+@class VIPERWireFrame;
 
 @interface VIPERPresenter : NSObject <VIPERPresenterProtocol, VIPERInteractorOutputProtocol>
 
 // Properties
-@property (nonatomic, strong) UIViewController <VIPERViewControllerProtocol> * viewController;
+@property (nonatomic, weak) id <VIPERViewProtocol> view;
 @property (nonatomic, strong) id <VIPERInteractorInputProtocol> interactor;
-@property (nonatomic, strong) VIPERWireframe *wireFrame;
+@property (nonatomic, strong) VIPERWireFrame *wireFrame;
 
 @end

data/lib/templates/default/objc/Protocols/VIPERProtocols.h

@@ -7,43 +7,58 @@
 #import <UIKit/UIKit.h>
 
 @protocol VIPERDataManagerOutputProtocol;
-@protocol VIPERViewControllerProtocol;
+@protocol VIPERInteractorOutputProtocol;
+@protocol VIPERInteractorInputProtocol;
+@protocol VIPERViewProtocol;
 @protocol VIPERPresenterProtocol;
 @protocol VIPERDataManagerInputProtocol;
 @class VIPERWireFrame;
 
-@protocol VIPERInteractorOutputProtocol
-
-@end
+typedef void (^CompletionBlock)(NSError **error);
 
-@protocol VIPERInteractorInputProtocol
+@protocol VIPERViewProtocol
 @required
-- (void)setPresenter:(id <VIPERPresenterProtocol>)presenter;
-- (id <VIPERPresenterProtocol>)presenter;
+@property (nonatomic, strong) id <VIPERPresenterProtocol> presenter;
+/**
+ * Add here your methods for communication VIEWCONTROLLER -> PRESENTER
+ */
 @end
 
 @protocol VIPERPresenterProtocol
 @required
-- (void)setViewController:(id <VIPERViewControllerProtocol>) viewController;
-- (id <VIPERViewControllerProtocol>)viewController;
-- (void)setInteractor:(id <VIPERInteractorInputProtocol, VIPERDataManagerOutputProtocol>)interactor;
-- (id <VIPERInteractorInputProtocol, VIPERDataManagerOutputProtocol>)interactor;
-- (void)setWireFrame:(VIPERWireFrame*)wireFrame;
-- (VIPERWireFrame*)wireFrame;
+@property (nonatomic, weak) id <VIPERViewProtocol> view;
+@property (nonatomic, strong) id <VIPERInteractorInputProtocol> interactor;
+@property (nonatomic, strong) VIPERWireFrame *wireFrame;
+/**
+ * Add here your methods for communication VIEWCONTROLLER/WIREFRAME -> PRESENTER
+ */
 @end
 
-@protocol VIPERViewControllerProtocol
+@protocol VIPERInteractorOutputProtocol
+/**
+ * Add here your methods for communication INTERACTOR -> PRESENTER
+ */
+@end
+
+@protocol VIPERInteractorInputProtocol
 @required
-- (void)setPresenter:(id<VIPERPresenterProtocol, VIPERInteractorOutputProtocol>)presenter;
-- (id<VIPERPresenterProtocol, VIPERInteractorOutputProtocol>)presenter;
+@property (nonatomic, weak) id <VIPERInteractorOutputProtocol> presenter;
+/**
+ * Add here your methods for communication PRESENTER -> INTERACTOR
+ */
 @end
 
+
 @protocol VIPERDataManagerInputProtocol
-- (void)setInteractor:(id <VIPERDataManagerOutputProtocol>)interactor;
-- (id <VIPERDataManagerOutputProtocol>)interactor;
+@property (nonatomic, weak) id <VIPERDataManagerOutputProtocol> interactor;
+/**
+ * Add here your methods for communication INTERACTOR -> DATAMANAGER
+ */
 @end
 
 @protocol VIPERDataManagerOutputProtocol
-- (void)setDataManager:(id<VIPERDataManagerInputProtocol>)dataManager;
-- (id<VIPERDataManagerInputProtocol>)dataManager;
+@property (nonatomic, strong) id <VIPERDataManagerInputProtocol> dataManager;
+/**
+ * Add here your methods for communication DATAMANAGER -> INTERACTOR
+ */
 @end

data/lib/templates/default/objc/ViewController/VIPERViewController.h

@@ -6,7 +6,7 @@
 #import <UIKit/UIKit.h>
 #import "VIPERProtocols.h"
 
-@interface VIPERViewController : UIViewController <VIPERViewControllerProtocol>
+@interface VIPERViewController : UIViewController <VIPERViewProtocol>
 
 @property (nonatomic, strong) id <VIPERPresenterProtocol> presenter;
 

data/lib/templates/default/objc/WireFrame/VIPERWireFrame.h

@@ -14,8 +14,8 @@
 
 @interface VIPERWireFrame : NSObject
 
-@property (nonatomic, weak) UIViewController *viewController;
+@property (nonatomic, weak) id view;
 
-+ (void)presentVIPERModuleFrom:(UIViewController*)fromViewController;
++ (void)presentVIPERModuleFrom:(id)fromView;
 
 @end

data/lib/templates/default/objc/WireFrame/VIPERWireFrame.m

@@ -9,17 +9,24 @@
 
 + (void)presentVIPERModuleFrom:(UIViewController*)fromViewController
 {
-    UIViewController <VIPERViewControllerProtocol> *viewController;
-    viewController = [[VIPERViewController alloc] init];
-    viewController.presenter = [VIPERPresenter new];
-    viewController.presenter.interactor = [VIPERInteractor new];
-    viewController.presenter.interactor.presenter = viewController.presenter;
-    viewController.presenter.viewController = viewController;
-    viewController.presenter.wireFrame = [VIPERWireFrame new];
-    viewController.presenter.interactor.dataManager = [VIPERDataManager new];
-    viewController.presenter.interactor.dataManager.interactor = viewController.presenter.interactor;
+    // Generating module components
+    UIViewController <VIPERViewProtocol> *viewController = [[VIPERViewController alloc] init];
+    id <VIPERPresenterProtocol, VIPERInteractorOutputProtocol> presenter = [VIPERPresenter new];
+    id <VIPERInteractorInputProtocol, VIPERDataManagerOutputProtocol> interactor = [VIPERInteractor new];
+    id <VIPERDataManagerInputProtocol> dataManager = [VIPERDataManager new];
+    VIPERWireFrame *wireFrame = [VIPERWireFrame new];
+    
+    // Connecting
+    viewController.presenter = presenter;
+    presenter.view = viewController;
+    presenter.wireFrame = wireFrame;
+    wireFrame.view = viewController;
+    presenter.interactor = interactor;
+    interactor.presenter = presenter;
+    interactor.dataManager = dataManager;
+    dataManager.interactor = interactor;
 
     //TOODO - New view controller presentation (present, push, pop, .. )
 }
 
-@end
+@end

data/lib/templates/default/swift/Protocols/VIPERProtocols.swift

@@ -6,85 +6,44 @@
 //  Copyright (c) 2014 ___Redbooth___. All rights reserved.
 //
 
-import Foundation
-
-
-protocol VIPERInteractorOutputProtocol
-{
-    /* Add your extra communication methods here */
-    /* Interactor -> Presenter */
-}
-
-protocol VIPERInteractorInputProtocol
-{
-    var presenter: VIPERPresenterProtocol { get set }
-    
-    /* Add your extra communication methods here */
-    /* Presenter -> Interactor */
-}
+//Problem with a bucle in protocols: http://stackoverflow.com/questions/26205809/cyclic-loop-between-protocols-in-swift
 
 protocol VIPERPresenterProtocol
 {
-    var viewController: VIPERViewControllerProtocol { get set }
-    var interactor: VIPERDataManagerOutputProtocol { get set }
-    
+    var view: VIPERViewProtocol? { get set }
+    var interactor: VIPERInteractorInputProtocol? { get set }
+    //var wireFrame: VIPERWireFrame? { get set }
+
     //    /* Add your extra communication methods here */
     //    /* Presenter -> ViewController */
 }
 
-protocol VIPERViewControllerProtocol
+protocol VIPERViewProtocol
 {
-
+    //var presenter: VIPERPresenterProtocol? { get set }
 }
 
 protocol VIPERDataManagerInputProtocol
 {
-    
+    var interactor: VIPERDataManagerOutputProtocol? { get set }
 }
 
-protocol VIPERDataManagerOutputProtocol {
-    
+protocol VIPERDataManagerOutputProtocol
+{
+    //var dataManager: VIPERDataManagerInputProtocol? { get set }
 }
 
 
+protocol VIPERInteractorOutputProtocol
+{
+    /* Add your extra communication methods here */
+    /* Interactor -> Presenter */
+}
 
-
-/*
-@protocol VIPERDataManagerOutputProtocol;
-@protocol VIPERViewControllerProtocol;
-@protocol VIPERPresenterProtocol;
-@protocol VIPERDataManagerInputProtocol;
-@class VIPERWireFrame;
-
-@protocol VIPERInteractorOutputProtocol
-
-@end
-
-
-
-@protocol VIPERPresenterProtocol
-@required
-- (void)setViewController:(id <VIPERViewControllerProtocol>) viewController;
-- (id <VIPERViewControllerProtocol>)viewController;
-- (void)setInteractor:(id <VIPERInteractorInputProtocol, VIPERDataManagerOutputProtocol>)interactor;
-- (id <VIPERInteractorInputProtocol, VIPERDataManagerOutputProtocol>)interactor;
-- (void)setWireFrame:(VIPERWireFrame*)wireFrame;
-- (VIPERWireFrame*)wireFrame;
-@end
-
-@protocol VIPERViewControllerProtocol
-@required
-- (void)setPresenter:(id<VIPERPresenterProtocol, VIPERInteractorOutputProtocol>)presenter;
-- (id<VIPERPresenterProtocol, VIPERInteractorOutputProtocol>)presenter;
-@end
-
-@protocol VIPERDataManagerInputProtocol
-- (void)setInteractor:(id <VIPERDataManagerOutputProtocol>)interactor;
-- (id <VIPERDataManagerOutputProtocol>)interactor;
-@end
-
-@protocol VIPERDataManagerOutputProtocol
-- (void)setDataManager:(id<VIPERDataManagerInputProtocol>)dataManager;
-- (id<VIPERDataManagerInputProtocol>)dataManager;
-@end
-*/
+protocol VIPERInteractorInputProtocol
+{
+    var presenter: VIPERInteractorOutputProtocol? { get set }
+    
+    /* Add your extra communication methods here */
+    /* Presenter -> Interactor */
+}

data/lib/vipergen/version.rb

@@ -1,4 +1,4 @@
 module Vipergen
   NAME = "vipergen"
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vipergen
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Pedro Piñera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,9 +103,7 @@ files:
 - lib/templates/default/objc/ViewController/VIPERViewController.m
 - lib/templates/default/objc/WireFrame/VIPERWireFrame.h
 - lib/templates/default/objc/WireFrame/VIPERWireFrame.m
-- lib/templates/default/swift/DataManager/VIPERDataManager.swift
 - lib/templates/default/swift/Protocols/VIPERProtocols.swift
-- lib/templates/default/swift/WireFrame/VIPERWireframe.swift
 - lib/templates/default/viperspec.yml
 - lib/vipergen.rb
 - lib/vipergen/dirutils.rb

data/lib/templates/default/swift/DataManager/VIPERDataManager.swift

@@ -1,17 +0,0 @@
-//
-//  VIPERDataManager.swift
-//  VIPERGenDemo
-//
-//  Created by Pedro Piñera Buendía on 22/08/14.
-//  Copyright (c) 2014 ___Redbooth___. All rights reserved.
-//
-
-import Foundation
-
-
-class VIPERDataManager: VIPERDataManagerInputProtocol {
-    init () {
-        self.interactor = nil
-    }
-    var interactor: VIPERDataManagerOutputProtocol?
-}

data/lib/templates/default/swift/WireFrame/VIPERWireframe.swift

@@ -1,13 +0,0 @@
-//
-//  VIPERWireframe.swift
-//  VIPERGenDemo
-//
-//  Created by Pedro Piñera Buendia on 06/09/14.
-//  Copyright (c) 2014 ___Redbooth___. All rights reserved.
-//
-
-import Foundation
-
-class VIPERWireframe {
-    
-}