Re-fixed appsquickly#516. (perform-after-all-injection can't have aru…

…gments. Otherwise it lead recourse and stack overflow)
dani-gavrilov · Jul 8, 2016 · 30e7cd5 · 30e7cd5
1 parent 136fec0
commit 30e7cd5
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 146 deletions.
diff --git a/.idea/Typhoon.iml b/.idea/Typhoon.iml
diff --git a/Source/Definition/Infrastructure/TyphoonDefinition+Infrastructure.h b/Source/Definition/Infrastructure/TyphoonDefinition+Infrastructure.h
@@ -69,6 +69,7 @@
  */
 @property (nonatomic, readonly) TyphoonMethod *afterInjections;
 
+@property (nonatomic, readonly) SEL afterAllInjections;
 
 - (instancetype)initWithClass:(Class)clazz key:(NSString *)key;
 

diff --git a/Source/Definition/Internal/TyphoonDefinition+InstanceBuilder.h b/Source/Definition/Internal/TyphoonDefinition+InstanceBuilder.h
@@ -24,9 +24,7 @@
 
 - (void)doInjectionEventsOn:(id)instance withArgs:(TyphoonRuntimeArguments *)args factory:(TyphoonComponentFactory *)factory;
 
-
-- (void)doAfterInjectionsOn:(id)instance withArgs:(TyphoonRuntimeArguments *)args
-                    factory:(TyphoonComponentFactory *)factory;
+- (void)doAfterAllInjectionsOn:(id)instance;
 
 - (id)targetForInitializerWithFactory:(TyphoonComponentFactory *)factory args:(TyphoonRuntimeArguments *)args;
 

diff --git a/Source/Definition/Internal/TyphoonDefinition+InstanceBuilder.m b/Source/Definition/Internal/TyphoonDefinition+InstanceBuilder.m
@@ -65,15 +65,20 @@ - (void)doInjectionEventsOn:(id)instance withArgs:(TyphoonRuntimeArguments *)arg
     for (TyphoonMethod *method in self.injectedMethods) {
         [self doMethodInjection:method onInstance:instance args:args factory:factory];
     }
-}
 
-- (void)doAfterInjectionsOn:(id)instance withArgs:(TyphoonRuntimeArguments *)args factory:(TyphoonComponentFactory *)factory
-{
     if (self.afterInjections) {
         [self doMethodInjection:self.afterInjections onInstance:instance args:args factory:factory];
     }
 }
 
+- (void)doAfterAllInjectionsOn:(id)instance
+{
+    if (self.afterAllInjections && [instance respondsToSelector:self.afterAllInjections]) {
+        void(*afterInjectionsMethod)(id, SEL) = (void ( *)(id, SEL)) [instance methodForSelector:self.afterAllInjections];
+        afterInjectionsMethod(instance, self.afterAllInjections);
+    }
+}
+
 - (id)targetForInitializerWithFactory:(TyphoonComponentFactory *)factory args:(TyphoonRuntimeArguments *)args
 {
     return self.type;

diff --git a/Source/Definition/TyphoonDefinition.h b/Source/Definition/TyphoonDefinition.h
@@ -244,6 +244,11 @@ definition.factory = [self sqliteManager];
 - (void)performAfterInjections:(SEL)sel;
 - (void)performAfterInjections:(SEL)sel parameters:(void (^)(TyphoonMethod *params))parameterBlock;
 
+/*
+ * Custom callback that is invoked after all injections on built graph occurs.
+ */
+- (void)performAfterAllInjections:(SEL)sel;
+
 #pragma mark Making injections from definition
 
 /**

diff --git a/Source/Definition/TyphoonDefinition.m b/Source/Definition/TyphoonDefinition.m
@@ -400,6 +400,11 @@ - (void)performAfterInjections:(SEL)sel parameters:(void (^)(TyphoonMethod *para
 #endif
 }
 
+- (void)performAfterAllInjections:(SEL)sel
+{
+    _afterAllInjections = sel;
+}
+
 //-------------------------------------------------------------------------------------------
 #pragma mark: - TyphoonDefinition+Infrastructure methods
 //-------------------------------------------------------------------------------------------

diff --git a/Source/Factory/Internal/TyphoonComponentFactory+InstanceBuilder.m b/Source/Factory/Internal/TyphoonComponentFactory+InstanceBuilder.m
@@ -67,7 +67,7 @@ - (void)doInjectionEventsOn:(id)instance withDefinition:(TyphoonDefinition *)def
     [definition doInjectionEventsOn:instance withArgs:args factory:self];
 
     [_stack notifyOnceWhenStackEmptyUsingBlock:^{
-        [definition doAfterInjectionsOn:instance withArgs:args factory:self];
+        [definition doAfterAllInjectionsOn:instance];
 
         [self injectAssemblyOnInstanceIfTyphoonAware:instance];
 

diff --git a/Tests/Factory/Assembly/TestAssemblies/CircularDependenciesAssembly.m b/Tests/Factory/Assembly/TestAssemblies/CircularDependenciesAssembly.m
@@ -178,7 +178,7 @@ - (id)propertyInjectionB
 {
     return [TyphoonDefinition withClass:[PrototypePropertyInjected class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(propertyA) with:[self propertyInjectionA]];
-        [definition performAfterInjections:@selector(checkThatPropertyAHasPropertyBandC)];
+        [definition performAfterAllInjections:@selector(checkThatPropertyAHasPropertyBandC)];
         definition.autoInjectionVisibility = TyphoonAutoInjectVisibilityNone;
     }];
 }
@@ -187,7 +187,7 @@ - (id)propertyInjectionC
 {
     return [TyphoonDefinition withClass:[PrototypePropertyInjected class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(propertyA) with:[self propertyInjectionA]];
-        [definition performAfterInjections:@selector(checkThatPropertyAHasPropertyBandC)];
+        [definition performAfterAllInjections:@selector(checkThatPropertyAHasPropertyBandC)];
         definition.autoInjectionVisibility = TyphoonAutoInjectVisibilityNone;
     }];
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,6 +69,7 @@ @@
      */
     @property (nonatomic, readonly) TyphoonMethod *afterInjections;
+    @property (nonatomic, readonly) SEL afterAllInjections;
     - (instancetype)initWithClass:(Class)clazz key:(NSString *)key;
@@ Expand Down @@