added feature as requested in ticket #224

appsquickly · May 30, 2014 · 815ad64 · 815ad64
1 parent 475d041
commit 815ad64
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 2 deletions.
diff --git a/Source/Definition/Injections/TyphoonInjectionByType.m b/Source/Definition/Injections/TyphoonInjectionByType.m
@@ -29,7 +29,7 @@ - (void)valueToInjectWithContext:(TyphoonInjectionContext *)context completion:(
 
     if (!classOrProtocol) {
         if (self.type == TyphoonInjectionTypeProperty) {
-            [NSException raise:NSInternalInconsistencyException format:@"Can't recognize type for property '%@' of class '%@'. Make sure that property exists and has correct type.", self.propertyName, context.destinationInstanceClass];
+            [NSException raise:NSInternalInconsistencyException format:@"Can't recognize type for property '%@' of class '%@'. Make sure that @property exists and has correct type.", self.propertyName, context.destinationInstanceClass];
         } else {
             [NSException raise:NSInternalInconsistencyException format:@"Only property injection support InjectionByType"];
 

diff --git a/Source/Utils/TyphoonIntrospectionUtils.m b/Source/Utils/TyphoonIntrospectionUtils.m
@@ -52,7 +52,6 @@ + (SEL)setterForPropertyWithName:(NSString *)propertyName inClass:(Class)clazz
 
     objc_property_t property = class_getProperty(clazz, [propertyName cStringUsingEncoding:NSASCIIStringEncoding]);
     if (property) {
-
         const char *attributes = property_getAttributes(property);
 
         NSString *attributesString = [NSString stringWithCString:attributes encoding:NSASCIIStringEncoding];
@@ -65,6 +64,13 @@ + (SEL)setterForPropertyWithName:(NSString *)propertyName inClass:(Class)clazz
             setterSelector = NSSelectorFromString(selectorString);
         }
     }
+    else if (propertyName.length > 0) {
+        NSString *selectorString = [self defaultSetterForPropertyWithName:propertyName];
+        SEL aSelector = NSSelectorFromString(selectorString);
+        if (class_getInstanceMethod(clazz, aSelector)) {
+            setterSelector = aSelector;
+        }
+    }
 
     return setterSelector;
 }

diff --git a/Tests/Factory/Block/BlockComponentFactory/TyphoonBlockComponentFactoryTests.m b/Tests/Factory/Block/BlockComponentFactory/TyphoonBlockComponentFactoryTests.m
@@ -141,6 +141,18 @@ - (void)test_method_injection
 
 }
 
+- (void)test_fake_property_injection
+{
+    Knight *knight = [(MiddleAgesAssembly *) _componentFactory knightWithFakePropertyQuest];
+
+    XCTAssertNotNil(knight.favoriteQuest);
+}
+
+- (void)test_fake_property_injection_by_type
+{
+    XCTAssertThrows([(MiddleAgesAssembly *) _componentFactory knightWithFakePropertyQuestByType]);
+}
+
 /* ====================================================================================================================================== */
 #pragma mark Class Method Initializer
 

diff --git a/Tests/Factory/Block/TestAssemblies/MiddleAgesAssembly.h b/Tests/Factory/Block/TestAssemblies/MiddleAgesAssembly.h
@@ -52,4 +52,7 @@
 
 - (id)knightWithFoobar:(NSString *)foobar;
 
+- (id)knightWithFakePropertyQuest;
+
+- (id)knightWithFakePropertyQuestByType;
 @end
diff --git a/Tests/Factory/Block/TestAssemblies/MiddleAgesAssembly.m b/Tests/Factory/Block/TestAssemblies/MiddleAgesAssembly.m
@@ -229,4 +229,18 @@ - (id)knightWithFoobar:(NSString *)foobar
     }];
 }
 
+- (id)knightWithFakePropertyQuest
+{
+    return [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
+        [definition injectProperty:@selector(favoriteQuest) with:[self defaultQuest]];
+    }];
+}
+
+- (id)knightWithFakePropertyQuestByType
+{
+    return [TyphoonDefinition withClass:[Knight class] configuration:^(TyphoonDefinition *definition) {
+        [definition injectProperty:@selector(favoriteQuest)];
+    }];
+}
+
 @end
diff --git a/Tests/Model/Knight.h b/Tests/Model/Knight.h
@@ -47,4 +47,9 @@
 
 + (id)knightWithDamselsRescued:(NSUInteger)damselsRescued;
 
+- (void)setFavoriteQuest:(id<Quest>)quest;
+
+- (id<Quest>)favoriteQuest;
+
+
 @end
diff --git a/Tests/Model/Knight.m b/Tests/Model/Knight.m
@@ -16,6 +16,9 @@
 
 
 @implementation Knight
+{
+    id <Quest> _favoriteQuest;
+}
 
 /* ============================================================ Initializers ============================================================ */
 - (id)initWithQuest:(id <Quest>)quest
@@ -66,6 +69,16 @@ + (id)knightWithDamselsRescued:(NSUInteger)damselsRescued
     return [[[self class] alloc] initWithDamselsRescued:damselsRescued foo:nil];
 }
 
+- (void)setFavoriteQuest:(id <Quest>)quest 
+{
+    _favoriteQuest = quest;
+}
+
+- (id <Quest>)favoriteQuest
+{
+    return _favoriteQuest;
+}
+
 /* ========================================================== Interface Methods ========================================================= */
 
 - (void)setQuest:(id<Quest>)quest andDamselsRescued:(NSUInteger)damselsRescued