Change word 'injections' to 'configuration'

appsquickly · Apr 10, 2014 · d11792d · d11792d
1 parent c8fefc0
commit d11792d
Show file tree

Hide file tree

Showing 23 changed files with 112 additions and 106 deletions.
diff --git a/Source/Definition/Internal/TyphoonDefinition+Infrastructure.m b/Source/Definition/Internal/TyphoonDefinition+Infrastructure.m
@@ -50,7 +50,7 @@ + (instancetype)propertyPlaceholderWithResource:(id <TyphoonResource>)resource
 
 + (instancetype)propertyPlaceholderWithResources:(NSArray *)resources
 {
-    return [self withClass:[TyphoonPropertyPlaceholderConfigurer class] injections:^(TyphoonDefinition *definition) {
+    return [self withClass:[TyphoonPropertyPlaceholderConfigurer class] configuration:^(TyphoonDefinition *definition) {
         [definition injectInitializer:@selector(configurerWithResourceList:) parameters:^(TyphoonMethod *initializer) {
             [initializer injectParameterWith:resources];
         }];

diff --git a/Source/Definition/TyphoonDefinition.h b/Source/Definition/TyphoonDefinition.h
@@ -219,7 +219,7 @@ typedef void(^TyphoonDefinitionBlock)(TyphoonDefinition *definition);
 
 + (TyphoonDefinition *)withClass:(Class)clazz;
 
-+ (TyphoonDefinition *)withClass:(Class)clazz injections:(TyphoonDefinitionBlock)injections;
++ (TyphoonDefinition *)withClass:(Class)clazz configuration:(TyphoonDefinitionBlock)injections;
 
 + (TyphoonDefinition *)withClass:(Class)clazz factory:(TyphoonDefinition *)definition selector:(SEL)selector;
 

diff --git a/Source/Definition/TyphoonDefinition.m b/Source/Definition/TyphoonDefinition.m
@@ -59,7 +59,7 @@ + (TyphoonDefinition *)withClass:(Class)clazz
     return [[TyphoonDefinition alloc] initWithClass:clazz key:nil];
 }
 
-+ (TyphoonDefinition *)withClass:(Class)clazz injections:(TyphoonDefinitionBlock)injections
++ (TyphoonDefinition *)withClass:(Class)clazz configuration:(TyphoonDefinitionBlock)injections
 {
     return [TyphoonDefinition withClass:clazz key:nil injections:injections];
 }
@@ -81,7 +81,7 @@ + (TyphoonDefinition *)withClass:(Class)clazz key:(NSString *)key injections:(Ty
 
 + (TyphoonDefinition *)withClass:(Class)clazz factory:(TyphoonDefinition *)_definition selector:(SEL)selector
 {
-    return [TyphoonDefinition withClass:clazz injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:clazz configuration:^(TyphoonDefinition *definition) {
         [definition injectInitializer:selector parameters:nil];
         [definition setFactory:_definition];
     }];

diff --git a/Source/Factory/Provider/TyphoonFactoryProvider.m b/Source/Factory/Provider/TyphoonFactoryProvider.m
@@ -18,20 +18,20 @@ @implementation TyphoonFactoryProvider
 + (TyphoonDefinition *)withProtocol:(Protocol *)protocol dependencies:(TyphoonDefinitionBlock)dependenciesBlock factory:(id)factoryBlock
 {
     Class factoryClass = [[TyphoonAssistedFactoryCreator creatorWithProtocol:protocol factoryBlock:factoryBlock] factoryClass];
-    return [TyphoonDefinition withClass:factoryClass injections:dependenciesBlock];
+    return [TyphoonDefinition withClass:factoryClass configuration:dependenciesBlock];
 }
 
 + (TyphoonDefinition *)withProtocol:(Protocol *)protocol dependencies:(TyphoonDefinitionBlock)dependenciesBlock returns:(Class)returnType
 {
     Class factoryClass = [[TyphoonAssistedFactoryCreator creatorWithProtocol:protocol returns:returnType] factoryClass];
-    return [TyphoonDefinition withClass:factoryClass injections:dependenciesBlock];
+    return [TyphoonDefinition withClass:factoryClass configuration:dependenciesBlock];
 }
 
 + (TyphoonDefinition *)withProtocol:(Protocol *)protocol dependencies:(TyphoonDefinitionBlock)dependenciesBlock
     factories:(TyphoonAssistedFactoryDefinitionBlock)definitionBlock
 {
     Class factoryClass = [[TyphoonAssistedFactoryCreator creatorWithProtocol:protocol factories:definitionBlock] factoryClass];
-    return [TyphoonDefinition withClass:factoryClass injections:dependenciesBlock];
+    return [TyphoonDefinition withClass:factoryClass configuration:dependenciesBlock];
 }
 
 @end
diff --git a/Tests/Definition/Injection Aware/ComponentFactoryAwareAssembly.m b/Tests/Definition/Injection Aware/ComponentFactoryAwareAssembly.m
@@ -23,14 +23,14 @@ - (id)injectionAwareObject;
 
 - (id)injectionByProperty
 {
-    return [TyphoonDefinition withClass:[ComponentFactoryAwareObject class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[ComponentFactoryAwareObject class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(componentFactory) with:self];
     }];
 }
 
 - (id)injectionByInitialization
 {
-    return [TyphoonDefinition withClass:[ComponentFactoryAwareObject class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[ComponentFactoryAwareObject class] configuration:^(TyphoonDefinition *definition) {
         [definition injectInitializer:@selector(initWithComponentFactory) parameters:^(TyphoonMethod *initializer) {
             [initializer injectParameterWith:self];
         }];
@@ -39,14 +39,14 @@ - (id)injectionByInitialization
 
 - (id)injectionByPropertyAssemblyType
 {
-    return [TyphoonDefinition withClass:[ComponentFactoryAwareObject class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[ComponentFactoryAwareObject class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(assembly)];
     }];
 }
 
 - (id)injectionByPropertyFactoryType
 {
-    return [TyphoonDefinition withClass:[ComponentFactoryAwareObject class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[ComponentFactoryAwareObject class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(componentFactory)];
     }];
 }

diff --git a/Tests/Definition/Properties/FactoryReferenceInjectionsTests.m b/Tests/Definition/Properties/FactoryReferenceInjectionsTests.m
@@ -36,7 +36,7 @@ @implementation ClassWithKnightSettingsAssembly
 
 - (id)knightSettings
 {
-    return [TyphoonDefinition withClass:[ClassWithKnightSettings class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[ClassWithKnightSettings class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(damselsRescued) with:@(currentDamselsRescued)];
         [definition injectProperty:@selector(hasHorseWillTravel) with:@(currentHasHorseWillTravel)];
         [definition injectProperty:@selector(fooString) with:currentFooString];
@@ -70,7 +70,7 @@ - (void)test_inject_int_bool
 {
     Knight *knight = [Knight new];
 
-    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(damselsRescued) with:@(30)];
         [definition injectProperty:@selector(hasHorseWillTravel) with:@(YES)];
     }];
@@ -87,7 +87,7 @@ - (void)test_inject_object
 
     NSString *testString = @"Hello Knights";
 
-    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(foobar) with:testString];
     }];
     [factory doInjectionEventsOn:(id) knight withDefinition:knightDefinition args:nil];
@@ -106,7 +106,7 @@ - (void)test_inject_factorydefinition_selector
 
     TyphoonDefinition *settings = [factory definitionForType:[ClassWithKnightSettings class]];
 
-    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(damselsRescued) with:[settings property:@selector(damselsRescued)]];
         [definition injectProperty:@selector(hasHorseWillTravel) with:[settings property:@selector(hasHorseWillTravel)]];
         [definition injectProperty:@selector(foobar) with:[settings property:@selector(fooString)]];
@@ -128,7 +128,7 @@ - (void)test_inject_factorydefinition_keyPath
 
     TyphoonDefinition *settings = [factory definitionForType:[ClassWithKnightSettings class]];
 
-    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(foobar) with:[settings keyPath:@"fooString.uppercaseString"]];
     }];
     [factory doInjectionEventsOn:(id) knight withDefinition:knightDefinition args:nil];
@@ -145,7 +145,7 @@ - (void)test_inject_factorydefinition_on_init
 
     TyphoonDefinition *settings = [factory definitionForType:[ClassWithKnightSettings class]];
 
-    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectInitializer:@selector(initWithDamselsRescued:foo:) parameters:^(TyphoonMethod *initializer) {
             [initializer injectParameterWith:[settings property:@selector(damselsRescued)]];
             [initializer injectParameterWith:[settings keyPath:@"fooString.uppercaseString"]];
@@ -165,7 +165,7 @@ - (void)test_injection_readonly_properties
 {
     TyphoonDefinition *quest = [TyphoonDefinition withClass:[CampaignQuest class]];
 
-    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *knightDefinition = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(readOnlyQuest)];
     }];
     [factory registerDefinition:quest];

diff --git a/Tests/Definition/Storyboard/StoryboardViewControllerAssembly.m b/Tests/Definition/Storyboard/StoryboardViewControllerAssembly.m
@@ -15,28 +15,28 @@ @implementation StoryboardViewControllerAssembly
 
 - (id)initialViewController
 {
-    return [TyphoonDefinition withClass:[UIViewController class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[UIViewController class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(title) with:@"Initial"];
     }];
 }
 
 - (id)firstViewController
 {
-    return [TyphoonDefinition withClass:[UIViewController class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[UIViewController class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(title) with:@"First"];
     }];
 }
 
 - (id)secondViewController
 {
-    return [TyphoonDefinition withClass:[UIViewController class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[UIViewController class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(title) with:@"Second"];
     }];
 }
 
 - (id)uniqueViewController
 {
-    return [TyphoonDefinition withClass:[UniqueViewController class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[UniqueViewController class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(title) with:@"Unique"];
     }];
 }

diff --git a/Tests/Definition/TyphoonDefinitionTests.m b/Tests/Definition/TyphoonDefinitionTests.m
@@ -109,16 +109,16 @@ - (void)test_enumerates_properties_injected_by_reference
 
 - (void)test_inherits_all_parent_properties
 {
-    TyphoonDefinition *longLostAncestor = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *longLostAncestor = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(hasHorseWillTravel) with:@(YES)];
     }];
 
-    TyphoonDefinition *parent = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *parent = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(damselsRescued) with:@(12)];
         [definition setParent:longLostAncestor];
     }];
 
