Build against latest.

appsquickly · Feb 3, 2013 · 6eba3ff · 6eba3ff
1 parent 7ad3f44
commit 6eba3ff
Show file tree

Hide file tree

Showing 14 changed files with 465 additions and 465 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,18 @@
+# Xcode
+build/*
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+!default.xcworkspace
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+
+
+.DS_Store
diff --git a/External/.DS_Store b/External/.DS_Store
diff --git a/External/Typhoon/Component/TyphoonDefinition.h b/External/Typhoon/Component/TyphoonDefinition.h
@@ -19,8 +19,8 @@
 
 typedef enum
 {
-    TyphoonComponentLifeCycleSingleton,
-    TyphoonComponentLifeCyclePrototype
+    TyphoonComponentLifeCyclePrototype,
+    TyphoonComponentLifeCycleSingleton
 } TyphoonComponentLifecycle;
 
 
@@ -31,7 +31,7 @@ typedef enum
 
 @property(nonatomic, readonly) Class type;
 @property(nonatomic, strong) NSString* key;
-@property(nonatomic, strong, readonly) NSString* factoryComponent;
+@property(nonatomic, strong) NSString* factoryComponent;
 @property(nonatomic, strong) TyphoonInitializer* initializer;
 @property(nonatomic) SEL beforePropertyInjection;
 @property(nonatomic) SEL afterPropertyInjection;

diff --git a/External/Typhoon/Component/TyphoonDefinition.m b/External/Typhoon/Component/TyphoonDefinition.m
@@ -98,14 +98,7 @@ - (NSSet*)propertiesInjectedByReference
 /* ============================================================ Utility Methods ========================================================= */
 - (NSString*)description
 {
-    NSMutableString* description = [NSMutableString stringWithFormat:@"<%@: ", NSStringFromClass([self class])];
-    [description appendFormat:@"self.injectedProperties=%@", self.injectedProperties];
-    [description appendFormat:@", self.type=%@", self.type];
-    [description appendFormat:@", self.key=%@", self.key];
-    [description appendFormat:@", self.initializer=%@", self.initializer];
-    [description appendFormat:@", self.lifecycle=%@", self.lifecycle == TyphoonComponentLifeCycleSingleton ? @"Singleton" : @"Prototype"];
-    [description appendString:@">"];
-    return description;
+    return [NSString stringWithFormat:@"Definition: class='%@'", NSStringFromClass(_type)];
 }
 
 - (void)dealloc

diff --git a/External/Typhoon/Factory/Block/TyphoonAssembly.h b/External/Typhoon/Factory/Block/TyphoonAssembly.h
@@ -15,6 +15,7 @@
 
 
 static NSString * const TYPHOON_BEFORE_ADVICE_SUFFIX = @"__typhoonBeforeAdvice";
+static NSMutableArray* resolveStack;
 
 @interface TyphoonAssembly : NSObject
 {

diff --git a/External/Typhoon/Factory/Block/TyphoonAssembly.m b/External/Typhoon/Factory/Block/TyphoonAssembly.m
@@ -43,6 +43,18 @@ + (BOOL)resolveInstanceMethod:(SEL)sel
             id cached = [[me cachedSelectors] objectForKey:key];
             if (cached == nil)
             {
+                [resolveStack addObject:key];
+                if ([resolveStack count] > 100)
+                {
+                    NSString* bottom = [resolveStack objectAtIndex:0];
+                    NSString* top = [resolveStack objectAtIndex:[resolveStack count] -1];
+                    if ([top isEqualToString:bottom])
+                    {
+                        NSLog(@"Resolve stack: %@", resolveStack);
+                        [NSException raise:NSInternalInconsistencyException format:@"Circular dependency detected."];
+                    }
+                }
+
                 [[self class] typhoon_swizzleMethod:sel withMethod:NSSelectorFromString(key) error:nil];
                 cached = objc_msgSend(me, sel);
                 if (cached && [cached isKindOfClass:[TyphoonDefinition class]])
@@ -56,6 +68,7 @@ + (BOOL)resolveInstanceMethod:(SEL)sel
                 }
                 [[self class] typhoon_swizzleMethod:NSSelectorFromString(key) withMethod:sel error:nil];
             }
+            [resolveStack removeAllObjects];
             return cached;
 
         }));
