Rename to more Swiftier names

Author: tomlokhorst

Diff for: Library/Core/FileResource.swift

@@ -41,7 +41,7 @@ public extension FileResourceType {
    - returns: The file URL for this resource or nil if the file could not be located.
    */
   func url() -> URL? {
-    return bundle.URLForResource(self)
+    return bundle.urlForResource(self)
   }
 }
 

Diff for: Library/Core/StoryboardSegueIdentifierProtocol.swift

@@ -44,7 +44,7 @@ public struct StoryboardSegueIdentifier<Segue, Source, Destination>: StoryboardS
   }
 
   /// Create a new StoryboardSegue based on the identifier and source view controller
-  public func storyboardSegueWithSource(_ sourceViewController: Source)
+  public func storyboardSegue(withSource sourceViewController: Source)
     -> StoryboardSegue<Segue, Source, Destination>
   {
     return StoryboardSegue(identifier: self, sourceViewController: sourceViewController)

Diff for: Library/Core/StoryboardViewControllerResource.swift

@@ -22,4 +22,3 @@ public struct StoryboardViewControllerResource<ViewController>: StoryboardViewCo
     self.identifier = identifier
   }
 }
-

Diff for: Library/Foundation/Bundle+FileResource.swift

@@ -16,7 +16,7 @@ public extension Bundle {
 
    - returns: The file URL for the resource file (R.file.*) or nil if the file could not be located.
    */
-  public func URLForResource(_ resource: FileResourceType) -> URL? {
+  public func urlForResource(_ resource: FileResourceType) -> URL? {
     return urlForResource(resource.name, withExtension: resource.pathExtension)
   }
 

Diff for: Library/UIKit/NibResource+UIKit.swift

@@ -18,7 +18,7 @@ public extension NibResourceType {
 
    - returns: An array containing the top-level objects from the NIB
    */
-  public func instantiateWithOwner(_ ownerOrNil: AnyObject?, options optionsOrNil: [NSObject : AnyObject]? = nil) -> [AnyObject] {
+  public func instantiate(withOwner ownerOrNil: AnyObject?, options optionsOrNil: [NSObject : AnyObject]? = [:]) -> [AnyObject] {
     return UINib(resource: self).instantiate(withOwner: ownerOrNil, options: optionsOrNil)
   }
 }

Diff for: Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift

@@ -15,7 +15,8 @@ extension TypedStoryboardSegueInfo {
 
    - returns: A newly initialized TypedStoryboardSegueInfo object or nil.
   */
-  public init?<SegueIdentifier: StoryboardSegueIdentifierType where SegueIdentifier.SegueType == Segue, SegueIdentifier.SourceType == Source, SegueIdentifier.DestinationType == Destination>(segueIdentifier: SegueIdentifier, segue: UIStoryboardSegue) {
+  public init?<SegueIdentifier: StoryboardSegueIdentifierType where SegueIdentifier.SegueType == Segue, SegueIdentifier.SourceType == Source, SegueIdentifier.DestinationType == Destination>(segueIdentifier: SegueIdentifier, segue: UIStoryboardSegue)
+  {
     guard let identifier = segue.identifier,
       let sourceViewController = segue.sourceViewController as? SegueIdentifier.SourceType,
       let destinationViewController = segue.destinationViewController as? SegueIdentifier.DestinationType,

Diff for: 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: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(_ identifier: Identifier, forIndexPath indexPath: IndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableCell<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(withReuseIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType? {
     return dequeueReusableCell(withReuseIdentifier: identifier.identifier, for: 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: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(_ elementKind: String, withReuseIdentifier identifier: Identifier, forIndexPath indexPath: IndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableSupplementaryView<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(ofKind elementKind: String, withReuseIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType? {
     return dequeueReusableSupplementaryView(ofKind: elementKind, withReuseIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
@@ -40,16 +40,16 @@ 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: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(_ nibResources: [Resource]) {
-    nibResources.forEach(registerNib)
+  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(_ nibResources: [Resource]) {
+    nibResources.forEach(register)
   }
 
   /**
    Register a R.nib.* for use in creating new collection view cells.
 
    - parameter nibResource: A nib resource (R.nib.*) containing a object of type UICollectionViewCell that has a reuse identifier
    */
-  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(_ nibResource: Resource) {
+  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(_ nibResource: Resource) {
     register(UINib(resource: nibResource), forCellWithReuseIdentifier: nibResource.identifier)
   }
 
@@ -58,16 +58,16 @@ 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: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(_ nibResources: [Resource], forSupplementaryViewOfKind kind: String) {
-    nibResources.forEach { self.registerNib($0, forSupplementaryViewOfKind: kind) }
+  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(_ nibResources: [Resource], forSupplementaryViewOfKind kind: String) {
+    nibResources.forEach { self.register($0, forSupplementaryViewOfKind: kind) }
   }
 
   /**
    Register a R.nib.* for use in creating supplementary views for the collection view.
 
    - parameter nibResource: A nib resource (R.nib.*) containing a object of type UICollectionReusableView. that has a reuse identifier
    */
-  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(_ nibResource: Resource, forSupplementaryViewOfKind kind: String) {
+  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(_ nibResource: Resource, forSupplementaryViewOfKind kind: String) {
     register(UINib(resource: nibResource), forSupplementaryViewOfKind: kind, withReuseIdentifier: nibResource.identifier)
   }
 }

Diff for: 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: ImageResourceType, compatibleWithTraitCollection traitCollection: UITraitCollection? = nil) {
+  public convenience init?(resource: ImageResourceType, compatibleWith traitCollection: UITraitCollection? = nil) {
     self.init(named: resource.name, in: resource.bundle, compatibleWith: traitCollection)
   }
 }

Diff for: Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift

@@ -17,7 +17,7 @@ public extension UIStoryboard {
 
    - returns: The view controller corresponding to the specified resource (R.storyboard.*.*). If no view controller is associated, this method throws an exception.
    */
-  public func instantiateViewController<ViewControllerResource: StoryboardViewControllerResourceType>(_ resource: ViewControllerResource) -> ViewControllerResource.ViewControllerType?  {
+  public func instantiateViewController<ViewControllerResource: StoryboardViewControllerResourceType>(withResource resource: ViewControllerResource) -> ViewControllerResource.ViewControllerType?  {
     return self.instantiateViewController(withIdentifier: resource.identifier) as? ViewControllerResource.ViewControllerType
   }
 }

Diff for: 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: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(_ identifier: Identifier, forIndexPath indexPath: IndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableCell<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(withIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType? {
     return dequeueReusableCell(withIdentifier: identifier.identifier, for: 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: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(_ identifier: Identifier) -> Identifier.ReusableType? {
+  public func dequeueReusableCell<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(withIdentifier identifier: Identifier) -> Identifier.ReusableType? {
     return dequeueReusableCell(withIdentifier: 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: ReuseIdentifierType where Identifier.ReusableType: UITableViewHeaderFooterView>(_ identifier: Identifier) -> Identifier.ReusableType? {
+  public func dequeueReusableHeaderFooterView<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewHeaderFooterView>(withIdentifier identifier: Identifier) -> Identifier.ReusableType? {
     return dequeueReusableHeaderFooterView(withIdentifier: identifier.identifier) as? Identifier.ReusableType
   }
 
@@ -53,16 +53,16 @@ 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: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(_ nibResources: [Resource]) {
-    nibResources.forEach(registerNib)
+  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(_ nibResources: [Resource]) {
+    nibResources.forEach(register)
   }
 
   /**
    Register a R.nib.* containing a cell with the table view under it's contained identifier.
 
    - parameter nibResource: A nib resource (R.nib.*) containing a table view cell that has a reuse identifier
   */
-  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(_ nibResource: Resource) {
+  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(_ nibResource: Resource) {
     register(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: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UIView>(_ nibResource: Resource) {
+  public func registerHeaderFooterView<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UIView>(_ nibResource: Resource) {
     register(UINib(resource: nibResource), forHeaderFooterViewReuseIdentifier: nibResource.identifier)
   }
 }

Diff for: Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift

@@ -10,7 +10,7 @@ import Foundation
 import UIKit
 
 public protocol SeguePerformerType {
-  func performSegueWithIdentifier(_ identifier: String, sender: AnyObject?)
+  func performSegue(withIdentifier identifier: String, sender: AnyObject?)
 }
 
 extension UIViewController: SeguePerformerType { }
@@ -22,10 +22,10 @@ public extension SeguePerformerType {
    - parameter sender: The object that you want to use to initiate the segue. This object is made available for informational purposes during the actual segue.
    - SeeAlso: Library for typed block based segues: [tomlokhorst/SegueManager](https://github.com/tomlokhorst/SegueManager)
    */
-  public func performSegueWithIdentifier<Segue, Destination>(
-    _ identifier: StoryboardSegueIdentifier<Segue, Self, Destination>,
+  public func performSegue<Segue, Destination>(
+    withIdentifier identifier: StoryboardSegueIdentifier<Segue, Self, Destination>,
     sender: AnyObject?) {
-    performSegueWithIdentifier(identifier.identifier, sender: sender)
+    performSegue(withIdentifier: identifier.identifier, sender: sender)
   }
 }
 
@@ -34,7 +34,7 @@ public extension StoryboardSegue where Source : UIViewController {
    Performs this segue on the source view controller
    - parameter sender: The object that you want to use to initiate the segue. This object is made available for informational purposes during the actual segue.
    */
-  public func performSegue(_ sender: AnyObject? = nil) {
+  public func performSegue(sender: AnyObject? = nil) {
     sourceViewController.performSegue(withIdentifier: identifier.identifier, sender: sender)
   }
 }