Remove singleton to RealmManageable

k-lpmg · Aug 3, 2018 · 85b7b74 · 85b7b74
1 parent bdfd057
commit 85b7b74
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git a/Example/Sources/DBManagers/InMemoryRealmManager.swift b/Example/Sources/DBManagers/InMemoryRealmManager.swift
@@ -3,8 +3,6 @@ import RealmWrapper
 
 final class InMemoryRealmManager: RealmManageable {
 
-    static var shared: InMemoryRealmManager = InMemoryRealmManager()
-
     var isUseInMemory: Bool {
         return true
     }

diff --git a/Example/Sources/DBManagers/UserRealmManager.swift b/Example/Sources/DBManagers/UserRealmManager.swift
@@ -3,8 +3,6 @@ import RealmWrapper
 
 final class UserRealmManager: RealmManageable {
 
-    static var shared: UserRealmManager = UserRealmManager()
-
     var isUseInMemory: Bool {
         return false
     }

diff --git a/Example/Sources/DBProxies/InMemoryRealmProxy.swift b/Example/Sources/DBProxies/InMemoryRealmProxy.swift
@@ -11,21 +11,21 @@ struct UserInMemoryRealmProxy<RealmManager: InMemoryRealmManager>: RealmProxiabl
     // MARK: Methods
 
     func append(_ user: User) {
-        realmManager().transaction(writeHandler: { (realm) in
+        rm.transaction(writeHandler: { (realm) in
             realm.add(user, update: true)
         })
     }
 
     func delete(_ user: User) {
-        realmManager().transaction(writeHandler: { (realm) in
+        rm.transaction(writeHandler: { (realm) in
             realm.delete(user)
         })
     }
 
     func updateName(id: String, name: String, age: Int) {
         guard let user = userFromId(id) else {return}
 
-        realmManager().transaction(writeHandler: { (realm) in
+        rm.transaction(writeHandler: { (realm) in
             user.name = name
             user.age = age
             realm.add(user, update: true)

diff --git a/Example/Sources/DBProxies/UserRealmProxy.swift b/Example/Sources/DBProxies/UserRealmProxy.swift
@@ -11,27 +11,27 @@ struct UserRealmProxy<RealmManager: UserRealmManager>: RealmProxiable {
     // MARK: Methods
 
     func append(_ user: User) {
-        realmManager().transaction(writeHandler: { (realm) in
+        rm.transaction(writeHandler: { (realm) in
             realm.add(user, update: true)
         })
     }
 
     func delete(_ user: User) {
-        realmManager().transaction(writeHandler: { (realm) in
+        rm.transaction(writeHandler: { (realm) in
             realm.delete(user)
         })
     }
 
     func deleteAll() {
-        realmManager().transaction(writeHandler: { (realm) in
+        rm.transaction(writeHandler: { (realm) in
             realm.delete(self.users.results)
         })
     }
 
     func updateName(id: String, name: String, age: Int) {
         guard let user = userFromId(id) else {return}
 
-        realmManager().transaction(writeHandler: { (realm) in
+        rm.transaction(writeHandler: { (realm) in
             user.name = name
             user.age = age
             realm.add(user, update: true)

diff --git a/Sources/RealmManageable.swift b/Sources/RealmManageable.swift
@@ -10,10 +10,6 @@ public enum OrderingType {
 
 public protocol RealmManageable {
 
-    // MARK: - Constants
-
-    static var shared: Self { get }
-
     // MARK: - Properties
 
     var deleteRealmIfMigrationNeeded: Bool { get }
@@ -28,6 +24,10 @@ public protocol RealmManageable {
     var syncConfiguration: SyncConfiguration? { get }
     var objectTypes: [Object.Type]? { get }
 
+    // MARK: - Constructor
+
+    init()
+
 }
 
 public extension RealmManageable {
@@ -66,17 +66,17 @@ public extension RealmManageable {
         return nil
     }
 
-    // MARK: - Internal methods
+    // MARK: - Public methods
 
-    func clear(writeQueue: DispatchQueue = Self.defaultQueue, isSync: Bool = true, completion: RealmCompletionHandler? = nil) {
+    public func clear(writeQueue: DispatchQueue = Self.defaultQueue, isSync: Bool = true, completion: RealmCompletionHandler? = nil) {
         transaction(writeQueue: writeQueue, isSync: isSync, writeHandler: { (realm) in
             realm.deleteAll()
         }) { (realm, error) in
             completion?(realm, error)
         }
     }
 
-    func createConfiguration() -> Realm.Configuration {
+    public func createConfiguration() -> Realm.Configuration {
         var config = Realm.Configuration()
         config.schemaVersion = schemaVersion
         config.migrationBlock = migrationBlock
@@ -100,7 +100,7 @@ public extension RealmManageable {
         return config
     }
 
-    func transaction(writeQueue: DispatchQueue = Self.defaultQueue, isSync: Bool = true, writeHandler: @escaping RealmWriteHandler, completionQueue: DispatchQueue = DispatchQueue.main, completion: RealmCompletionHandler? = nil) {
+    public func transaction(writeQueue: DispatchQueue = Self.defaultQueue, isSync: Bool = true, writeHandler: @escaping RealmWriteHandler, completionQueue: DispatchQueue = DispatchQueue.main, completion: RealmCompletionHandler? = nil) {
         guard isSync else {
             writeQueue.async {
                 self.perform(writeHandler: writeHandler, completionQueue: completionQueue, completion: completion)

diff --git a/Sources/RealmProxiable.swift b/Sources/RealmProxiable.swift
@@ -2,16 +2,17 @@ import RealmSwift
 
 public protocol RealmProxiable {
     associatedtype RealmManager where RealmManager: RealmManageable
+    var rm: RealmManager { get }
 }
 
 public extension RealmProxiable {
 
-    func realmManager() -> RealmManager {
-        return RealmManager.shared
+    var rm: RealmManager {
+        return RealmManager()
     }
 
     func query<T: Object>(_ type: T.Type = T.self, filter: String? = nil, sortProperty: String? = nil, ordering: OrderingType = .ascending) -> RealmQuery<T> {
-        let realm = try! Realm(configuration: realmManager().createConfiguration())
+        let realm = try! Realm(configuration: rm.createConfiguration())
         var results = realm.objects(type)
         if let filter = filter {
             results = results.filter(filter)