@@ -70,6 +83,12 @@ + (BOOL)selectorReserved:(SEL)selector
     return selector == @selector(init) || selector == @selector(cachedSelectors) || selector == NSSelectorFromString(@".cxx_destruct");
 }
 
++ (void)load
+{
+    [super load];
+    resolveStack = [[NSMutableArray alloc] init];
+}
+
 /* ============================================================ Initializers ============================================================ */
 - (id)init
 {

diff --git a/External/Typhoon/Factory/Block/TyphoonBlockComponentFactory.m b/External/Typhoon/Factory/Block/TyphoonBlockComponentFactory.m
@@ -20,7 +20,7 @@
 
 static NSMutableArray* swizzleRegistry;
 
-@interface TyphoonAssembly (NanoFactoryFriend)
+@interface TyphoonAssembly (BlockFactoryFriend)
 
 + (BOOL)selectorReserved:(SEL)selector;
 
@@ -48,13 +48,17 @@ + (BOOL)resolveInstanceMethod:(SEL)sel
 + (void)initialize
 {
     [super initialize];
-    swizzleRegistry = [[NSMutableArray alloc] init];
+    @synchronized (self)
+    {
+        swizzleRegistry = [[NSMutableArray alloc] init];
+    }
 }
 
 
 /* ============================================================ Initializers ============================================================ */
 - (id)initWithAssembly:(TyphoonAssembly*)assembly;
 {
+    NSLog(@"Building assembly: %@", NSStringFromClass([assembly class]));
     if (![assembly isKindOfClass:[TyphoonAssembly class]])
     {
         [NSException raise:NSInvalidArgumentException format:@"Class '%@' is not a sub-class of %@", NSStringFromClass([assembly class]),
@@ -65,6 +69,7 @@ - (id)initWithAssembly:(TyphoonAssembly*)assembly;
     {
         [self applyBeforeAdviceToAssemblyMethods:assembly];
         NSArray* definitions = [self populateCache:assembly];
+        NSLog(@"Definitions: %@", definitions);
         for (TyphoonDefinition* definition in definitions)
         {
             [self register:definition];
@@ -76,47 +81,56 @@ - (id)initWithAssembly:(TyphoonAssembly*)assembly;
 /* ============================================================ Private Methods ========================================================= */
 - (NSArray*)populateCache:(TyphoonAssembly*)assembly
 {
-    unsigned int methodCount;
-    Method* methodList = class_copyMethodList([assembly class], &methodCount);
-    for (int i = 0; i < methodCount; i++)
+    @synchronized (self)
     {
-        Method method = methodList[i];
-
-        int argumentCount = method_getNumberOfArguments(method);
-        if (argumentCount == 2)
+        unsigned int methodCount;
+        Method* methodList = class_copyMethodList([assembly class], &methodCount);
+        for (int i = 0; i < methodCount; i++)
         {
-            SEL methodSelector = method_getName(method);
-            if (![[assembly class] selectorReserved:methodSelector])
+            Method method = methodList[i];
+//            NSLog(@"Selector: %@", NSStringFromSelector(method_getName(method)));
+
+            int argumentCount = method_getNumberOfArguments(method);
+            if (argumentCount == 2)
             {
-                objc_msgSend(assembly, methodSelector);
+                SEL methodSelector = method_getName(method);
+                if (![[assembly class] selectorReserved:methodSelector])
+                {
+                    objc_msgSend(assembly, methodSelector);
+                }
             }
         }
+        NSMutableDictionary* dictionary = [assembly cachedSelectors];
+        free(methodList);
+        return [dictionary allValues];
     }
-    NSMutableDictionary* dictionary = [assembly cachedSelectors];
-    return [dictionary allValues];
 }
 
 - (void)applyBeforeAdviceToAssemblyMethods:(TyphoonAssembly*)assembly
 {
-    if (![swizzleRegistry containsObject:[TyphoonAssembly class]])
+    @synchronized (self)
     {
-        [swizzleRegistry addObject:[TyphoonAssembly class]];
-        unsigned int methodCount;
-        Method* methodList = class_copyMethodList([assembly class], &methodCount);
-        for (int i = 0; i < methodCount; i++)
+        if (![swizzleRegistry containsObject:[assembly class]])
         {
-            Method method = methodList[i];
-            int argumentCount = method_getNumberOfArguments(method);
-            if (argumentCount == 2)
+            [swizzleRegistry addObject:[assembly class]];
+            unsigned int methodCount;
+            Method* methodList = class_copyMethodList([assembly class], &methodCount);
+            for (int i = 0; i < methodCount; i++)
             {
-                SEL methodSelector = method_getName(method);
-                if ([TyphoonAssembly selectorReserved:methodSelector] == NO)
+                Method method = methodList[i];
+                int argumentCount = method_getNumberOfArguments(method);
+                if (argumentCount == 2)
                 {
-                    SEL swizzled = NSSelectorFromString(
-                            [NSStringFromSelector(methodSelector) stringByAppendingString:TYPHOON_BEFORE_ADVICE_SUFFIX]);
-                    [[assembly class] typhoon_swizzleMethod:methodSelector withMethod:swizzled error:nil];
+                    SEL methodSelector = method_getName(method);
+                    if ([TyphoonAssembly selectorReserved:methodSelector] == NO)
+                    {
+                        SEL swizzled = NSSelectorFromString(
+                                [NSStringFromSelector(methodSelector) stringByAppendingString:TYPHOON_BEFORE_ADVICE_SUFFIX]);
+                        [[assembly class] typhoon_swizzleMethod:methodSelector withMethod:swizzled error:nil];
+                    }
                 }
             }
+            free(methodList);
         }
     }
 }

diff --git a/External/Typhoon/Factory/TyphoonComponentFactory+InstanceBuilder.m b/External/Typhoon/Factory/TyphoonComponentFactory+InstanceBuilder.m
@@ -57,10 +57,19 @@ - (id)buildInstanceWithDefinition:(TyphoonDefinition*)definition
     }
 
     [self injectPropertyDependenciesOn:instance withDefinition:definition];
+    if (definition.factoryComponent || definition.initializer.isClassMethod)
+    {
+        int retainCount = objc_msgSend(instance, NSSelectorFromString(@"retainCount"));
+        NSLog(@"Instance of class '%@' returned from factory. Retain count: %i", NSStringFromClass([instance class]), retainCount);
+        objc_msgSend(instance, NSSelectorFromString(@"retain"));
+    }
     return instance;
 }
 
 
+
+
+
 /* ============================================================ Private Methods ========================================================= */
 - (id)invokeInitializerOn:(id)instanceOrClass withDefinition:(TyphoonDefinition*)definition
 {

diff --git a/External/Typhoon/Factory/TyphoonComponentFactory.m b/External/Typhoon/Factory/TyphoonComponentFactory.m
@@ -136,7 +136,7 @@ - (id)componentForKey:(NSString*)key
     {
         [NSException raise:NSInvalidArgumentException format:@"No component matching id '%@'.", key];
     }
-    id returnValue = [self objectForDefinition:definition];
+    __autoreleasing id returnValue = [self objectForDefinition:definition];
     [_currentlyResolvingReferences removeAllObjects];
     return returnValue;
 }

diff --git a/External/Typhoon/Typhoon.h b/External/Typhoon/Typhoon.h
@@ -29,5 +29,6 @@
 #import "TyphoonDefinition+BlockAssembly.h"
 
 #import "TyphoonAutowire.h"
+#import "TyphoonShorthand.h"
 
 
diff --git a/External/Typhoon/TyphoonAutowire.h b/External/Typhoon/TyphoonAutowire.h
@@ -20,7 +20,3 @@
         } \
         return TyphoonAutoWiredProperties(self, autoInjectProperties); \
     }
-
-#ifdef typhoon_shorthand
-#define autoWire typhoon_autoWire
-#endif
diff --git a/External/Typhoon/TyphoonShorthand.h b/External/Typhoon/TyphoonShorthand.h
@@ -0,0 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  JASPER BLUES
+//  Copyright 2013 Jasper Blues
+//  All Rights Reserved.
+//
+//  NOTICE: Jasper Blues permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifdef typhoon_shorthand
+
+#define autoWire typhoon_autoWire
+
+#define Singleton TyphoonComponentLifecycleSingleton
+
+#define Prototype TyphoonComponentLifecyclePrototype
+
+#endif
+