Rename setAssembly: to setFactory:.

appsquickly · Oct 30, 2013 · fcae76d · fcae76d
1 parent 12c7f69
commit fcae76d
Show file tree

Hide file tree

Showing 6 changed files with 12,676 additions and 3,426 deletions.
diff --git a/Source/Component/TyphoonInjectionAware.h b/Source/Component/TyphoonInjectionAware.h
@@ -10,6 +10,6 @@
 
 @protocol TyphoonInjectionAware <NSObject>
 
-- (void)setAssembly:(id)assembly;
+- (void)setFactory:(id)theFactory;
 
 @end
diff --git a/Source/Factory/InstanceBuilder/TyphoonComponentFactory+InstanceBuilder.m b/Source/Factory/InstanceBuilder/TyphoonComponentFactory+InstanceBuilder.m
@@ -113,7 +113,7 @@ - (void)injectAssemblyOnInstanceIfTyphoonAware:(id)instance;
 
 - (void)injectAssemblyOnInstance:(id <TyphoonInjectionAware>)instance;
 {
-    [instance setAssembly:self];
+    [instance setFactory:self];
 }
 
 - (void)markDoneResolvingDefinition:(TyphoonDefinition *)definition;

diff --git a/Tests/Component/Injection Aware/InjectionAwareObject.h b/Tests/Component/Injection Aware/InjectionAwareObject.h
@@ -11,6 +11,6 @@
 
 @interface InjectionAwareObject : NSObject <TyphoonInjectionAware>
 
-@property (readonly) id assembly;
+@property (readonly) id factory;
 
 @end
diff --git a/Tests/Component/Injection Aware/InjectionAwareObject.m b/Tests/Component/Injection Aware/InjectionAwareObject.m
@@ -9,14 +9,14 @@
 #import "InjectionAwareObject.h"
 
 @implementation InjectionAwareObject {
-    id assembly;
+    id factory;
 }
 
-@synthesize assembly;
+@synthesize factory;
 
-- (void)setAssembly:(id)theAssembly
+- (void)setFactory:(id)theFactory
 {
-    assembly = theAssembly;
+    factory = theFactory;
 }
 
 @end
diff --git a/Tests/Component/Injection Aware/TyphoonInjectionAwareTests.m b/Tests/Component/Injection Aware/TyphoonInjectionAwareTests.m
@@ -30,7 +30,7 @@ - (void)setUp;
 - (void)test_reference_to_assembly_set_on_injection_aware_object;
 {
     object = [factory injectionAwareObject];
-    assertThat(object.assembly, sameInstance(factory));
+    assertThat(object.factory, sameInstance(factory));
 }
 
 @end