tidy up and add failing test for TyphoonScopeObjectGraph

Source/Definition/TyphoonDefinition.h

@@ -19,17 +19,19 @@
 /**
 * @ingroup Definition
 * Describes the lifecycle of a Typhoon component.
-*
-* - TyphoonScopeDefault means that a new component is created for each time it is referenced in a collaborator, or retrieved from the
-* factory.
-*
+
+* - TyphoonScopeObjectGraph (default) means that a new non-retained component is created when resolved from the factory, and any
+* dependencies declared during resolution of the object graph will be shared.
+* - TyphoonScopePrototype means that a new component is created for each time it is referenced in a collaborator, or retrieved
+* from the factory.
 * - TyphoonScopeSingleton creates a shared instance.
 *
 */
 typedef enum
 {
-    TyphoonScopeDefault,
-    TyphoonScopeSingleton
+    TyphoonScopeObjectGraph =   1 << 0,
+    TyphoonScopePrototype =     1 << 1,
+    TyphoonScopeSingleton =     1 << 2,
 } TyphoonScope;
 
 
@@ -47,6 +49,7 @@ typedef void(^TyphoonDefinitionBlock)(TyphoonDefinition* definition);
     TyphoonInitializer* _initializer;
     NSMutableSet* _injectedProperties;
     NSString* _factoryReference;
+    TyphoonScope _scope;
 }
 
 @property(nonatomic, readonly) Class type;
@@ -77,7 +80,7 @@ typedef void(^TyphoonDefinitionBlock)(TyphoonDefinition* definition);
 
 + (TyphoonDefinition*)withClass:(Class)clazz properties:(TyphoonDefinitionBlock)properties;
 
-+ (TyphoonDefinition*)withClass:(Class)clazz factory:(TyphoonDefinition *)definition selector:(SEL)selector;
++ (TyphoonDefinition*)withClass:(Class)clazz factory:(TyphoonDefinition*)definition selector:(SEL)selector;
 
 /* ====================================================================================================================================== */
 #pragma mark Injection
@@ -100,7 +103,7 @@ typedef void(^TyphoonDefinitionBlock)(TyphoonDefinition* definition);
 /**
  * Injects property with result of invocation valueForKeyPath with given keyPath on factoryDefinition.
  */
-- (void)injectProperty:(SEL)selector withDefinition:(TyphoonDefinition*)factoryDefinition keyPath:(NSString *)keyPath;
+- (void)injectProperty:(SEL)selector withDefinition:(TyphoonDefinition*)factoryDefinition keyPath:(NSString*)keyPath;
 
 /**
 * Injects property with the given object instance.

Source/Factory/Block/TyphoonBlockComponentFactory.h

@@ -22,9 +22,9 @@
 */
 @interface TyphoonBlockComponentFactory : TyphoonComponentFactory
 
-+ (instancetype)factoryWithAssembly:(TyphoonAssembly*)assembly;
++ (id)factoryWithAssembly:(TyphoonAssembly*)assembly;
 
-+ (instancetype)factoryWithAssemblies:(NSArray*)assemblies;
++ (id)factoryWithAssemblies:(NSArray*)assemblies;
 
 - (instancetype)initWithAssembly:(TyphoonAssembly*)assembly;
 

Source/Factory/Block/TyphoonBlockComponentFactory.m

@@ -18,21 +18,19 @@
 #import "TyphoonDefinition.h"
 #import "OCLogTemplate.h"
 #import "TyphoonAssembly+TyphoonAssemblyFriend.h"
-#import "TyphoonInjectedParameter.h"
-#import "TyphoonParameterInjectedByReference.h"
-
 
 
 @implementation TyphoonBlockComponentFactory
 
 /* ====================================================================================================================================== */
 #pragma mark - Class Methods
-+ (instancetype)factoryWithAssembly:(TyphoonAssembly*)assembly
+
++ (id)factoryWithAssembly:(TyphoonAssembly*)assembly
 {
     return [[self alloc] initWithAssemblies:@[assembly]];
 }
 
-+ (instancetype)factoryWithAssemblies:(NSArray*)assemblies
++ (id)factoryWithAssemblies:(NSArray*)assemblies
 {
     return [[self alloc] initWithAssemblies:assemblies];
 }
