Merge branch 'release/1.0.1'

Author: bbriatte

CHANGELOG.md

@@ -4,3 +4,9 @@ All notable changes to this project will be documented in this file.
 `dependency-injector-object-mapper-swift` adheres to [Semantic Versioning](http://semver.org/).
 
 ---
+
+## [1.0.1](https://github.com/Digipolitan/dependency-injector-object-mapper-swift/releases/tag/v1.0.1)
+
+update providers + update tests
+
+---

DependencyInjectorObjectMapper.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name = "DependencyInjectorObjectMapper"
-s.version = "1.0.0"
+s.version = "1.0.1"
 s.summary = "Add Mappable support with dependency injection"
 s.homepage = "https://github.com/Digipolitan/dependency-injector-object-mapper-swift"
 s.authors = "Digipolitan"

DependencyInjectorObjectMapper.xcodeproj/project.pbxproj

@@ -21,6 +21,9 @@
 		A38EF2CA1DECF97000637484 /* DependencyInjectorObjectMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A38EF2C71DECF97000637484 /* DependencyInjectorObjectMapperTests.swift */; };
 		A38EF2CB1DECF97000637484 /* DependencyInjectorObjectMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A38EF2C71DECF97000637484 /* DependencyInjectorObjectMapperTests.swift */; };
 		A38EF2CC1DECF97000637484 /* DependencyInjectorObjectMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A38EF2C71DECF97000637484 /* DependencyInjectorObjectMapperTests.swift */; };
+		A3924B971F55A32400CBA3CD /* Map+DependencyInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3B8AA571F4ECE830086EFC2 /* Map+DependencyInjector.swift */; };
+		A3924B981F55A32400CBA3CD /* Map+DependencyInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3B8AA571F4ECE830086EFC2 /* Map+DependencyInjector.swift */; };
+		A3924B991F55A32500CBA3CD /* Map+DependencyInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3B8AA571F4ECE830086EFC2 /* Map+DependencyInjector.swift */; };
 		A3B8AA371F4DCBB90086EFC2 /* Binder+ObjectMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3B8AA341F4DCBB90086EFC2 /* Binder+ObjectMapper.swift */; };
 		A3B8AA381F4DCBB90086EFC2 /* Binder+ObjectMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3B8AA341F4DCBB90086EFC2 /* Binder+ObjectMapper.swift */; };
 		A3B8AA391F4DCBB90086EFC2 /* Binder+ObjectMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3B8AA341F4DCBB90086EFC2 /* Binder+ObjectMapper.swift */; };
@@ -971,6 +974,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A3B8AA381F4DCBB90086EFC2 /* Binder+ObjectMapper.swift in Sources */,
+				A3924B971F55A32400CBA3CD /* Map+DependencyInjector.swift in Sources */,
 				A3B8AA3C1F4DCBB90086EFC2 /* InjectorTransformer.swift in Sources */,
 				A3B8AA401F4DCBB90086EFC2 /* Provider+ObjectMapper.swift in Sources */,
 			);
@@ -981,6 +985,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A3B8AA391F4DCBB90086EFC2 /* Binder+ObjectMapper.swift in Sources */,
+				A3924B981F55A32400CBA3CD /* Map+DependencyInjector.swift in Sources */,
 				A3B8AA3D1F4DCBB90086EFC2 /* InjectorTransformer.swift in Sources */,
 				A3B8AA411F4DCBB90086EFC2 /* Provider+ObjectMapper.swift in Sources */,
 			);
@@ -1004,6 +1009,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A3B8AA3A1F4DCBB90086EFC2 /* Binder+ObjectMapper.swift in Sources */,
+				A3924B991F55A32500CBA3CD /* Map+DependencyInjector.swift in Sources */,
 				A3B8AA3E1F4DCBB90086EFC2 /* InjectorTransformer.swift in Sources */,
 				A3B8AA421F4DCBB90086EFC2 /* Provider+ObjectMapper.swift in Sources */,
 			);

