Updated example, TODO, and podspec

atomicobject · Mar 4, 2012 · c7043ef · c7043ef
1 parent bc896b8
commit c7043ef
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/Examples/ObjectionExample/Libraries/Objection-iOS.framework/Versions/A/Headers/JSObjection.h b/Examples/ObjectionExample/Libraries/Objection-iOS.framework/Versions/A/Headers/JSObjection.h
@@ -6,7 +6,8 @@
 
 }
 
-+ (JSObjectionInjector *)createInjector:(JSObjectionModule *)aModule;
++ (JSObjectionInjector *)createInjectorWithModules:(JSObjectionModule *)first, ... NS_REQUIRES_NIL_TERMINATION;
++ (JSObjectionInjector *)createInjector:(JSObjectionModule *)module;
 + (JSObjectionInjector *)createInjector;
 + (void)registerClass:(Class)theClass lifeCycle:(JSObjectionInstantiationRule)lifeCycle;
 + (void)setGlobalInjector:(JSObjectionInjector *)anInjector;

diff --git a/...jectionExample/Libraries/Objection-iOS.framework/Versions/A/Headers/JSObjectionInjector.h b/...jectionExample/Libraries/Objection-iOS.framework/Versions/A/Headers/JSObjectionInjector.h
@@ -9,5 +9,6 @@
 
 - (id)initWithContext:(NSDictionary *)theGlobalContext;
 - (id)initWithContext:(NSDictionary *)theGlobalContext andModule:(JSObjectionModule *)theModule;
+- (id)initWithContext:(NSDictionary *)theGlobalContext andModules:(NSArray *)modules;
 - (id)getObject:(id)classOrProtocol;
 @end
diff --git a/...ObjectionExample/Libraries/Objection-iOS.framework/Versions/A/Headers/JSObjectionModule.h b/...ObjectionExample/Libraries/Objection-iOS.framework/Versions/A/Headers/JSObjectionModule.h
@@ -3,7 +3,7 @@
 @class JSObjectionInjector;
 
 @protocol JSObjectionProvider<NSObject>
-- (id)createInstance:(JSObjectionInjector *)context;
+- (id)provide:(JSObjectionInjector *)context;
 @end
 
 
@@ -21,6 +21,7 @@
 - (void)bindProvider:(id<JSObjectionProvider>)provider toClass:(Class)aClass;
 - (void)bindProvider:(id<JSObjectionProvider>)provider toProtocol:(Protocol *)aProtocol;
 - (void)bindClass:(Class)aClass toProtocol:(Protocol *)aProtocol;
+- (void)bindClass:(Class)aClass toClass:(Class)toClass;
 - (void)bindBlock:(id (^)(JSObjectionInjector *context))block toClass:(Class)aClass;
 - (void)bindBlock:(id (^)(JSObjectionInjector *context))block toProtocol:(Protocol *)aProtocol;
 - (void)registerEagerSingleton:(Class)klass;

diff --git a/Examples/ObjectionExample/Libraries/Objection-iOS.framework/Versions/A/Objection-iOS b/Examples/ObjectionExample/Libraries/Objection-iOS.framework/Versions/A/Objection-iOS
diff --git a/Examples/ObjectionExample/Libraries/Objection-iOS.framework/Versions/A/Resources/Info.plist b/Examples/ObjectionExample/Libraries/Objection-iOS.framework/Versions/A/Resources/Info.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.10.0</string>
+	<string>0.12.0</string>
 	<key>CFBundleSignature</key>
 	<string>ATOM</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>0.12.1</string>
 </dict>
 </plist>
diff --git a/Examples/ObjectionExample/ObjectionExample.xcodeproj/project.pbxproj b/Examples/ObjectionExample/ObjectionExample.xcodeproj/project.pbxproj
@@ -479,7 +479,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0430;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ObjectionExample" */;
 			compatibilityVersion = "Xcode 3.2";

diff --git a/Objection.podspec b/Objection.podspec
@@ -1,9 +1,9 @@
 Pod::Spec.new do |s|
   s.name         = 'Objection'
-  s.version      = '0.10'
+  s.version      = '0.12.1'
   s.summary      = 'A lightweight dependency injection framework for Objective-C.'
   s.author       = { 'Justin DeWind' => 'dewind@atomicobject.com' }
-  s.source       = { :git => 'https://github.com/atomicobject/objection.git', :tag => '0.10' }
+  s.source       = { :git => 'https://github.com/atomicobject/objection.git', :tag => '0.12.1' }
   s.homepage     = 'http://www.objection-framework.org'
   s.source_files = 'Source'
   s.license      = "https://github.com/atomicobject/objection/blob/master/LICENSE"

diff --git a/README.md b/README.md
@@ -205,8 +205,9 @@ Occasionally you'll want to manually construct an object within Objection. Provi
 ```
 ## TODO
 
-* Add support for custom initializers
-* Support 'static' injection to help workaround poorly implemented APIs              
+* Add support for alternate initializers
+  * <code>objection\_initializer(initWithNibName:bundle, @"Nib", nil)</code>
+* Support 'static' injection
 * Resolve circular dependencies
 * Add contribution section
 * Re-factor the method for declaring dependencies