@@ -87,6 +85,8 @@ - (void)registerAllDefinitions:(TyphoonAssembly*)assembly
     }
 }
 
+
+
 /* ====================================================================================================================================== */
 #pragma mark - Overridden Methods
 

Source/Factory/Internal/InstanceRegister/TyphoonKeyedStackInstanceRegister.m

@@ -88,4 +88,14 @@ - (TyphoonGenericStack*)stackForKey:(NSString*)key
     return stack;
 }
 
+
+- (NSString*)description
+{
+    NSMutableString* description = [NSMutableString stringWithFormat:@"<%@: ", NSStringFromClass([self class])];
+    [description appendFormat:@"_registry=%@", _registry];
+    [description appendString:@">"];
+    return description;
+}
+
+
 @end

Source/Factory/Xml/TyphoonRXMLElement+XmlComponentFactory.m

@@ -211,7 +211,7 @@ - (TyphoonScope)scopeForStringValue:(NSString*)scope
 
     // Here, we don't follow the Spring's implementation :
     // the "default" scope is the prototype.
-    TyphoonScope result = TyphoonScopeDefault;
+    TyphoonScope result = TyphoonScopeObjectGraph;
     if ([scope isEqualToString:@"singleton"])
     {
         result = TyphoonScopeSingleton;

Tests/Definition/TyphoonDefinitionTests.m

@@ -17,6 +17,7 @@
 #import "AutoWiringSubClassedKnight.h"
 #import "TyphoonDefinition+InstanceBuilder.h"
 #import "TyphoonPropertyInjectedWithStringRepresentation.h"
+#import "TyphoonDefinition.h"
 
 
 @interface TyphoonDefinitionTests : SenTestCase
@@ -166,5 +167,7 @@ - (void)test_autoWired_properties
     assertThat(autoWired, hasItem(@"foobar"));
 }
 
+
+
 @end
 

Tests/Factory/Block/MiddleAgesAssembly.m → Tests/Factory/Block/TestAssemblies/MiddleAgesAssembly.m

@@ -30,7 +30,7 @@ - (id)knight
     {
         [definition injectProperty:@selector(quest) withDefinition:[self defaultQuest]];
         [definition injectProperty:@selector(damselsRescued) withValueAsText:@"12"];
-        [definition setScope:TyphoonScopeDefault];
+        [definition setScope:TyphoonScopeObjectGraph];
     }];
 }
 

Tests/Factory/Block/TestAssemblies/ObjectGraphAssembly.h

@@ -0,0 +1,25 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2013, Jasper Blues & Contributors
+//  All Rights Reserved.
+//
+//  NOTICE: The authors permit you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#import <Foundation/Foundation.h>
+#import "TyphoonAssembly.h"
+
+
+@interface ObjectGraphAssembly : TyphoonAssembly
+
+- (id)objectGraphKnight;
+
+- (id)objectGraphQuest;
+
+- (id)prototypeKnight;
+
+@end

Tests/Factory/Block/TestAssemblies/ObjectGraphAssembly.m

@@ -0,0 +1,62 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2013, Jasper Blues & Contributors
+//  All Rights Reserved.
+//
+//  NOTICE: The authors permit you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+
+
+#import <Typhoon/TyphoonDefinition.h>
+#import "ObjectGraphAssembly.h"
+#import "Knight.h"
+#import "Fort.h"
+#import "CampaignQuest.h"
+
+
+@implementation ObjectGraphAssembly
+
+- (id)objectGraphKnight
+{
+    return [TyphoonDefinition withClass:[Knight class] properties:^(TyphoonDefinition* definition)
+    {
+        [definition injectProperty:@selector(homeFort) withDefinition:[self objectGraphFort]];
+        [definition injectProperty:@selector(quest) withDefinition:[self objectGraphQuest]];
+    }];
+}
+
+- (id)objectGraphFort
+{
+    return [TyphoonDefinition withClass:[Fort class]];
+}
+
+- (id)objectGraphQuest
+{
+    return [TyphoonDefinition withClass:[CampaignQuest class] properties:^(TyphoonDefinition* definition)
+    {
+        [definition injectProperty:@selector(fort) withDefinition:[self objectGraphFort]];
+    }];
+}
+
+/* ====================================================================================================================================== */
+
+- (id)prototypeKnight
+{
+    return nil;
+}
+
+- (id)prototypeCastle
+{
+    return nil;
+}
+
+- (id)prototypeQuest
+{
+    return nil;
+}
+
+@end

