Merge branch 'release/0.6.0'

strongself · Nov 15, 2015 · 1bfb2f6 · 1bfb2f6
2 parents 5d86e2c + 45abdeb
commit 1bfb2f6
Show file tree

Hide file tree

Showing 170 changed files with 2,482 additions and 1,525 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+.idea/.name
+.idea/Generamba.iml
+.idea/misc.xml
+.idea/modules.xml
+.idea/vcs.xml
+.idea/workspace.xml
diff --git a/GenerambaSandbox/GenerambaSandbox.xcodeproj/project.pbxproj b/GenerambaSandbox/GenerambaSandbox.xcodeproj/project.pbxproj
diff --git a/...nerambaSandbox.xcworkspace/xcuserdata/etolstoy.xcuserdatad/UserInterfaceState.xcuserstate b/...nerambaSandbox.xcworkspace/xcuserdata/etolstoy.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...baSandbox/GenerambaSandbox/Classes/Modules/Authorization/Assembly/AuthorizationAssembly.h b/...baSandbox/GenerambaSandbox/Classes/Modules/Authorization/Assembly/AuthorizationAssembly.h
@@ -2,17 +2,18 @@
 //  AuthorizationAssembly.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
 #import <Typhoon/Typhoon.h>
+#import <RamblerTyphoonUtils/AssemblyCollector.h>
 
 /**
  @author Egor Tolstoy
 
  Authorization module
  */
-@interface AuthorizationAssembly : TyphoonAssembly
+@interface AuthorizationAssembly : TyphoonAssembly <RamblerInitialAssembly>
 
 @end
diff --git a/...baSandbox/GenerambaSandbox/Classes/Modules/Authorization/Assembly/AuthorizationAssembly.m b/...baSandbox/GenerambaSandbox/Classes/Modules/Authorization/Assembly/AuthorizationAssembly.m
@@ -2,7 +2,7 @@
 //  AuthorizationAssembly.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -27,6 +27,14 @@ - (AuthorizationViewController *)viewAuthorizationModule {
                           }];
 }
 
