Update podspec.

Source/Factory/Block/TyphoonAssembly.m

@@ -20,8 +20,8 @@
 #import "TyphoonAssemblySelectorAdviser.h"
 #import "OCLogTemplate.h"
 
-static NSMutableDictionary *resolveStackForKey;
-static NSMutableArray *reservedSelectorsAsStrings;
+static NSMutableDictionary* resolveStackForSelector;
+static NSMutableArray* reservedSelectorsAsStrings;
 
 @implementation TyphoonAssembly
 
@@ -42,38 +42,38 @@ + (TyphoonAssembly*)defaultAssembly
 + (void)load
 {
     [super load];
-    resolveStackForKey = [[NSMutableDictionary alloc] init];
     [self reserveSelectors];
 }
 
 + (void)reserveSelectors;
 {
-  reservedSelectorsAsStrings = [[NSMutableArray alloc] init];
-  
-  [self markSelectorReserved:@selector(init)];
-  [self markSelectorReserved:@selector(cachedDefinitionsForMethodName)];
-  [self markSelectorReservedFromString:@".cxx_destruct"];
-  [self markSelectorReserved:@selector(defaultAssembly)];
+    reservedSelectorsAsStrings = [[NSMutableArray alloc] init];
+
+    [self markSelectorReserved:@selector(init)];
+    [self markSelectorReserved:@selector(cachedDefinitionsForMethodName)];
+    [self markSelectorReservedFromString:@".cxx_destruct"];
+    [self markSelectorReserved:@selector(defaultAssembly)];
 }
 
 + (void)markSelectorReserved:(SEL)selector
 {
-  [self markSelectorReservedFromString:NSStringFromSelector(selector)];
+    [self markSelectorReservedFromString:NSStringFromSelector(selector)];
 }
 