Tests/Factory/TyphoonComponentFactoryTests.m

@@ -169,7 +169,7 @@ - (void)test_componentForKey_returns_with_property_dependencies_resolved_by_type
     [_componentFactory register:[TyphoonDefinition withClass:[Knight class] properties:^(TyphoonDefinition* definition)
     {
         [definition injectProperty:@selector(quest)];
-        [definition setScope:TyphoonScopeDefault];
+        [definition setScope:TyphoonScopeObjectGraph];
         [definition setKey:@"knight"];
     }]];
 
@@ -350,7 +350,7 @@ - (void)test_load_singleton
     }]];
     [_componentFactory register:[TyphoonDefinition withClass:[CavalryMan class] properties:^(TyphoonDefinition* definition)
     {
-        [definition setScope:TyphoonScopeDefault];
+        [definition setScope:TyphoonScopeObjectGraph];
         [definition setLazy:YES];
     }]];
     [_componentFactory load];

Tests/Factory/TyphoonScopeTests.m

@@ -0,0 +1,48 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2013, Jasper Blues & Contributors
+//  All Rights Reserved.
+//
+//  NOTICE: The authors permit you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#import <SenTestingKit/SenTestingKit.h>
+#import "ObjectGraphAssembly.h"
+#import "TyphoonBlockComponentFactory.h"
+#import "Knight.h"
+#import "CampaignQuest.h"
+#import "Fort.h"
+#import "OCLogTemplate.h"
+
+@interface TyphoonScopeTests : SenTestCase
+{
+    ObjectGraphAssembly* _assembly;
+}
+
+@end
+
+@implementation TyphoonScopeTests
+
+- (void)setUp
+{
+    TyphoonBlockComponentFactory* factory = [TyphoonBlockComponentFactory factoryWithAssembly:[ObjectGraphAssembly assembly]];
+    _assembly = (ObjectGraphAssembly*)factory;
+}
+
+
+//- (void)test_object_graph_assembly
+//{
+//    Knight* knight = [_assembly objectGraphKnight];
+//    CampaignQuest* quest = [_assembly objectGraphQuest];
+//
+//    LogDebug(@"Knight's fort: %@", knight.homeFort);
+//    LogDebug(@"Quest's fort: %@", quest.fort);
+//
+//    assertThatBool(knight.homeFort == quest.fort, equalToBool(YES));
+//}
+
+@end

Tests/Model/CampaignQuest.h

@@ -13,10 +13,12 @@
 #import <Foundation/Foundation.h>
 #import "Quest.h"
 
+@class Fort;
 
 @interface CampaignQuest : NSObject <Quest>
 
 @property(nonatomic, strong) NSURL* imageUrl;
+@property(nonatomic, strong) Fort* fort;
 
 - (id)initWithImageUrl:(NSURL*)imageUrl;
 

Tests/Model/Fort.h

@@ -0,0 +1,17 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2013, Jasper Blues & Contributors
+//  All Rights Reserved.
+//
+//  NOTICE: The authors permit you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#import <Foundation/Foundation.h>
+
+
+@interface Fort : NSObject
+@end

Tests/Model/Fort.m

@@ -0,0 +1,20 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2013, Jasper Blues & Contributors
+//  All Rights Reserved.
+//
+//  NOTICE: The authors permit you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#import "Fort.h"
+
+
+@implementation Fort
+{
+
+}
+@end

Tests/Model/Knight.h

@@ -14,6 +14,7 @@
 #import <Foundation/Foundation.h>
 
 @class CampaignQuest;
+@class Fort;
 
 #import "Quest.h"
 
@@ -27,6 +28,7 @@
 @property(nonatomic, strong, readonly) id <Quest> readOnlyQuest;
 @property(nonatomic, strong) NSArray* favoriteDamsels;
 @property(nonatomic, strong) NSSet* friends;
+@property(nonatomic, strong) Fort* homeFort;
 
 
 - (id)initWithQuest:(id <Quest>)quest;