Merge branch 'release/1.3'

Objection-Info.plist

@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.3</string>
 	<key>CFBundleSignature</key>
 	<string>ATOM</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.1</string>
+	<string>1.3</string>
 </dict>
 </plist>

Objection.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Objection'
-  s.version      = '1.2.1'
+  s.version      = '1.3'
   s.summary      = 'A lightweight dependency injection framework for Objective-C.'
   s.author       = { 'Justin DeWind' => '[email protected]' }
   s.source       = { :git => 'https://github.com/atomicobject/objection.git', :tag => "#{s.version}" }

README.md

@@ -318,12 +318,12 @@ If you're using [Kiwi](https://github.com/allending/Kiwi) for testing, checkout
 
 ### Static Framework and Linkable Framework
 
-It can be downloaded [here](http://objection-framework.org/files/Objection-1.2.1.tar.gz)
+It can be downloaded [here](http://objection-framework.org/files/Objection-1.3.tar.gz)
 
 ### Building Static Framework
 
     git clone git://github.com/atomicobject/objection.git
-    git checkout 1.2.1
+    git checkout 1.3
     
 #### iOS
 
@@ -350,7 +350,7 @@ It can be downloaded [here](http://objection-framework.org/files/Objection-1.2.1
 Edit your Pofile
 
     edit Podfile
-    pod 'Objection', '1.2.1'
+    pod 'Objection', '1.3'
 
 Now you can install Objection
     
@@ -389,6 +389,6 @@ One only has to [search GitHub](https://github.com/search?l=Objective-C&p=1&q=de
 * [Bubble Island](http://www.wooga.com/games/bubble-island/)
 * [Monster World](http://www.wooga.com/games/monster-world/)
 * [Pocket Village](http://www.wooga.com/games/pocket-village/)
-* [SideReel](https://itunes.apple.com/us/app/sidereel/id41.2.170961?mt=8)
+* [SideReel](https://itunes.apple.com/us/app/id417270961?mt=8)
 * [Google Wallet](http://www.google.com/wallet/)
 

Source/JSObjectionInjectorEntry.m

@@ -4,7 +4,6 @@
 #import "NSObject+Objection.h"
 
 @interface JSObjectionInjectorEntry()
-- (void)notifyObjectThatItIsReady: (id)object;
 - (id)buildObject:(NSArray *)arguments;
 - (id)argumentsForObject:(NSArray *)givenArguments;
 - (SEL)initializerForObject;

Source/JSObjectionUtils.m

@@ -85,17 +85,25 @@ static objc_property_t GetProperty(Class klass, NSString *propertyName) {
 
 
 static id BuildObjectWithInitializer(Class klass, SEL initializer, NSArray *arguments) {
-    id instance = [klass alloc];
-    NSMethodSignature *signature = [klass instanceMethodSignatureForSelector:initializer];
+	NSMethodSignature *signature = [klass methodSignatureForSelector:initializer];
+	id instance = nil;
+    BOOL isStatic = signature != nil;
+
+	if (!signature) {
+		instance = [klass alloc];
+		signature = [klass instanceMethodSignatureForSelector:initializer];
+	}
+
     if (signature) {
         NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-        [invocation setTarget:instance];
+        [invocation setTarget:isStatic ? klass : instance];
         [invocation setSelector:initializer];
         for (int i = 0; i < arguments.count; i++) {
             __unsafe_unretained id argument = [arguments objectAtIndex:i];
             [invocation setArgument:&argument atIndex:i + 2];
         }
         [invocation invoke];
+		[invocation getReturnValue:&instance];
         return instance;
     } else {
         @throw [NSException exceptionWithName:JSObjectionException reason:[NSString stringWithFormat:@"Could not find initializer '%@' on %@", NSStringFromSelector(initializer), NSStringFromClass(klass)] userInfo:nil]; 

Specs/InitializerFixtures.h

@@ -24,3 +24,8 @@
 @interface BadInitializer : NSObject
 @end
 
+@interface Truck : NSObject
+@property(nonatomic, strong) NSString *name;
++ (id)truck: (NSString *)name;
+@end
+

Specs/InitializerFixtures.m

@@ -1,5 +1,17 @@
 #import "InitializerFixtures.h"
 
+@implementation Truck
+objection_register(Truck)
+objection_initializer(truck:, @"Chevy")
+
++ (id)truck: (NSString *)name {
+    NSLog(@"TRUCK!");
+    Truck *truck = [[self alloc] init];
+    truck.name = name;
+    return truck;    
+}
+@end
+
 @implementation BadInitializer
 objection_register(BadInitializer)
 objection_initializer(initWithNonExistentInitializer)

Specs/InitializerSpecs.m

@@ -39,4 +39,11 @@
    }) should] raiseWithReason:@"Could not find initializer 'initWithNonExistentInitializer' on BadInitializer"];
 });
 
+it(@"supports initializing an object with a class method", ^{
+    Truck *truck = [injector getObjectWithArgs:[Truck class], @"Ford", nil];
+
+    [[truck shouldNot] beNil];
+    [[truck.name should] equal:@"Ford"];
+});
+
 SPEC_END