Merge branch 'release/1.0.0'

Author: bbriatte

.gitignore

@@ -44,6 +44,7 @@ playground.xcworkspace
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 Pods/
+Podfile.lock
 
 # Carthage
 #

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode8.2
+osx_image: xcode8.3
 language: objective-c
 cache:
   - bundler
@@ -13,7 +13,7 @@ before_install:
   - gem install bundler
   - brew update
   - bundle install && brew bundle
-  - bundle exec pod repo update --silent
+  - bundle exec pod repo update
 script:
   - bundle exec fastlane run_tests
 after_success:

Podfile.lock

@@ -10,11 +10,15 @@ import ObjectMapper
 
 public extension Map {
 
-    public func injectedValue<BM>(_ key: String) throws -> BM {
-        return try self.value(key, using: InjectorTransformerRegistry.default.get(BM.self))
+    public func injectedValue<BM>(_ key: String, type: BM.Type) throws -> BM {
+        return try self.value(key, using: InjectorTransformerRegistry.default.get(type))
     }
 
-    public func inject<BM>(_ key: String) -> (Map, InjectorTransformer<BM>) {
-        return (self[key], InjectorTransformerRegistry.default.get(BM.self))
+    public func injectedValue<BM>(_ key: String, type: BM.Type) throws -> [BM] {
+        return try self.value(key, using: InjectorTransformerRegistry.default.get(type))
+    }
+
+    public func inject<BM>(_ key: String, type: BM.Type) -> (Map, InjectorTransformer<BM>) {
+        return (self[key], InjectorTransformerRegistry.default.get(type))
     }
 }

Sources/Map+DependencyInjector.swift

@@ -18,13 +18,15 @@ class DependencyInjectorObjectMapperTests: XCTestCase {
         let injector = Injector.default
         let user = try? injector.inject(User.self, arguments: [
             "id": "1",
-            "address": [
-                "street": "abc",
-                "zipCode": "75116",
-                "country": "France"
+            "addresses": [
+                [
+                    "street": "abc",
+                    "zipCode": "75116",
+                    "country": "France"
+                ]
             ]
         ])
-        XCTAssertNotNil(user?.address)
+        XCTAssertNotNil(user?.addresses)
     }
 
     func testReverseTransformInjectNestedObject() {
@@ -36,12 +38,14 @@ class DependencyInjectorObjectMapperTests: XCTestCase {
         ]
         let user = try? injector.inject(User.self, arguments: [
             "id": "1",
-            "address": dict
+            "addresses": [
+                dict
+            ]
         ])
-        guard let trans = user?.address.toJSON() else {
+        guard let addresses = user?.addresses else {
             XCTFail("The dictionary cannot be nil")
             return
         }
-        XCTAssertEqual(trans.map { $0.key }, dict.map { $0.key })
+        XCTAssertEqual(addresses[0].street, "abc")
     }
 }

Tests/DependencyInjectorObjectMapperTests/DependencyInjectorObjectMapperTests.swift

@@ -12,5 +12,5 @@ import ObjectMapper
 public protocol User: BaseMappable {
     var id: String { get set }
     var created: Date? { get set }
-    var address: Address { get set }
+    var addresses: [Address] { get set }
 }

Tests/DependencyInjectorObjectMapperTests/User.swift

@@ -13,25 +13,35 @@ import DependencyInjectorObjectMapper
 class UserModel: User, Mappable {
     public var id: String
     public var created: Date?
-    public var address: Address
+    public var addresses: [Address]
 
-    public init(id: String, address: Address) {
+    public init(id: String, addresses: [Address]) {
         self.id = id
-        self.address = address
+        self.addresses = addresses
     }
 
-    public convenience required init?(map: Map) {
+    public required init?(map: Map) {
         guard
             let id: String = try? map.value("id"),
-            let address: Address = try? map.injectedValue("address") else {
+            let addresses: [Address] = try? map.injectedValue("addresses", type: Address.self) else {
                 return nil
         }
-        self.init(id: id, address: address)
+        self.id = id
+        self.addresses = addresses
     }
 
     public func mapping(map: Map) {
         self.id >>> map["id"]
         self.created <- map["createdAt"]
-        self.address >>> map.inject("address")
+        self.addresses >>> map.inject("addresses", type: Address.self)
+    }
+}
+
+class Sample: UserModel {
+    public let sample: String
+
+    public required init?(map: Map) {
+        self.sample = ""
+        super.init(map: map)
     }
 }