Merge pull request #87 from twobitlabs/add-count

Add count() method to entities and optimize Core Data implementation

library/Core/Protocols/SugarRecordContextProtocol.swift

@@ -49,4 +49,9 @@ public protocol SugarRecordContext
     *  Executes the finder query to return filtered values
     */
     func find(finder: SugarRecordFinder) -> [AnyObject]
+
+    /**
+    *  Count the number of entities of the given type
+    */
+    func count(objectClass: AnyClass, predicate: NSPredicate?) -> Int
 }

library/Core/Protocols/SugarRecordObjectProtocol.swift

@@ -71,6 +71,14 @@ public protocol SugarRecordObjectProtocol
     class func all() -> SugarRecordFinder
 
 
+    //MARK: - Count
+
+    /**
+    *  Returns the count of items of the class type
+    */
+    class func count() -> Int
+
+
     //MARK: - Deletion
 
     /**

library/Core/SugarRecordFinder.swift

@@ -397,13 +397,11 @@ public class SugarRecordFinder
     */
     public func count() -> Int
     {
-        let objects: [AnyObject]? = find()
-        if objects != nil {
-            return objects!.count
-        }
-        else {
-            return 0
-        }
+        var count: Int = 0
+        SugarRecord.operation(stackType!, closure: { (context) -> () in
+            count = context.count(self.objectClass!, predicate: self.predicate)
+        })
+        return count
     }
 
     /**
@@ -415,12 +413,6 @@ public class SugarRecordFinder
     */
     public func count(inContext context:SugarRecordContext) -> Int
     {
-        let objects: [AnyObject]? = find(inContext: context)
-        if objects != nil {
-            return objects!.count
-        }
-        else {
-            return 0
-        }
+        return context.count(self.objectClass!, predicate: self.predicate)
     }
 }

library/CoreData/Base/NSManagedObject+SugarRecord.swift

@@ -165,6 +165,21 @@ extension NSManagedObject: SugarRecordObjectProtocol
         return finder
     }
 
+    //MARK: - Count
+
+    /**
+    Returns a the count of elements of this type
+    
+    :returns: Int
+    */
+    public class func count() -> Int
+    {
+        var finder: SugarRecordFinder = SugarRecordFinder()
+        finder.objectClass = self
+        finder.stackType = stackType()
+        return finder.count()
+    }
+
     //MARK: - Deletion
 
     /**

library/CoreData/Base/SugarRecordCDContext.swift

@@ -172,6 +172,20 @@ public class SugarRecordCDContext: SugarRecordContext
         SugarRecordLogger.logLevelInfo.log("Deleted \(objects.count) objects")
     }
 
+    /**
+    *  Count the number of entities of the given type
+    */
+    public func count(objectClass: AnyClass, predicate: NSPredicate? = nil) -> Int
+    {
+        let managedObjectClass: NSManagedObject.Type = objectClass as NSManagedObject.Type
+        let fetchRequest: NSFetchRequest = NSFetchRequest(entityName: managedObjectClass.modelName())
+        fetchRequest.predicate = predicate
+        var error: NSError?
+        var count = self.contextCD.countForFetchRequest(fetchRequest, error: &error)
+        SugarRecordLogger.logLevelInfo.log("Found \(count) objects in database")
+        return count
+    }
+
 
     //MARK: - HELPER METHODS
 

library/Realm/RLMObject+SugarRecord.swift

@@ -167,6 +167,17 @@ extension RLMObject: SugarRecordObjectProtocol
     }
 
 
+    //MARK: - Count
+
+    /**
+    *  Returns the count of items of the class type
+    */
+    public class func count() -> Int
+    {
+        return all().count()
+    }
+
+
     //MARK: - Deletion
 
     /**

library/Realm/SugarRecordRLMContext.swift

@@ -166,4 +166,22 @@ public class SugarRecordRLMContext: SugarRecordContext
         }
         SugarRecordLogger.logLevelInfo.log("Deleted \(objects.count) objects")
     }
+
+
+    /**
+    *  Count the number of entities of the given type
+    */
+    public func count(objectClass: AnyClass, predicate: NSPredicate? = nil) -> Int
+    {
+        let objectClass: RLMObject.Type = objectClass as RLMObject.Type
+        var objects: RLMResults? = nil
+        if predicate != nil {
+            objects = objectClass.objectsWithPredicate(predicate)
+        }
+        else {
+            objects = objectClass.allObjectsInRealm(self.realmContext)
+        }
+        return Int(objects!.count)
+    }
+
 }

spec/Models/CoreDataObjectTests.swift

@@ -143,7 +143,8 @@ class CoreDataObjectTests: XCTestCase
         coreDataObject2!.city = "TestCity2"
         coreDataObject2!.birth = NSDate()
         let saved2: Bool = coreDataObject2!.save()
-        XCTAssertEqual(CoreDataObject.all().count(), 2, "The count should be equal to 2")
+        XCTAssertEqual(CoreDataObject.count(), 2, "The count should be equal to 2")
+        XCTAssertEqual(CoreDataObject.by("name", equalTo: "'Realmy2'").count(), 1, "The count should be equal to 1")
         coreDataObject!.beginWriting().delete().endWriting()
         coreDataObject2!.beginWriting().delete().endWriting()
     }

spec/Models/RealmObjectTests.swift

@@ -137,7 +137,8 @@ class RealmObjectTests: XCTestCase
         realmObject2!.city = "TestCity2"
         realmObject2!.birthday = NSDate()
         let saved2: Bool = realmObject2!.save()
-        XCTAssertEqual(RealmObject.all().count(), 2, "The count should be equal to 2")
+        XCTAssertEqual(RealmObject.count(), 2, "The count should be equal to 2")
+        XCTAssertEqual(RealmObject.by("name", equalTo: "'Realmy2'").count(), 1, "The count should be equal to 1")
         realmObject!.beginWriting().delete().endWriting()
         realmObject2!.beginWriting().delete().endWriting()
     }