Merge pull request #4 from aryaxt/PassContainerToModuleClass

Passing container to module, this way nested dependencies can be done…

SwiftInjection.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
     s.name = 'SwiftInjection'
-    s.version = '0.2'
+    s.version = '0.3'
     s.summary = 'A dependency injection framework for swift'
     s.homepage = 'https://github.com/aryaxt/SwiftInjection'
     s.license = {
       :type => 'MIT',
       :file => 'License.txt'
     }
     s.author = {'Aryan Ghassemi' => 'https://github.com/aryaxt/SwiftInjection'}
-    s.source = {:git => 'https://github.com/aryaxt/SwiftInjection.git', :tag => '0.2'}
+    s.source = {:git => 'https://github.com/aryaxt/SwiftInjection.git', :tag => '0.3'}
     s.platform = :ios, '8.0'
     s.source_files = 'SwiftInjection/*.{swift}'
     s.framework = 'Foundation'

SwiftInjection/DIContainer.swift

@@ -26,7 +26,7 @@ public class DIContainer {
 	- parameter module: A subclass of DIAbstractModule that implements DIModule
 	*/
 	public func addModule<T: DIAbstractModule where T: DIModule>(module: T) {
-		module.load()
+		module.load(container: self)
 	}
 
 	/**

SwiftInjection/DIModule.swift

@@ -7,5 +7,5 @@
 //
 
 public protocol DIModule {
-	func load()
+	func load(container container: DIContainer)
 }

SwiftInjectionExample/SwiftInjectionExample/AppModule.swift

@@ -10,8 +10,9 @@ import SwiftInjection
 
 public class AppModule: DIAbstractModule, DIModule {
 
-	public func load() {
-		bind(GithubClient.self) { GithubHttpClient(baseUrl: "https://api.github.com") }
+	public func load(container container: DIContainer) {
+		bind(Client.self) { HttpClient(baseUrl: "https://api.github.com") }
+		bind(GithubClient.self) { GithubHttpClient(client: container.resolve(Client.self)) }
 		bind(NSUserDefaults.self, asSingleton: false) { NSUserDefaults.standardUserDefaults() }
 		bind(AnalyticsTracker.self, named: GoogleAnalyticsTracker.analyticsIdentifier()) { GoogleAnalyticsTracker() }
 		bind(AnalyticsTracker.self, named: AmplitudeAnalyticsTracker.analyticsIdentifier()) { AmplitudeAnalyticsTracker() }

SwiftInjectionExample/SwiftInjectionExample/NetworkLayer/Client.swift

@@ -22,7 +22,7 @@ public enum ClientError: ErrorType {
 	case InvalidResponse
 }
 
-protocol Client {
+public protocol Client {
 	func fetchObject<T: Mappable>(type type: T.Type, path: String, method: HttpMethod, completion: Result<T>->Void) -> NSURLSessionDataTask
 	func fetchObjects<T: Mappable>(type type: T.Type, path: String, method: HttpMethod, completion: Result<[T]>->Void) -> NSURLSessionDataTask
 }

SwiftInjectionExample/SwiftInjectionExample/Services/GithubHttpClient.swift

@@ -8,10 +8,16 @@
 
 import Foundation
 
-public class GithubHttpClient: HttpClient, GithubClient {
+public class GithubHttpClient: GithubClient {
+
+	private let client: Client
+
+	public init(client: Client) {
+		self.client = client
+	}
 
 	public func fetchRepos(user user: String, completion: Result<[Repository]>->Void) -> NSURLSessionTask {
-		return fetchObjects(type: Repository.self, path: "users/\(user)/repos", method: .Get, completion: completion)
+		return client.fetchObjects(type: Repository.self, path: "users/\(user)/repos", method: .Get, completion: completion)
 	}
 
 }