-    TyphoonDefinition *child = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *child = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(foobar) with:@"foobar!"];
         [definition setParent:parent];
     }];
@@ -129,11 +129,11 @@ - (void)test_inherits_all_parent_properties
 
 - (void)test_child_properties_override_parent_properties
 {
-    TyphoonDefinition *parent = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *parent = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(damselsRescued) with:@(12)];
     }];
 
-    TyphoonDefinition *child = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *child = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(damselsRescued) with:@(346)];
         [definition setParent:parent];
     }];
@@ -146,11 +146,11 @@ - (void)test_child_properties_override_parent_properties
 
 - (void)test_child_inherits_parent_scope_if_not_explicitly_set
 {
-    TyphoonDefinition *parent = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *parent = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition setScope:TyphoonScopeSingleton];
     }];
 
-    TyphoonDefinition *child = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *child = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(damselsRescued) with:@(346)];
         [definition setParent:parent];
     }];
@@ -160,11 +160,11 @@ - (void)test_child_inherits_parent_scope_if_not_explicitly_set
 
 - (void)test_child_overrides_parent_scope_if_explicitly_set
 {
-    TyphoonDefinition *parent = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *parent = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition setScope:TyphoonScopeSingleton];
     }];
 
-    TyphoonDefinition *child = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *child = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(damselsRescued) with:@(346)];
         [definition setScope:TyphoonScopePrototype];
         [definition setParent:parent];