README.md

@@ -2,9 +2,9 @@ DependencyInjector+ObjectMapper
 =================================
 
 [![Build Status](https://travis-ci.org/Digipolitan/dependency-injector-object-mapper-swift.svg?branch=master)](https://travis-ci.org/Digipolitan/dependency-injector-object-mapper-swift)
-[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/DependencyInjector_ObjectMapper.svg)](https://img.shields.io/cocoapods/v/DependencyInjector_ObjectMapper.svg)
+[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/DependencyInjectorObjectMapper.svg)](https://img.shields.io/cocoapods/v/DependencyInjectorObjectMapper.svg)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![Platform](https://img.shields.io/cocoapods/p/DependencyInjector_ObjectMapper.svg?style=flat)](http://cocoadocs.org/docsets/DependencyInjector_ObjectMapper)
+[![Platform](https://img.shields.io/cocoapods/p/DependencyInjectorObjectMapper.svg?style=flat)](http://cocoadocs.org/docsets/DependencyInjectorObjectMapper)
 [![Twitter](https://img.shields.io/badge/twitter-@Digipolitan-blue.svg?style=flat)](http://twitter.com/Digipolitan)
 
 Dependency injector Swift compatible with ObjectMapper
@@ -65,7 +65,7 @@ class UserModel: User, Mappable {
 
     public func mapping(map: Map) {
         self.id >>> map["id"]
-        self.created <- map["createdAt"]
+        self.created <- (map["createdAt"], DateTransform())
         self.address >>> map.inject("address", type: Address.self)
     }
 }

Sources/Info.plist

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

Sources/Provider+ObjectMapper.swift

@@ -19,22 +19,4 @@ public extension Provider {
             return nil
         }
     }
-
-    public convenience init(type: Mappable.Type) {
-        self.init { (_, arguments) -> T? in
-            if let res = type.init(map: Map(mappingType: .fromJSON, JSON: arguments ?? [:])) as? T {
-                return res
-            }
-            return nil
-        }
-    }
-
-    public convenience init(type: ImmutableMappable.Type) {
-        self.init { (_, arguments) throws -> T? in
-            if let res = try type.init(map: Map(mappingType: .fromJSON, JSON: arguments ?? [:])) as? T {
-                return res
-            }
-            return nil
-        }
-    }
 }

Tests/DependencyInjectorObjectMapperTests/DependencyInjectorObjectMapperTests.swift

@@ -29,6 +29,16 @@ class DependencyInjectorObjectMapperTests: XCTestCase {
         XCTAssertNotNil(user?.addresses)
     }
 
+    func testInitWithTransformer() {
+        let injector = Injector.default
+        let date = Date()
+        let user = try? injector.inject(User.self, arguments: [
+            "id": "1",
+            "createdAt": date.timeIntervalSince1970
+            ])
+        XCTAssertEqual(user?.created?.timeIntervalSince1970, date.timeIntervalSince1970)
+    }
+
     func testReverseTransformInjectNestedObject() {
         let injector = Injector.default
         let dict: [String: Any] = [

Tests/DependencyInjectorObjectMapperTests/UserModel.swift

@@ -22,17 +22,16 @@ class UserModel: User, Mappable {
 
     public required init?(map: Map) {
         guard
-            let id: String = try? map.value("id"),
-            let addresses: [Address] = try? map.injectedValue("addresses", type: Address.self) else {
+            let id: String = try? map.value("id") else {
                 return nil
         }
         self.id = id
-        self.addresses = addresses
+        self.addresses = (try? map.injectedValue("addresses", type: Address.self)) ?? []
     }
 
     public func mapping(map: Map) {
         self.id >>> map["id"]
-        self.created <- map["createdAt"]
+        self.created <- (map["createdAt"], DateTransform())
         self.addresses >>> map.inject("addresses", type: Address.self)
     }
 }

Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>