allow fetching from HCD

HardcoreData/DataStack+Transaction.swift

@@ -10,7 +10,7 @@ import Foundation
 import CoreData
 
 
-// MARK: - DataStack+Transaction
+// MARK: - DataStack
 
 extension DataStack {
     

HardcoreData/DataStack.swift

@@ -254,7 +254,7 @@ public class DataStack: NSObject {
     
     // MARK: Internal
     
-    public let mainContext: NSManagedObjectContext
+    internal let mainContext: NSManagedObjectContext
     internal let transactionQueue: GCDQueue;
     
     

HardcoreData/DataTransaction+Querying.swift

@@ -27,10 +27,12 @@ import Foundation
 import CoreData
 
 
-// MARK: - DataTransaction+Querying
+// MARK: - DataTransaction
 
 extension DataTransaction {
     
+    // MARK: Public
+    
     public func fetchOne<T: NSManagedObject>(entity: T.Type, _ queryClauses: FetchClause...) -> T? {
         
         return self.context.fetchOne(entity, queryClauses)

HardcoreData/HardcoreData+Querying.swift

@@ -0,0 +1,63 @@
+//
+//  HardcoreData+Querying.swift
+//  HardcoreData
+//
+//  Copyright (c) 2015 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+// MARK: - HardcoreData
+
+extension HardcoreData {
+    
+    // MARK: Public
+    
+    public static func fetchOne<T: NSManagedObject>(entity: T.Type, _ queryClauses: FetchClause...) -> T? {
+        
+        return self.defaultStack.mainContext.fetchOne(entity, queryClauses)
+    }
+    
+    public static func fetchOne<T: NSManagedObject>(entity: T.Type, _ queryClauses: [FetchClause]) -> T? {
+        
+        return self.defaultStack.mainContext.fetchOne(entity, queryClauses)
+    }
+    
+    public static func fetchAll<T: NSManagedObject>(entity: T.Type, _ queryClauses: FetchClause...) -> [T]? {
+        
+        return self.defaultStack.mainContext.fetchAll(entity, queryClauses)
+    }
+    
+    public static func fetchAll<T: NSManagedObject>(entity: T.Type, _ queryClauses: [FetchClause]) -> [T]? {
+        
+        return self.defaultStack.mainContext.fetchAll(entity, queryClauses)
+    }
+    
+    public static func queryCount<T: NSManagedObject>(entity: T.Type, _ queryClauses: FetchClause...) -> Int {
+        
+        return self.defaultStack.mainContext.queryCount(entity, queryClauses)
+    }
+    
+    public static func queryCount<T: NSManagedObject>(entity: T.Type, _ queryClauses: [FetchClause]) -> Int {
+        
+        return self.defaultStack.mainContext.queryCount(entity, queryClauses)
+    }
+}

HardcoreData/HardcoreData+Transaction.swift

@@ -0,0 +1,55 @@
+//
+//  HardcoreData+Transaction.swift
+//  HardcoreData
+//
+//  Copyright (c) 2015 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+
+// MARK: - HardcoreData
+
+extension HardcoreData {
+    
+    // MARK: Public
+    
+    /**
+    Using the defaultStack, begins a transaction asynchronously where NSManagedObject creates, updates, and deletes can be made.
+    
+    :param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
+    */
+    public static func performTransaction(closure: (transaction: DataTransaction) -> Void) {
+        
+        self.defaultStack.performTransaction(closure)
+    }
+    
+    /**
+    Using the defaultStack, begins a transaction asynchronously where NSManagedObject creates, updates, and deletes can be made.
+    
+    :param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
+    :returns: a SaveResult value indicating success or failure, or nil if the transaction was not comitted synchronously
+    */
+    public static func performTransactionAndWait(closure: (transaction: DataTransaction) -> Void) -> SaveResult? {
+        
+        return self.defaultStack.performTransactionAndWait(closure)
+    }
+}

HardcoreData/HardcoreData.swift

@@ -114,28 +114,3 @@ public struct HardcoreData {
     
     private static var defaultStackInstance: DataStack?
 }
-
-
-extension HardcoreData {
-    
-    /**
-    Using the defaultStack, begins a transaction asynchronously where NSManagedObject creates, updates, and deletes can be made.
-    
-    :param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
-    */
-    public static func performTransaction(closure: (transaction: DataTransaction) -> Void) {
-        
-        self.defaultStack.performTransaction(closure)
-    }
-    
-    /**
-    Using the defaultStack, begins a transaction asynchronously where NSManagedObject creates, updates, and deletes can be made.
-    
-    :param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
-    :returns: a SaveResult value indicating success or failure, or nil if the transaction was not comitted synchronously
-    */
-    public static func performTransactionAndWait(closure: (transaction: DataTransaction) -> Void) -> SaveResult? {
-        
-        return self.defaultStack.performTransactionAndWait(closure)
-    }
-}

HardcoreData/NSManagedObjectContext+Querying.swift

@@ -27,10 +27,12 @@ import Foundation
 import CoreData
 
 
-// MARK: - NSManagedObjectContext+Querying
+// MARK: - NSManagedObjectContext
 
 extension NSManagedObjectContext {
     
+    // MARK: Public
+    
     public func fetchOne<T: NSManagedObject>(entity: T.Type, _ queryClauses: FetchClause...) -> T? {
         
         return self.fetchOne(entity, queryClauses)

HardcoreData/Where.swift

@@ -63,9 +63,9 @@ public struct Where: FetchClause {
         self.init(NSPredicate(value: value))
     }
     
-    public init(_ format: String, _ args: CVarArgType...) {
+    public init(_ format: String, _ args: NSObject...) {
         
-        self.init(NSPredicate(format: format, arguments: getVaList(args)))
+        self.init(NSPredicate(format: format, argumentArray: args))
     }
     
     public init(_ format: String, argumentArray: [AnyObject]?) {