Create protocols and implementations

mac-cain13 · mac-cain13 · commit 954db2bfd6b2 · 2016-01-12T10:18:36.000+01:00
To have more flexibility
diff --git a/Library/Core/FileResource.swift b/Library/Core/FileResource.swift
@@ -8,7 +8,19 @@
 
 import Foundation
 
-public struct FileResource {
+public protocol FileResourceType {
+
+  /// Bundle this file is in or nil for main bundle
+  var bundle: NSBundle? { get }
+
+  /// Name of the file file on disk
+  var name: String { get }
+
+  /// Extension of the file on disk
+  var pathExtension: String { get }
+}
+
+public struct FileResource: FileResourceType {
   /// Bundle this file is in or nil for main bundle
   public let bundle: NSBundle?
 
diff --git a/Library/Core/FontResource.swift b/Library/Core/FontResource.swift
@@ -8,9 +8,14 @@
 
 import Foundation
 
-public struct FontResource {
+public protocol FontResourceType {
   /// Name of the font
-  let fontName: String
+  var fontName: String { get }
+}
+
+public struct FontResource: FontResourceType {
+  /// Name of the font
+  public let fontName: String
 
   public init(fontName: String) {
     self.fontName = fontName
diff --git a/Library/Core/Identifier.swift b/Library/Core/Identifier.swift
@@ -9,12 +9,12 @@
 import Foundation
 
 /// Base protocol for all identifiers
-public protocol Identifier: CustomStringConvertible {
+public protocol IdentifierType: CustomStringConvertible {
   /// Identifier string
   var identifier: String { get }
 }
 
-extension Identifier {
+extension IdentifierType {
   /// CustomStringConvertible implementation, returns the identifier
   public var description: String {
     return identifier
diff --git a/Library/Core/ImageResource.swift b/Library/Core/ImageResource.swift
@@ -8,7 +8,16 @@
 
 import Foundation
 
-public struct ImageResource {
+public protocol ImageResourceType {
+
+  /// Bundle this image is in or nil for main bundle
+  var bundle: NSBundle? { get }
+
+  /// Name of the image
+  var name: String { get }
+}
+
+public struct ImageResource: ImageResourceType {
 
   /// Bundle this image is in or nil for main bundle
   public let bundle: NSBundle?
diff --git a/Library/Core/NibResource.swift b/Library/Core/NibResource.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 /// Represents a nib file on disk
-public protocol NibResource {
+public protocol NibResourceType {
 
   /// Bundle this nib is in or nil for main bundle
   var bundle: NSBundle? { get }
diff --git a/Library/Core/ReuseIdentifierProtocol.swift b/Library/Core/ReuseIdentifierProtocol.swift
@@ -9,13 +9,13 @@
 import Foundation
 
 /// Reuse identifier protocol
-public protocol ReuseIdentifierProtocol: Identifier {
+public protocol ReuseIdentifierType: IdentifierType {
   /// Type of this reuseable
   typealias ReusableType
 }
 
 /// Reuse identifier
-public struct ReuseIdentifier<Reusable>: ReuseIdentifierProtocol {
+public struct ReuseIdentifier<Reusable>: ReuseIdentifierType {
   /// Type of this reuseable
   public typealias ReusableType = Reusable
 
diff --git a/Library/Core/StoryboardResource.swift b/Library/Core/StoryboardResource.swift
@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 
-public protocol StoryboardResource {
+public protocol StoryboardResourceType {
 
   /// Bundle this storyboard is in or nil for main bundle
   var bundle: NSBundle? { get }
@@ -18,7 +18,7 @@ public protocol StoryboardResource {
   var name: String { get }
 }
 
-public protocol StoryboardResourceWithInitialController: StoryboardResource {
+public protocol StoryboardResourceWithInitialControllerType: StoryboardResourceType {
 
   /// Type of the inital controller
   typealias InitialController
diff --git a/Library/Core/StoryboardSegueIdentifierProtocol.swift b/Library/Core/StoryboardSegueIdentifierProtocol.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 /// Segue identifier protocol
-public protocol StoryboardSegueIdentifierProtocol: Identifier {
+public protocol StoryboardSegueIdentifierType: IdentifierType {
   /// Type of the segue itself
   typealias SegueType
 
@@ -21,7 +21,7 @@ public protocol StoryboardSegueIdentifierProtocol: Identifier {
 }
 
 /// Segue identifier
-public struct StoryboardSegueIdentifier<Segue, Source, Destination>: StoryboardSegueIdentifierProtocol {
+public struct StoryboardSegueIdentifier<Segue, Source, Destination>: StoryboardSegueIdentifierType {
   /// Type of the segue itself
   public typealias SegueType = Segue
 
@@ -45,7 +45,7 @@ public struct StoryboardSegueIdentifier<Segue, Source, Destination>: StoryboardS
 }
 
 /// Typed segue information
-public struct TypedStoryboardSegueInfo<Segue, Source, Destination>: StoryboardSegueIdentifierProtocol {
+public struct TypedStoryboardSegueInfo<Segue, Source, Destination>: StoryboardSegueIdentifierType {
   /// Type of the segue itself
   public typealias SegueType = Segue
 
diff --git a/Library/Foundation/NSBundle+FileResource.swift b/Library/Foundation/NSBundle+FileResource.swift
@@ -16,7 +16,7 @@ public extension NSBundle {
 
    - returns: The file URL for the resource file (R.file.*) or nil if the file could not be located.
    */
-  public func URLForResource(resource: FileResource) -> NSURL? {
+  public func URLForResource(resource: FileResourceType) -> NSURL? {
     return URLForResource(resource.name, withExtension: resource.pathExtension, subdirectory: nil, localization: nil)
   }
 
@@ -27,7 +27,7 @@ public extension NSBundle {
 
    - returns: The full pathname for the resource file (R.file.*) or nil if the file could not be located.
    */
-  public func pathForResource(resource: FileResource) -> String? {
+  public func pathForResource(resource: FileResourceType) -> String? {
     return pathForResource(resource.name, ofType: resource.pathExtension, inDirectory: nil, forLocalization: nil)
   }
 }
diff --git a/Library/UIKit/NibResource+UIKit.swift b/Library/UIKit/NibResource+UIKit.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public extension NibResource {
+public extension NibResourceType {
   /**
    Instantiate the nib to get the top-level objects from this nib
 
diff --git a/Library/UIKit/StoryboardResourceWithInitialController+UIKit.swift b/Library/UIKit/StoryboardResourceWithInitialController+UIKit.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public extension StoryboardResourceWithInitialController {
+public extension StoryboardResourceWithInitialControllerType {
   /**
    Instantiates and returns the initial view controller in the view controller graph.
 
diff --git a/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift b/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift
@@ -18,7 +18,7 @@ public extension UICollectionView {
    
    - returns: A subclass of UICollectionReusableView or nil if the cast fails.
   */
-  public func dequeueReusableCellWithReuseIdentifier<Identifier: ReuseIdentifierProtocol where Identifier.ReusableType: UICollectionReusableView>(identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableCellWithReuseIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
     return dequeueReusableCellWithReuseIdentifier(identifier.identifier, forIndexPath: indexPath) as? Identifier.ReusableType
   }
 
@@ -31,7 +31,7 @@ public extension UICollectionView {
    
    - returns: A subclass of UICollectionReusableView or nil if the cast fails.
   */
-  public func dequeueReusableSupplementaryViewOfKind<Identifier: ReuseIdentifierProtocol where Identifier.ReusableType: UICollectionReusableView>(elementKind: String, withReuseIdentifier identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableSupplementaryViewOfKind<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(elementKind: String, withReuseIdentifier identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
     return dequeueReusableSupplementaryViewOfKind(elementKind, withReuseIdentifier: identifier.identifier, forIndexPath: indexPath) as? Identifier.ReusableType
   }
 
@@ -40,7 +40,7 @@ public extension UICollectionView {
 
    - parameter nibResources: An array of nib resources (R.nib.*) each containing a object of type UICollectionViewCell that has a reuse identifier
    */
-  public func registerNibs<Resource: NibResource where Resource: ReuseIdentifierProtocol, Resource.ReusableType: UICollectionViewCell>(nibResources: [Resource]) {
+  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(nibResources: [Resource]) {
     nibResources.forEach(registerNib)
   }
 
@@ -49,7 +49,7 @@ public extension UICollectionView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a object of type UICollectionViewCell that has a reuse identifier
    */
-  public func registerNib<Resource: NibResource where Resource: ReuseIdentifierProtocol, Resource.ReusableType: UICollectionViewCell>(nibResource: Resource) {
+  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(nibResource: Resource) {
     registerNib(UINib(resource: nibResource), forCellWithReuseIdentifier: nibResource.identifier)
   }
 
@@ -58,7 +58,7 @@ public extension UICollectionView {
 
    - parameter nibResources: An array of nib resources (R.nib.*) each containing a object of type UICollectionReusableView. that has a reuse identifier
    */
-  public func registerNibs<Resource: NibResource where Resource: ReuseIdentifierProtocol, Resource.ReusableType: UICollectionReusableView>(nibResources: [Resource], forSupplementaryViewOfKind kind: String) {
+  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(nibResources: [Resource], forSupplementaryViewOfKind kind: String) {
     nibResources.forEach { self.registerNib($0, forSupplementaryViewOfKind: kind) }
   }
 
@@ -67,7 +67,7 @@ public extension UICollectionView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a object of type UICollectionReusableView. that has a reuse identifier
    */
-  public func registerNib<Resource: NibResource where Resource: ReuseIdentifierProtocol, Resource.ReusableType: UICollectionReusableView>(nibResource: Resource, forSupplementaryViewOfKind kind: String) {
+  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(nibResource: Resource, forSupplementaryViewOfKind kind: String) {
     registerNib(UINib(resource: nibResource), forSupplementaryViewOfKind: kind, withReuseIdentifier: nibResource.identifier)
   }
 }
diff --git a/Library/UIKit/UIFont+FontResource.swift b/Library/UIKit/UIFont+FontResource.swift
@@ -17,7 +17,7 @@ public extension UIFont {
 
    - returns: A font object of the specified font resource and size.
    */
-  public convenience init?(resource: FontResource, size: CGFloat) {
+  public convenience init?(resource: FontResourceType, size: CGFloat) {
     self.init(name: resource.fontName, size: size)
   }
 }
diff --git a/Library/UIKit/UIImage+ImageResource.swift b/Library/UIKit/UIImage+ImageResource.swift
@@ -17,7 +17,7 @@ public extension UIImage {
 
    - returns: An image that exactly or best matches the desired traits with the given resource (R.image.*), or nil if no suitable image was found.
   */
-  public convenience init?(resource: ImageResource, compatibleWithTraitCollection traitCollection: UITraitCollection? = nil) {
+  public convenience init?(resource: ImageResourceType, compatibleWithTraitCollection traitCollection: UITraitCollection? = nil) {
     self.init(named: resource.name, inBundle: resource.bundle, compatibleWithTraitCollection: traitCollection)
   }
 }
diff --git a/Library/UIKit/UINib+NibResource.swift b/Library/UIKit/UINib+NibResource.swift
@@ -16,7 +16,7 @@ public extension UINib {
 
    - returns: The initialized UINib object. An exception is thrown if there were errors during initialization or the nib file could not be located.
    */
-  public convenience init(resource: NibResource) {
+  public convenience init(resource: NibResourceType) {
     self.init(nibName: resource.name, bundle: resource.bundle)
   }
 }
diff --git a/Library/UIKit/UIStoryboard+StoryboardResource.swift b/Library/UIKit/UIStoryboard+StoryboardResource.swift
@@ -16,7 +16,7 @@ public extension UIStoryboard {
 
    - returns: A storyboard object for the specified file. If no storyboard resource file matching name exists, an exception is thrown with description: `Could not find a storyboard named 'XXXXXX' in bundle....`
    */
-  public convenience init(resource: StoryboardResource) {
+  public convenience init(resource: StoryboardResourceType) {
     self.init(name: resource.name, bundle: resource.bundle)
   }
 }
diff --git a/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift b/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift
@@ -20,7 +20,7 @@ public extension UITableView {
    
    - precondition: You must register a class or nib file using the registerNib: or registerClass:forCellReuseIdentifier: method before calling this method.
   */
-  public func dequeueReusableCellWithIdentifier<Identifier: ReuseIdentifierProtocol where Identifier.ReusableType: UITableViewCell>(identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableCellWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
     return dequeueReusableCellWithIdentifier(identifier.identifier, forIndexPath: indexPath) as? Identifier.ReusableType
   }
 
@@ -33,7 +33,7 @@ public extension UITableView {
 
    - precondition: You must register a class or nib file using the registerNib: or registerClass:forCellReuseIdentifier: method before calling this method.
    */
-  public func dequeueReusableCellWithIdentifier<Identifier: ReuseIdentifierProtocol where Identifier.ReusableType: UITableViewCell>(identifier: Identifier) -> Identifier.ReusableType? {
+  public func dequeueReusableCellWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(identifier: Identifier) -> Identifier.ReusableType? {
     return dequeueReusableCellWithIdentifier(identifier.identifier) as? Identifier.ReusableType
   }
 
@@ -44,7 +44,7 @@ public extension UITableView {
    
    - returns: A UITableViewHeaderFooterView object with the associated identifier or nil if no such object exists in the reusable view queue or if it couldn't be cast correctly.
    */
-  public func dequeueReusableHeaderFooterViewWithIdentifier<Identifier: ReuseIdentifierProtocol where Identifier.ReusableType: UITableViewCell>(identifier: Identifier) -> Identifier.ReusableType? {
+  public func dequeueReusableHeaderFooterViewWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(identifier: Identifier) -> Identifier.ReusableType? {
     return dequeueReusableHeaderFooterViewWithIdentifier(identifier.identifier) as? Identifier.ReusableType
   }
 
@@ -53,7 +53,7 @@ public extension UITableView {
 
    - parameter nibResources: Array of nib resources (R.nib.*) each containing a table view cell that has a reuse identifier
    */
-  public func registerNibs<Resource: NibResource where Resource: ReuseIdentifierProtocol, Resource.ReusableType: UITableViewCell>(nibResources: [Resource]) {
+  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(nibResources: [Resource]) {
     nibResources.forEach(registerNib)
   }
 
@@ -62,7 +62,7 @@ public extension UITableView {
    
    - parameter nibResource: A nib resource (R.nib.*) containing a table view cell that has a reuse identifier
   */
-  public func registerNib<Resource: NibResource where Resource: ReuseIdentifierProtocol, Resource.ReusableType: UITableViewCell>(nibResource: Resource) {
+  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(nibResource: Resource) {
     registerNib(UINib(resource: nibResource), forCellReuseIdentifier: nibResource.identifier)
   }
 
@@ -71,7 +71,7 @@ public extension UITableView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a view that has a reuse identifier
    */
-  public func registerNibForHeaderFooterView<Resource: NibResource where Resource: ReuseIdentifierProtocol, Resource.ReusableType: UIView>(nibResource: Resource) {
+  public func registerNibForHeaderFooterView<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UIView>(nibResource: Resource) {
     registerNib(UINib(resource: nibResource), forHeaderFooterViewReuseIdentifier: nibResource.identifier)
   }
 }
diff --git a/Library/UIKit/UIViewController+NibResource.swift b/Library/UIKit/UIViewController+NibResource.swift
@@ -17,7 +17,7 @@ public extension UIViewController {
    
    - returns: A newly initialized UIViewController object.
   */
-  public convenience init(nib: NibResource) {
+  public convenience init(nib: NibResourceType) {
     self.init(nibName: nib.name, bundle: nib.bundle)
   }
 }
diff --git a/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift b/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift
@@ -18,7 +18,7 @@ public extension UIViewController {
    
    - SeeAlso: Library for typed block based segues: https://github.com/tomlokhorst/SegueManager
   */
-  public func performSegueWithIdentifier<Identifier: StoryboardSegueIdentifierProtocol>(identifier: Identifier, sender: AnyObject?) {
+  public func performSegueWithIdentifier<Identifier: StoryboardSegueIdentifierType>(identifier: Identifier, sender: AnyObject?) {
     performSegueWithIdentifier(identifier.identifier, sender: sender)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public extension NSBundle {`
`16`	`16`
`17`	`17`	`- returns: The file URL for the resource file (R.file.*) or nil if the file could not be located.`
`18`	`18`	`*/`
`19`		`- public func URLForResource(resource: FileResource) -> NSURL? {`
	`19`	`+ public func URLForResource(resource: FileResourceType) -> NSURL? {`
`20`	`20`	`return URLForResource(resource.name, withExtension: resource.pathExtension, subdirectory: nil, localization: nil)`
`21`	`21`	`}`
`22`	`22`
`@@ -27,7 +27,7 @@ public extension NSBundle {`
`27`	`27`
`28`	`28`	`- returns: The full pathname for the resource file (R.file.*) or nil if the file could not be located.`
`29`	`29`	`*/`
`30`		`- public func pathForResource(resource: FileResource) -> String? {`
	`30`	`+ public func pathForResource(resource: FileResourceType) -> String? {`
`31`	`31`	`return pathForResource(resource.name, ofType: resource.pathExtension, inDirectory: nil, forLocalization: nil)`
`32`	`32`	`}`
`33`	`33`	`}`