Merge branch 'release/2.0.0'

Author: bbriatte

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [2.0.0](https://github.com/Digipolitan/dependency-injector-swift/releases/tag/v2.0.0)
+
+Update all API
+Better syntax to register provider
+
+---
+
 ## [1.1.1](https://github.com/Digipolitan/dependency-injector-swift/releases/tag/v1.1.1)
 
 remove unused methods

DGDependencyInjector.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name = "DGDependencyInjector"
-s.version = "1.1.1"
+s.version = "2.0.0"
 s.summary = "Dependency injector made in pure swift"
 s.homepage = "https://github.com/Digipolitan/dependency-injector-swift"
 s.license = { :type => "BSD", :file => "LICENSE" }

DGDependencyInjector.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@ DGDependencyInjector
 [![Platform](https://img.shields.io/cocoapods/p/DGDependencyInjector.svg?style=flat)](http://cocoadocs.org/docsets/DGDependencyInjector)
 [![Twitter](https://img.shields.io/badge/twitter-@Digipolitan-blue.svg?style=flat)](http://twitter.com/Digipolitan)
 
-Dependency injector made in pure Swift. Compatible for swift server-side and swift for iOS
+Dependency injector Swift. Compatible for swift server-side and swift for iOS
 
 ## Installation
 
@@ -25,13 +25,11 @@ pod 'DGDependencyInjector'
 
 ## The Basics
 
-First you must create a DependencyModule and register some providers
+First you must create a Module and register some providers
 
 ```swift
-let module = DependencyModule()
-module.register(type: IAnimal.self) { _ in
-  return Dog(name: "Athina")
-}
+let module = Module()
+module.bind(IAnimal.self).to(Dog.self)
 ```
 
 IAnimal is a protocol that MUST be implemented by the Dog class
@@ -44,10 +42,14 @@ public protocol IAnimal {
     func scream() -> String
 }
 
-open class Dog: IAnimal {
+open class Dog: IAnimal, Injectable {
 
     public var name: String
 
+    public required convenience init(injector: Injector, arguments: [String : Any]?) throws {
+        self.init(name: arguments?["name"] as? String ?? "Athina")
+    }
+
     init(name: String) {
         self.name = name
     }
@@ -61,13 +63,13 @@ open class Dog: IAnimal {
 After that, you must register your module inside an injector
 
 ```swift
-DependencyInjector.shared.register(module: module)
+Injector.default.register(module: module)
 ```
 
 Finally, inject an IAnimal and retrieve a concrete class registered inside your module
 
 ```swift
-if let animal = DependencyInjector.shared.inject(type: IAnimal.self) {
+if let animal = try? Injector.default.inject(IAnimal.self) {
   print(animal.name) // print Athina
   print(animal.scream()) // print Barking
 }
@@ -80,37 +82,37 @@ if let animal = DependencyInjector.shared.inject(type: IAnimal.self) {
 Register a provider that handle arguments :
 
 ```swift
-let module = DependencyModule()
-module.register(type: IAnimal.self) { (_, arguments) -> IAnimal? in
+let module = Module()
+module.bind(IAnimal.self).with { (_, arguments) -> IAnimal? in
   if let name = arguments?["name"] as? String {
     return Dog(name: name)
   }
   return nil
 }
-DependencyInjector.shared.register(module: module)
+Injector.default.register(module: module)
 ```
 
 Inject an IAnimal with arguments Dictionary<String, Any> :
 
 ```swift
-if let animal = DependencyInjector.shared.inject(type: IAnimal.self, arguments: ["name": "Athina"]) {
+if let animal = Injector.default.inject(IAnimal.self, arguments: ["name": "Athina"]) {
   print(animal.name) // print Athina
   print(animal.scream()) // print Barking
 }
-if let otherAnimal = DependencyInjector.shared.inject(type: IAnimal.self, arguments: ["name": "Yoda"]) {
+if let otherAnimal = Injector.default.inject(IAnimal.self, arguments: ["name": "Yoda"]) {
   print(otherAnimal.name) // print Yoda
   print(otherAnimal.scream()) // print Barking
 }
 ```
 
-##Contributing
+## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for more details!
 
 This project adheres to the [Contributor Covenant Code of Conduct](CODE_OF_CONDUCT.md).
 By participating, you are expected to uphold this code. Please report
 unacceptable behavior to [contact@digipolitan.com](mailto:contact@digipolitan.com).
 
-##License
+## License
 
 DGDependencyInjector is licensed under the [BSD 3-Clause license](LICENSE).

README.md

@@ -0,0 +1,64 @@
+/**
+ * This class bind the real implementation behind an interface
+ * @author Benoit BRIATTE http://www.digipolitan.com
+ * @copyright 2017 Digipolitan. All rights reserved.
+ */
+public final class Binder<T> {
+
+    private var _singleton: Bool
+    private var _provider: Provider<T>?
+    private var _type: Injectable.Type?
+    private var _handler: Provider<T>.ProviderHandler?
+
+    public init() {
+        self._singleton = false
+    }
+
+    @discardableResult
+    public func to(_ type: Injectable.Type) -> Self {
+        self._type = type
+        return self
+    }
+
+    @discardableResult
+    public func to(_ object: T) -> Self {
+        return self.to(SingletonProvider(object: object))
+    }
+
+    @discardableResult
+    public func to(_ provider: Provider<T>) -> Self {
+        self._provider = provider
+        return self
+    }
+
+    @discardableResult
+    public func with(_ handler: @escaping Provider<T>.ProviderHandler) -> Self {
+        self._handler = handler
+        return self
+    }
+
+    @discardableResult
+    public func singleton() -> Self {
+        self._singleton = true
+        return self
+    }
+
+    func provider() -> Provider<T>? {
+        if self._provider == nil {
+            if self._singleton {
+                if let type = self._type {
+                    self._provider = SingletonProvider(type: type)
+                } else if let handler = self._handler {
+                    self._provider = SingletonProvider(handler: handler)
+                }
+            } else {
+                if let type = self._type {
+                    self._provider = Provider(type: type)
+                } else if let handler = self._handler {
+                    self._provider = Provider(handler: handler)
+                }
+            }
+        }
+        return self._provider
+    }
+}

Sources/Binder.swift

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSPrincipalClass</key>

Sources/DependencyModule.swift

@@ -0,0 +1,4 @@
+public protocol Injectable {
+
+    init(injector: Injector, arguments: [String: Any]?) throws
+}