-+ (void)markSelectorReservedFromString:(NSString *)stringFromSelector
++ (void)markSelectorReservedFromString:(NSString*)stringFromSelector
 {
-  [reservedSelectorsAsStrings addObject:stringFromSelector];
+    [reservedSelectorsAsStrings addObject:stringFromSelector];
 }
 
 #pragma mark - Instance Method Resolution
 + (BOOL)resolveInstanceMethod:(SEL)sel
 {
-    if ([self shouldProvideDynamicImplementationFor:sel]) {
+    if ([self shouldProvideDynamicImplementationFor:sel])
+    {
         [self provideDynamicImplementationToConstructDefinitionForSEL:sel];
         return YES;
     }
-    
+
     return [super resolveInstanceMethod:sel];
 }
 
@@ -84,7 +84,7 @@ + (BOOL)shouldProvideDynamicImplementationFor:(SEL)sel;
 
 + (BOOL)selectorReserved:(SEL)selector
 {
-  return [reservedSelectorsAsStrings containsObject:NSStringFromSelector(selector)];
+    return [reservedSelectorsAsStrings containsObject:NSStringFromSelector(selector)];
 }
 
 + (void)provideDynamicImplementationToConstructDefinitionForSEL:(SEL)sel;
@@ -95,51 +95,52 @@ + (void)provideDynamicImplementationToConstructDefinitionForSEL:(SEL)sel;
 
 + (IMP)implementationToConstructDefinitionForSEL:(SEL)selWithAdvicePrefix
 {
-    return imp_implementationWithBlock((__bridge id) objc_unretainedPointer((TyphoonDefinition *)^(id me)
-       {
-           NSString *key = [TyphoonAssemblySelectorAdviser keyForAdvisedSEL:selWithAdvicePrefix];
-           return [self definitionForKey:key me:me];
-       }));
+    return imp_implementationWithBlock((__bridge id) objc_unretainedPointer((TyphoonDefinition*) ^(id me)
+    {
+        NSString* key = [TyphoonAssemblySelectorAdviser keyForAdvisedSEL:selWithAdvicePrefix];
+        return [self definitionForKey:key me:me];
+    }));
 }
 
-+ (TyphoonDefinition *)definitionForKey:(NSString *)key me:(id)me
++ (TyphoonDefinition*)definitionForKey:(NSString*)key me:(id)me
 {
     LogTrace(@"Resolving request for definition for key: %@", key);
 
-    TyphoonDefinition *cached = [self cachedDefinitionForKey:key me:me];
+    TyphoonDefinition* cached = [self cachedDefinitionForKey:key me:me];
     if (!cached)
     {
         LogTrace(@"Definition for key: '%@' is not cached, building...", key);
         return [self buildDefinitionForKey:key me:me];
     }
-        
+
     LogTrace(@"Using cached definition for key '%@.'", key);
     return cached;
 }
 
-+ (TyphoonDefinition *)cachedDefinitionForKey:(NSString *)key me:(id)me
++ (TyphoonDefinition*)cachedDefinitionForKey:(NSString*)key me:(id)me
 {
     return [[me cachedDefinitionsForMethodName] objectForKey:key];
 }
 
-+ (TyphoonDefinition *)buildDefinitionForKey:(NSString *)key me:(TyphoonAssembly *)me;
++ (TyphoonDefinition*)buildDefinitionForKey:(NSString*)key me:(TyphoonAssembly*)me;
 {
-    NSMutableArray *resolveStack = [self resolveStackForKey:key];
+    NSMutableArray* resolveStack = [self resolveStackForKey:key];
     [self markCurrentlyResolvingKey:key resolveStack:resolveStack];
-
-    if ([self dependencyForKey:key involvedInCircularDependencyInResolveStack:resolveStack]) {
+
+    if ([self dependencyForKey:key involvedInCircularDependencyInResolveStack:resolveStack])
+    {
         return [self definitionToTerminateCircularDependencyForKey:key];
     }
-    
+
     id cached = [self populateCacheWithDefinitionForKey:key me:me];
     [self markKeyResolved:key resolveStack:resolveStack];
-    
+
     LogTrace(@"Did finish building definition for key: '%@'", key);
-    
+
     return cached;
 }
 
-+ (BOOL)dependencyForKey:(NSString *)key involvedInCircularDependencyInResolveStack:(NSArray *)resolveStack;
++ (BOOL)dependencyForKey:(NSString*)key involvedInCircularDependencyInResolveStack:(NSArray*)resolveStack;
 {
     if ([resolveStack count] >= 2)
     {
@@ -151,67 +152,74 @@ + (BOOL)dependencyForKey:(NSString *)key involvedInCircularDependencyInResolveSt
             return YES;
         }
     }
-    
+
     return NO;
 }
 
-+ (TyphoonDefinition *)definitionToTerminateCircularDependencyForKey:(NSString *)key
++ (TyphoonDefinition*)definitionToTerminateCircularDependencyForKey:(NSString*)key
 {
     // we return a 'dummy' definition just to terminate the cycle. This dummy definition will be overwritten by the real one, which will be set further up the stack and will overwrite this one in 'cachedDefinitionsForMethodName'.
     return [[TyphoonDefinition alloc] initWithClass:[NSString class] key:key];
 }
 
-+ (NSMutableArray *)resolveStackForKey:(NSString *)key
++ (NSMutableArray*)resolveStackForKey:(NSString*)key
 {
-    NSMutableArray *resolveStack = [resolveStackForKey objectForKey:key];
-    if (!resolveStack) {
+    NSMutableArray* resolveStack = [resolveStackForSelector objectForKey:key];
+    if (!resolveStack)
+    {
+        if (!resolveStackForSelector)
+        {
+            resolveStackForSelector = [[NSMutableDictionary alloc] init];
+        }
         resolveStack = [[NSMutableArray alloc] init];
-        [resolveStackForKey setObject:resolveStack forKey:key];
+        [resolveStackForSelector setObject:resolveStack forKey:key];
     }
     return resolveStack;
 }
 
-+ (void)markCurrentlyResolvingKey:(NSString *)key resolveStack:(NSMutableArray *)resolveStack
++ (void)markCurrentlyResolvingKey:(NSString*)key resolveStack:(NSMutableArray*)resolveStack
 {
     [resolveStack addObject:key];
 }
 
-+ (TyphoonDefinition *)populateCacheWithDefinitionForKey:(NSString *)key me:(TyphoonAssembly *)me;
++ (TyphoonDefinition*)populateCacheWithDefinitionForKey:(NSString*)key me:(TyphoonAssembly*)me;
 {
     id d = [self definitionByCallingAssemblyMethodForKey:key me:me];
     [self populateCacheWithDefinition:d forKey:key me:me];
     return d;
 }
 
-+ (id)definitionByCallingAssemblyMethodForKey:(NSString *)key me:(TyphoonAssembly *)me
++ (id)definitionByCallingAssemblyMethodForKey:(NSString*)key me:(TyphoonAssembly*)me
 {
     SEL sel = [TyphoonAssemblySelectorAdviser advisedSELForKey:key];
-    id cached = objc_msgSend(me, sel); // the advisedSEL will call through to the original, unwrapped implementation because of the active swizzling.
+    id cached = objc_msgSend(me,
+        sel); // the advisedSEL will call through to the original, unwrapped implementation because of the active swizzling.
     return cached;
 }
 
-+ (void)populateCacheWithDefinition:(TyphoonDefinition *)cached forKey:(NSString *)key me:(id)me
++ (void)populateCacheWithDefinition:(TyphoonDefinition*)cached forKey:(NSString*)key me:(id)me
 {
     if (cached && [cached isKindOfClass:[TyphoonDefinition class]])
     {
         TyphoonDefinition* definition = (TyphoonDefinition*) cached;
         [self setKey:key onDefinitionIfExistingKeyEmpty:definition];
-        
+
         [[me cachedDefinitionsForMethodName] setObject:definition forKey:key];
     }
 }
 
-+ (void)setKey:(NSString *)key onDefinitionIfExistingKeyEmpty:(TyphoonDefinition *)definition
++ (void)setKey:(NSString*)key onDefinitionIfExistingKeyEmpty:(TyphoonDefinition*)definition
 {
     if ([definition.key length] == 0)
     {
         definition.key = key;
     }
 }
 
-+ (void)markKeyResolved:(NSString *)key resolveStack:(NSMutableArray *)resolveStack
++ (void)markKeyResolved:(NSString*)key resolveStack:(NSMutableArray*)resolveStack
 {
-    if (resolveStack.count) {
+    if (resolveStack.count)
+    {
         [resolveStack removeAllObjects];
     }
 }

Tests/Podfile.lock

@@ -18,4 +18,4 @@ SPEC CHECKSUMS:
   OCMockito: 01560fd24319b85c223e10f52e2e41fbe2c6d434
   Typhoon: 09b665c2b04ccd4c43293383beadd27b820f674e
 
-COCOAPODS: 0.23.0
+COCOAPODS: 0.24.0