Create realmIdentifier on Realm to suply path

polqf · Jun 5, 2016 · 7fd770f · 7fd770f
1 parent 9ee0579
commit 7fd770f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/Example/RealmResultsController/ViewController.swift b/Example/RealmResultsController/ViewController.swift
@@ -12,19 +12,21 @@ import RealmSwift
 import RealmResultsController
 
 class ViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, RealmResultsControllerDelegate {
-    
+
     let tableView: UITableView = UITableView(frame: CGRectZero, style: .Grouped)
     var rrc: RealmResultsController<TaskModelObject, TaskObject>?
     var realm: Realm!
     let button: UIButton = UIButton()
-    
-    lazy var realmPath: String = {
+
+    lazy var realmConfiguration: Realm.Configuration = {
         guard let doc = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.DocumentDirectory,
-                        NSSearchPathDomainMask.UserDomainMask, true).first else { return "" }
+                                                            NSSearchPathDomainMask.UserDomainMask, true).first else {
+                                                                return Realm.Configuration.defaultConfiguration
+        }
         let custom = doc.stringByAppendingString("/example.realm")
-        return custom
+        return Realm.Configuration(fileURL: NSURL(string: custom))
     }()
-
+    
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
@@ -34,8 +36,8 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
         if let _ = NSClassFromString("XCTest") {
             return
         }
-    
-        realm = try! Realm(path: realmPath)
+
+        realm = try! Realm(configuration: realmConfiguration)
 
         try! realm.write {
             self.realm.deleteAll()
@@ -92,7 +94,7 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
         let queue: dispatch_queue_t = dispatch_queue_create("label", nil)
         dispatch_async(queue) {
             autoreleasepool {
-                let realm = try! Realm(path: self.realmPath)
+                let realm = try! Realm(configuration: self.realmConfiguration)
                 try! realm.write {
                     let task = TaskModelObject()
                     task.id = 12345
@@ -124,7 +126,7 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
         let queue: dispatch_queue_t = dispatch_queue_create("label", nil)
         dispatch_async(queue) {
             autoreleasepool {
-                let realm = try! Realm(path: self.realmPath)
+                let realm = try! Realm(configuration: self.realmConfiguration)
                 try! realm.write {
                     let task = TaskModelObject()
                     task.id = Int(arc4random_uniform(9999))

diff --git a/Source/RealmExtension.swift b/Source/RealmExtension.swift
@@ -10,7 +10,18 @@ import Foundation
 import RealmSwift
 
 extension Realm {
-
+
+    var realmIdentifier: String {
+        var realmIdentifier = ""
+        if let fileURL = configuration.fileURL {
+            realmIdentifier = fileURL.absoluteString
+        }
+        else if let identifier = configuration.inMemoryIdentifier {
+            realmIdentifier = identifier
+        }
+        return realmIdentifier
+    }
+
     //MARK: Add
 
     /**

diff --git a/Source/RealmLogger.swift b/Source/RealmLogger.swift
@@ -47,8 +47,14 @@ class RealmLogger {
     Then clean the current state.
     */
     func finishRealmTransaction() {
-        let name = realm.path.hasSuffix("testingRealm") ? "realmChangesTest" : "realmChanges"
-        NSNotificationCenter.defaultCenter().postNotificationName(name, object: [realm.path : temporary])
+        let realmIdentifier = realm.realmIdentifier
+        var notificationName = "realmChanges"
+
+        //For testing
+        if realmIdentifier == "testingRealm" { notificationName = "realmChangesTest" }
+
+        NSNotificationCenter.defaultCenter().postNotificationName(notificationName,
+                                                                  object: [realmIdentifier : temporary])
         postIndividualNotifications()
         cleanAll()
     }

diff --git a/Source/RealmResultsController.swift b/Source/RealmResultsController.swift
@@ -278,8 +278,8 @@ public class RealmResultsController<T: RealmSwift.Object, U> : RealmResultsCache
 
     @objc func didReceiveRealmChanges(notification: NSNotification) {
         guard case let notificationObject as [String : [RealmChange]] = notification.object
-            where notificationObject.keys.first == request.realm.path,
-            let objects = notificationObject[self.request.realm.path] else { return }
+            where notificationObject.keys.first == request.realm.realmIdentifier,
+            let objects = notificationObject[self.request.realm.realmIdentifier] else { return }
         queueManager.addOperation {
             self.refetchObjects(objects)
             self.finishWriteTransaction()