@@ -196,13 +196,13 @@ - (void)test_autoWired_properties
 - (void)test_performs_copy
 {
 
-    TyphoonDefinition *definition = [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    TyphoonDefinition *definition = [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
 
         [definition injectInitializer:@selector(initWithQuest:damselsRescued:) parameters:^(TyphoonMethod *initializer) {
             [initializer injectParameterWith:nil];
             [initializer injectParameterWith:@(12)];
         }];
-        
+
         [definition injectProperty:@selector(favoriteDamsels) with:@[
             [TyphoonReferenceDefinition definitionReferringToComponent:@"mary"],
             [TyphoonReferenceDefinition definitionReferringToComponent:@"mary"]

diff --git a/Tests/Factory/Block/BlockComponentFactory/InvalidCollaboratingAssembly.m b/Tests/Factory/Block/BlockComponentFactory/InvalidCollaboratingAssembly.m
@@ -23,7 +23,7 @@ @implementation InvalidCollaboratingAssembly
 
 - (id)knightWithExternalQuest
 {
-    return [TyphoonDefinition withClass:[Knight class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
         [definition injectProperty:@selector(quest) with:[[MiddleAgesAssembly assembly] environmentDependentQuest]];
     }];
 }

diff --git a/Tests/Factory/Block/BlockComponentFactory/InvalidCollaboratingAssembly_Initializer.m b/Tests/Factory/Block/BlockComponentFactory/InvalidCollaboratingAssembly_Initializer.m
@@ -24,7 +24,7 @@ @implementation InvalidCollaboratingAssembly_Initializer
 
 - (id)knightWithExternalQuest
 {
-    return [TyphoonDefinition withClass:[CavalryMan class] injections:^(TyphoonDefinition *definition) {
+    return [TyphoonDefinition withClass:[CavalryMan class] configuration:^(TyphoonDefinition *definition) {
         [definition injectInitializer:@selector(initWithQuest:) parameters:^(TyphoonMethod *initializer) {
             [initializer injectParameterWith:[[MiddleAgesAssembly assembly] environmentDependentQuest]];
         }];