+- (AuthorizationInteractor *)interactorAuthorizationModule {
+    return [TyphoonDefinition withClass:[AuthorizationInteractor class]
+                          configuration:^(TyphoonDefinition *definition) {
+                              [definition injectProperty:@selector(output)
+                                                    with:[self presenterAuthorizationModule]];
+                          }];
+}
+
 - (AuthorizationPresenter *)presenterAuthorizationModule {
     return [TyphoonDefinition withClass:[AuthorizationPresenter class]
                           configuration:^(TyphoonDefinition *definition) {
@@ -39,14 +47,6 @@ - (AuthorizationPresenter *)presenterAuthorizationModule {
                           }];
 }
 
-- (AuthorizationInteractor *)interactorAuthorizationModule {
-    return [TyphoonDefinition withClass:[AuthorizationInteractor class]
-                          configuration:^(TyphoonDefinition *definition) {
-                              [definition injectProperty:@selector(output)
-                                                    with:[self presenterAuthorizationModule]];
-                          }];
-}
-
 - (AuthorizationRouter *)routerAuthorizationModule {
     return [TyphoonDefinition withClass:[AuthorizationRouter class]
                           configuration:^(TyphoonDefinition *definition) {

diff --git a/...ndbox/GenerambaSandbox/Classes/Modules/Authorization/Interactor/AuthorizationInteractor.h b/...ndbox/GenerambaSandbox/Classes/Modules/Authorization/Interactor/AuthorizationInteractor.h
@@ -2,7 +2,7 @@
 //  AuthorizationInteractor.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/...ndbox/GenerambaSandbox/Classes/Modules/Authorization/Interactor/AuthorizationInteractor.m b/...ndbox/GenerambaSandbox/Classes/Modules/Authorization/Interactor/AuthorizationInteractor.m
@@ -2,7 +2,7 @@
 //  AuthorizationInteractor.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/.../GenerambaSandbox/Classes/Modules/Authorization/Interactor/AuthorizationInteractorInput.h b/.../GenerambaSandbox/Classes/Modules/Authorization/Interactor/AuthorizationInteractorInput.h
@@ -2,7 +2,7 @@
 //  AuthorizationInteractorInput.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/...GenerambaSandbox/Classes/Modules/Authorization/Interactor/AuthorizationInteractorOutput.h b/...GenerambaSandbox/Classes/Modules/Authorization/Interactor/AuthorizationInteractorOutput.h
@@ -2,7 +2,7 @@
 //  AuthorizationInteractorOutput.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/...ndbox/GenerambaSandbox/Classes/Modules/Authorization/Presenter/AuthorizationModuleInput.h b/...ndbox/GenerambaSandbox/Classes/Modules/Authorization/Presenter/AuthorizationModuleInput.h
@@ -2,7 +2,7 @@
 //  AuthorizationModuleInput.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -15,6 +15,6 @@
 
  Метод инициирует стартовую конфигурацию текущего модуля
  */
-- (void)configureCurrentModule;
+- (void)configureModule;
 
 @end
diff --git a/...Sandbox/GenerambaSandbox/Classes/Modules/Authorization/Presenter/AuthorizationPresenter.h b/...Sandbox/GenerambaSandbox/Classes/Modules/Authorization/Presenter/AuthorizationPresenter.h
@@ -2,7 +2,7 @@
 //  AuthorizationPresenter.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/...Sandbox/GenerambaSandbox/Classes/Modules/Authorization/Presenter/AuthorizationPresenter.m b/...Sandbox/GenerambaSandbox/Classes/Modules/Authorization/Presenter/AuthorizationPresenter.m
@@ -2,7 +2,7 @@
 //  AuthorizationPresenter.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -16,12 +16,16 @@ @implementation AuthorizationPresenter
 
 #pragma mark - Методы AuthorizationModuleInput
 
-- (void)configureCurrentModule {
-    [self.view setupInitialState];
+- (void)configureModule {
+    // Стартовая конфигурация модуля, не привязанная к состоянию view
 }
 
-#pragma mark - Методы AuthorizationInteractorOutput
-
 #pragma mark - Методы AuthorizationViewOutput
 
+- (void)didTriggerViewReadyEvent {
+	[self.view setupInitialState];
+}
+
+#pragma mark - Методы AuthorizationInteractorOutput
+
 @end
diff --git a/GenerambaSandbox/GenerambaSandbox/Classes/Modules/Authorization/Router/AuthorizationRouter.h b/GenerambaSandbox/GenerambaSandbox/Classes/Modules/Authorization/Router/AuthorizationRouter.h
@@ -2,7 +2,7 @@
 //  AuthorizationRouter.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/GenerambaSandbox/GenerambaSandbox/Classes/Modules/Authorization/Router/AuthorizationRouter.m b/GenerambaSandbox/GenerambaSandbox/Classes/Modules/Authorization/Router/AuthorizationRouter.m
@@ -2,7 +2,7 @@
 //  AuthorizationRouter.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/...aSandbox/GenerambaSandbox/Classes/Modules/Authorization/Router/AuthorizationRouterInput.h b/...aSandbox/GenerambaSandbox/Classes/Modules/Authorization/Router/AuthorizationRouterInput.h
@@ -2,7 +2,7 @@
 //  AuthorizationRouterInput.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/...Sandbox/GenerambaSandbox/Classes/Modules/Authorization/View/AuthorizationViewController.h b/...Sandbox/GenerambaSandbox/Classes/Modules/Authorization/View/AuthorizationViewController.h
@@ -2,7 +2,7 @@
 //  AuthorizationViewController.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -14,6 +14,6 @@
 
 @interface AuthorizationViewController : UIViewController <AuthorizationViewInput>
 
-@property (strong, nonatomic) id<AuthorizationViewOutput> output;
+@property (nonatomic, strong) id<AuthorizationViewOutput> output;
 
 @end
diff --git a/...Sandbox/GenerambaSandbox/Classes/Modules/Authorization/View/AuthorizationViewController.m b/...Sandbox/GenerambaSandbox/Classes/Modules/Authorization/View/AuthorizationViewController.m
@@ -2,7 +2,7 @@
 //  AuthorizationViewController.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -12,10 +12,18 @@
 
 @implementation AuthorizationViewController
 
+#pragma mark - Методы жизненного цикла
+
+- (void)viewDidLoad {
+	[super viewDidLoad];
+
+	[self.output didTriggerViewReadyEvent];
+}
+
 #pragma mark - Методы AuthorizationViewInput
 
 - (void)setupInitialState {
-
+	// В этом методе происходит настройка параметров view, зависящих от ее жизненого цикла (создание элементов, анимации и пр.)
 }
 
 @end
diff --git a/...rambaSandbox/GenerambaSandbox/Classes/Modules/Authorization/View/AuthorizationViewInput.h b/...rambaSandbox/GenerambaSandbox/Classes/Modules/Authorization/View/AuthorizationViewInput.h
@@ -2,7 +2,7 @@
 //  AuthorizationViewInput.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -13,7 +13,7 @@
 /**
  @author Egor Tolstoy
 
- Метод настраивает начальный стейт экрана
+ Метод настраивает начальный стейт view
  */
 - (void)setupInitialState;
 

diff --git a/...ambaSandbox/GenerambaSandbox/Classes/Modules/Authorization/View/AuthorizationViewOutput.h b/...ambaSandbox/GenerambaSandbox/Classes/Modules/Authorization/View/AuthorizationViewOutput.h
@@ -2,12 +2,19 @@
 //  AuthorizationViewOutput.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 
 @protocol AuthorizationViewOutput <NSObject>
 
+/**
+ @author Egor Tolstoy
+
+ Метод сообщает презентеру о том, что view готова к работе
+ */
+- (void)didTriggerViewReadyEvent;
+
 @end
diff --git a/...GenerambaSandboxTests/Classes/Modules/Authorization/Assembly/AuthorizationAssemblyTests.m b/...GenerambaSandboxTests/Classes/Modules/Authorization/Assembly/AuthorizationAssemblyTests.m
@@ -2,11 +2,11 @@
 //  AuthorizationAssemblyTests.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
-#import <RamblerMcFlurry/Testing.h>
+#import <RamblerTyphoonUtils/AssemblyTesting.h>
 #import <Typhoon/Typhoon.h>
 
 #import "AuthorizationAssembly.h"

diff --git a/...rambaSandboxTests/Classes/Modules/Authorization/Assembly/AuthorizationAssembly_Testable.h b/...rambaSandboxTests/Classes/Modules/Authorization/Assembly/AuthorizationAssembly_Testable.h
@@ -2,7 +2,7 @@
 //  AuthorizationAssembly_Testable.h
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -13,7 +13,7 @@
 @class AuthorizationPresenter;
 @class AuthorizationRouter;
 
-@interface AuthorizationAssembly()
+@interface AuthorizationAssembly ()
 
 - (AuthorizationViewController *)viewAuthorizationModule;
 - (AuthorizationPresenter *)presenterAuthorizationModule;

diff --git a/...rambaSandboxTests/Classes/Modules/Authorization/Interactor/AuthorizationInteractorTests.m b/...rambaSandboxTests/Classes/Modules/Authorization/Interactor/AuthorizationInteractorTests.m
@@ -2,7 +2,7 @@
 //  AuthorizationInteractorTests.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/...nerambaSandboxTests/Classes/Modules/Authorization/Presenter/AuthorizationPresenterTests.m b/...nerambaSandboxTests/Classes/Modules/Authorization/Presenter/AuthorizationPresenterTests.m
@@ -2,7 +2,7 @@
 //  AuthorizationPresenterTests.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -55,19 +55,19 @@ - (void)tearDown {
 
 #pragma mark - Тестирование методов AuthorizationModuleInput
 
-- (void)testThatPresenterConfiguresModule {
+#pragma mark - Тестирование методов AuthorizationViewOutput
+
+- (void)testThatPresenterHandlesViewReadyEvent {
     // given
 
 
     // when
-    [self.presenter configureCurrentModule];
+    [self.presenter didTriggerViewReadyEvent];
 
     // then
     OCMVerify([self.mockView setupInitialState]);
 }
 
-#pragma mark - Тестирование методов AuthorizationViewOutput
-
 #pragma mark - Тестирование методов AuthorizationInteractorOutput
 
 @end
diff --git a/...box/GenerambaSandboxTests/Classes/Modules/Authorization/Router/AuthorizationRouterTests.m b/...box/GenerambaSandboxTests/Classes/Modules/Authorization/Router/AuthorizationRouterTests.m
@@ -2,7 +2,7 @@
 //  AuthorizationRouterTests.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 

diff --git a/...nerambaSandboxTests/Classes/Modules/Authorization/View/AuthorizationViewControllerTests.m b/...nerambaSandboxTests/Classes/Modules/Authorization/View/AuthorizationViewControllerTests.m
@@ -2,7 +2,7 @@
 //  AuthorizationViewControllerTests.m
 //  GenerambaSandbox
 //
-//  Created by Egor Tolstoy on 01/11/2015.
+//  Created by Egor Tolstoy on 15/11/2015.
 //  Copyright 2015 Rambler&Co. All rights reserved.
 //
 
@@ -45,6 +45,16 @@ - (void)tearDown {
 
 #pragma mark - Тестирование жизненного цикла
 
+- (void)testThatViewNotifiesPresenterOnDidLoad {
+	// given
+
+	// when
+	[self.controller viewDidLoad];
+
+	// then
+	OCMVerify([self.mockOutput didTriggerViewReadyEvent]);
+}
+
 #pragma mark - Тестирование методов интерфейса
 
 #pragma mark - Тестирование методов AuthorizationViewInput