Merge pull request #78 from cdzombak/cdz/separate-protocols

Minor reorganizations in YapDatabaseExtensions.swift

YapDatabaseExtensions/Shared/YapDatabaseExtensions.swift

@@ -252,6 +252,18 @@ extension Persistable {
     }
 }
 
+// MARK: Functions
+
+public func keyForPersistable<P: Persistable>(persistable: P) -> String {
+    return persistable.key
+}
+
+public func indexForPersistable<P: Persistable>(persistable: P) -> YapDB.Index {
+    return persistable.index
+}
+
+// MARK: -
+
 /// A facade interface for a read transaction.
 public protocol ReadTransactionType {
 
@@ -555,14 +567,11 @@ extension YapDatabase: DatabaseType {
     }
 }
 
+// MARK: - YapDB.Index
 
-// MARK: Hashable etc
-
-extension YapDB.Index: CustomStringConvertible, Hashable {
+// MARK: Hashable & Equality
 
-    public var description: String {
-        return "\(collection):\(key)"
-    }
+extension YapDB.Index: Hashable {
 
     public var hashValue: Int {
         return description.hashValue
@@ -573,6 +582,15 @@ public func == (a: YapDB.Index, b: YapDB.Index) -> Bool {
     return (a.collection == b.collection) && (a.key == b.key)
 }
 
+// MARK: CustomStringConvertible
+
+extension YapDB.Index: CustomStringConvertible {
+
+    public var description: String {
+        return "\(collection):\(key)"
+    }
+}
+
 // MARK: ValueCoding
 
 extension YapDB.Index: ValueCoding {
@@ -600,20 +618,6 @@ public final class YapDBIndexCoder: NSObject, NSCoding, CodingType {
     }
 }
 
-
-
-
-
-// MARK: - Functions
-
-public func keyForPersistable<P: Persistable>(persistable: P) -> String {
-    return persistable.key
-}
-
-public func indexForPersistable<P: Persistable>(persistable: P) -> YapDB.Index {
-    return persistable.index
-}
-
 // MARK: - Deprecations
 
 @available(*, unavailable, renamed="Persistable")