Added a separate method that takes variadic args

atomicobject · Jun 12, 2012 · d2d2876 · d2d2876
1 parent b872a58
commit d2d2876
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/Source/JSObjectionInjector.h b/Source/JSObjectionInjector.h
@@ -10,5 +10,6 @@
 - (id)initWithContext:(NSDictionary *)theGlobalContext;
 - (id)initWithContext:(NSDictionary *)theGlobalContext andModule:(JSObjectionModule *)theModule;
 - (id)initWithContext:(NSDictionary *)theGlobalContext andModules:(NSArray *)modules;
-- (id)getObject:(id)classOrProtocol, ...;
+- (id)getObject:(id)classOrProtocol;
+- (id)getObjectWithArgs:(id)classOrProtocol, ... NS_REQUIRES_NIL_TERMINATION;
 @end
diff --git a/Source/JSObjectionInjector.m b/Source/JSObjectionInjector.m
@@ -69,23 +69,23 @@ - (id)initWithContext:(NSDictionary *)theGlobalContext andModules:(NSArray *)mod
 }
 
 
-- (id)getObject:(id)classOrProtocol, ... {
+- (id)getObjectWithArgs:(id)classOrProtocol, ... {
     @synchronized(self) {    
         if (!classOrProtocol) {
             return nil;
         }
-            
+
         NSString *key = nil;
         if (class_isMetaClass(object_getClass(classOrProtocol))) {
             key = NSStringFromClass(classOrProtocol);
         } else {
             key = [NSString stringWithFormat:@"<%@>", NSStringFromProtocol(classOrProtocol)];
         }
-
-
+        
+        
         id<JSObjectionEntry> injectorEntry = [_context objectForKey:key];
         injectorEntry.injector = self;
-
+        
         if (!injectorEntry) {
             id<JSObjectionEntry> entry = [_globalContext objectForKey:key];
             if (entry) {
@@ -94,19 +94,24 @@ - (id)getObject:(id)classOrProtocol, ... {
                 [_context setObject:injectorEntry forKey:key];              
             }
         }
-
+        
         if (classOrProtocol && injectorEntry) {
             va_list va_arguments;
             va_start(va_arguments, classOrProtocol);
             NSArray *arguments = JSObjectionUtils.transformVariadicArgsToArray(va_arguments);
             va_end(va_arguments);
             return [injectorEntry extractObject:arguments];
         } 
-
+        
         return nil;    
     }
-
+    
     return nil;
+
+}
+
+- (id)getObject:(id)classOrProtocol {
+    return [self getObjectWithArgs:classOrProtocol, nil];
 }
 
 #pragma mark - Private

diff --git a/Source/JSObjectionUtils.m b/Source/JSObjectionUtils.m
@@ -64,6 +64,7 @@ static JSObjectionPropertyInfo FindClassOrProtocolForProperty(objc_property_t pr
 
 static NSArray* TransformVariadicArgsToArray(va_list va_arguments) {
     NSMutableArray *arguments = [NSMutableArray array];    
+
     id object;
     while ((object = va_arg( va_arguments, id ))) {
         [arguments addObject:object];

diff --git a/Specs/InitializerSpecs.m b/Specs/InitializerSpecs.m
@@ -17,7 +17,7 @@
 });
 
 it(@"will override the default arguments if arguments are passed to the injector", ^{
-    ViewController *controller = [injector getObject:[ViewController class], @"AnotherNib", @"pretendBundle", nil];
+    ViewController *controller = [injector getObjectWithArgs:[ViewController class], @"AnotherNib", @"pretendBundle", nil];
 
     [[controller.nibName should] equal:@"MyNib"];
     [[controller.bundle should] equal:@"pretendBundle"];