Merge pull request #17 from mac-cain13/swift3

mac-cain13 · web-flow · commit 1c69fbc64b53 · 2016-08-24T13:20:53.000+02:00
Swift 3 + renames
diff --git a/Library/Core/FileResource.swift b/Library/Core/FileResource.swift
@@ -11,7 +11,7 @@ import Foundation
 public protocol FileResourceType {
 
   /// Bundle this file is in
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Name of the file file on disk
   var name: String { get }
@@ -23,7 +23,7 @@ public protocol FileResourceType {
 public extension FileResourceType {
   /// Name of the file on disk with the pathExtension
   var fullName: String {
-    return [name, pathExtension].joinWithSeparator(".")
+    return [name, pathExtension].joined(separator: ".")
   }
 
   /**
@@ -32,30 +32,30 @@ public extension FileResourceType {
    - returns: The full pathname for this resource or nil if the file could not be located.
    */
   func path() -> String? {
-    return bundle.pathForResource(self)
+    return bundle.path(forResource: self)
   }
 
   /**
    Returns the file URL for this resource.
 
    - returns: The file URL for this resource or nil if the file could not be located.
    */
-  func url() -> NSURL? {
-    return bundle.URLForResource(self)
+  func url() -> URL? {
+    return bundle.url(forResource: self)
   }
 }
 
 public struct FileResource: FileResourceType {
   /// Bundle this file is in
-  public let bundle: NSBundle
+  public let bundle: Bundle
 
   /// Name of the file on disk, without the pathExtension
   public let name: String
 
   /// Extension of the file on disk
   public let pathExtension: String
 
-  public init(bundle: NSBundle, name: String, pathExtension: String) {
+  public init(bundle: Bundle, name: String, pathExtension: String) {
     self.bundle = bundle
     self.name = name
     self.pathExtension = pathExtension
diff --git a/Library/Core/ImageResource.swift b/Library/Core/ImageResource.swift
@@ -11,7 +11,7 @@ import Foundation
 public protocol ImageResourceType {
 
   /// Bundle this image is in
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Name of the image
   var name: String { get }
@@ -20,12 +20,12 @@ public protocol ImageResourceType {
 public struct ImageResource: ImageResourceType {
 
   /// Bundle this image is in
-  public let bundle: NSBundle
+  public let bundle: Bundle
 
   /// Name of the image
   public let name: String
 
-  public init(bundle: NSBundle, name: String) {
+  public init(bundle: Bundle, name: String) {
     self.bundle = bundle
     self.name = name
   }
diff --git a/Library/Core/NibResource.swift b/Library/Core/NibResource.swift
@@ -12,7 +12,7 @@ import Foundation
 public protocol NibResourceType {
 
   /// Bundle this nib is in or nil for main bundle
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Name of the nib file on disk
   var name: String { get }
diff --git a/Library/Core/StoryboardResource.swift b/Library/Core/StoryboardResource.swift
@@ -11,7 +11,7 @@ import Foundation
 public protocol StoryboardResourceType {
 
   /// Bundle this storyboard is in
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Name of the storyboard file on disk
   var name: String { get }
diff --git a/Library/Core/StoryboardSegueIdentifierProtocol.swift b/Library/Core/StoryboardSegueIdentifierProtocol.swift
@@ -44,10 +44,10 @@ 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 source: Source)
     -> StoryboardSegue<Segue, Source, Destination>
   {
-    return StoryboardSegue(identifier: self, sourceViewController: sourceViewController)
+    return StoryboardSegue(identifier: self, source: source)
   }
 }
 
@@ -63,7 +63,7 @@ public struct TypedStoryboardSegueInfo<Segue, Source, Destination>: StoryboardSe
   public typealias DestinationType = Destination
 
   /// Segue destination view controller
-  public let destinationViewController: Destination
+  public let destination: Destination
 
   /// Segue identifier
   public let identifier: String
@@ -72,7 +72,7 @@ public struct TypedStoryboardSegueInfo<Segue, Source, Destination>: StoryboardSe
   public let segue: Segue
 
   /// Segue source view controller
-  public let sourceViewController: Source
+  public let source: Source
 }
 
 /// Segue with identifier and source view controller
@@ -81,15 +81,15 @@ public struct StoryboardSegue<Segue, Source, Destination> {
   public let identifier: StoryboardSegueIdentifier<Segue, Source, Destination>
 
   /// Segue source view controller
-  public let sourceViewController: Source
+  public let source: Source
 
   /**
    Create a new segue based on the identifier and source view controller
 
    - returns: A new StoryboardSegue
    */
-  public init(identifier: StoryboardSegueIdentifier<Segue, Source, Destination>, sourceViewController: Source) {
+  public init(identifier: StoryboardSegueIdentifier<Segue, Source, Destination>, source: Source) {
     self.identifier = identifier
-    self.sourceViewController = sourceViewController
+    self.source = source
   }
 }
diff --git a/Library/Core/StoryboardViewControllerResource.swift b/Library/Core/StoryboardViewControllerResource.swift
@@ -22,4 +22,3 @@ public struct StoryboardViewControllerResource<ViewController>: StoryboardViewCo
     self.identifier = identifier
   }
 }
-
diff --git a/Library/Core/StringResource.swift b/Library/Core/StringResource.swift
@@ -17,7 +17,7 @@ public protocol StringResourceType {
   var tableName: String { get }
 
   /// Bundle this string is in
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Locales of the a localizable string
   var locales: [String] { get }
@@ -35,15 +35,15 @@ public struct StringResource: StringResourceType {
   public let tableName: String
 
   /// Bundle this string is in
-  public let bundle: NSBundle
+  public let bundle: Bundle
 
   /// Locales of the a localizable string
   public let locales: [String]
   
   /// Comment directly before and/or after the string, if any
   public let comment: String?
 
-  public init(key: String, tableName: String, bundle: NSBundle, locales: [String], comment: String?) {
+  public init(key: String, tableName: String, bundle: Bundle, locales: [String], comment: String?) {
     self.key = key
     self.tableName = tableName
     self.bundle = bundle
diff --git a/Library/Core/Validatable.swift b/Library/Core/Validatable.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 /// Error thrown during validation
-public struct ValidationError: ErrorType, CustomStringConvertible {
+public struct ValidationError: Error, CustomStringConvertible {
   /// Human readable description
   public let description: String
 
@@ -35,11 +35,11 @@ extension Validatable {
     assert( theRealAssert() )
   }
 
-  private static func theRealAssert() -> Bool {
+  fileprivate static func theRealAssert() -> Bool {
     do {
       try validate()
     } catch {
-      assertionFailure("Validation of \(self.dynamicType) failed with error: \(error)")
+      assertionFailure("Validation of \(type(of: self)) failed with error: \(error)")
     }
 
     return true
diff --git a/Library/Foundation/Bundle+FileResource.swift b/Library/Foundation/Bundle+FileResource.swift
@@ -1,5 +1,5 @@
 //
-//  NSBundle+FileResource.swift
+//  Bundle+FileResource.swift
 //  R.swift.Library
 //
 //  Created by Mathijs Kadijk on 10-01-16.
@@ -8,16 +8,16 @@
 
 import Foundation
 
-public extension NSBundle {
+public extension Bundle {
   /**
    Returns the file URL for the given resource (R.file.*).
 
    - parameter resource: The resource to get the file URL for (R.file.*).
 
    - returns: The file URL for the resource file (R.file.*) or nil if the file could not be located.
    */
-  public func URLForResource(resource: FileResourceType) -> NSURL? {
-    return URLForResource(resource.name, withExtension: resource.pathExtension)
+  public func url(forResource resource: FileResourceType) -> URL? {
+    return url(forResource: resource.name, withExtension: resource.pathExtension)
   }
 
   /**
@@ -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: FileResourceType) -> String? {
-    return pathForResource(resource.name, ofType: resource.pathExtension)
+  public func path(forResource resource: FileResourceType) -> String? {
+    return path(forResource: resource.name, ofType: resource.pathExtension)
   }
 }
diff --git a/Library/Foundation/Data+FileResource.swift b/Library/Foundation/Data+FileResource.swift
@@ -1,5 +1,5 @@
 //
-//  NSData+FileResource.swift
+//  Data+FileResource.swift
 //  R.swift.Library
 //
 //  Created by Tom Lokhorst on 2016-03-11.
@@ -8,7 +8,9 @@
 
 import Foundation
 
-public extension NSData {
+public struct NoUrlForResourceError: Error {}
+
+public extension Data {
 
   /**
    Creates and returns NSData with the contents of the specified file resource (R.file.*).
@@ -17,8 +19,8 @@ public extension NSData {
 
    - returns: A NSData object with the contents of the specified file.
    */
-  public convenience init?(resource: FileResourceType) {
-    guard let url = resource.url() else { return nil }
-    self.init(contentsOfURL: url)
+  public init(resource: FileResourceType) throws {
+    guard let url = resource.url() else { throw NoUrlForResourceError() }
+    try self.init(contentsOf: url)
   }
 }
diff --git a/Library/UIKit/NibResource+UIKit.swift b/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] {
-    return UINib(resource: self).instantiateWithOwner(ownerOrNil, options: optionsOrNil)
+  public func instantiate(withOwner ownerOrNil: Any?, options optionsOrNil: [AnyHashable : Any]? = [:]) -> [Any] {
+    return UINib(resource: self).instantiate(withOwner: ownerOrNil, options: optionsOrNil)
   }
 }
diff --git a/Library/UIKit/StoryboardResourceWithInitialController+UIKit.swift b/Library/UIKit/StoryboardResourceWithInitialController+UIKit.swift
@@ -15,7 +15,7 @@ public extension StoryboardResourceWithInitialControllerType {
 
    - returns: The initial view controller in the storyboard.
    */
-  public func initialViewController() -> InitialController? {
+  public func instantiateInitialViewController() -> InitialController? {
     return UIStoryboard(resource: self).instantiateInitialViewController() as? InitialController
   }
 }
diff --git a/Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift b/Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift
@@ -15,19 +15,20 @@ 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>(segueIdentifier: SegueIdentifier, segue: UIStoryboardSegue)
+    where SegueIdentifier.SegueType == Segue, SegueIdentifier.SourceType == Source, SegueIdentifier.DestinationType == Destination
+  {
     guard let identifier = segue.identifier,
-      sourceViewController = segue.sourceViewController as? SegueIdentifier.SourceType,
-      destinationViewController = segue.destinationViewController as? SegueIdentifier.DestinationType,
-      segue = segue as? SegueIdentifier.SegueType
-      where identifier == segueIdentifier.identifier
-      else {
-        return nil
+      let source = segue.source as? SegueIdentifier.SourceType,
+      let destination = segue.destination as? SegueIdentifier.DestinationType,
+      let segue = segue as? SegueIdentifier.SegueType, identifier == segueIdentifier.identifier
+    else {
+      return nil
     }
 
     self.segue = segue
     self.identifier = identifier
-    self.sourceViewController = sourceViewController
-    self.destinationViewController = destinationViewController
+    self.source = source
+    self.destination = destination
   }
 }
diff --git a/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift b/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift
@@ -18,8 +18,10 @@ 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: NSIndexPath) -> Identifier.ReusableType? {
-    return dequeueReusableCellWithReuseIdentifier(identifier.identifier, forIndexPath: indexPath) as? Identifier.ReusableType
+  public func dequeueReusableCell<Identifier: ReuseIdentifierType>(withReuseIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType?
+    where Identifier.ReusableType: UICollectionReusableView
+  {
+    return dequeueReusableCell(withReuseIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
   /**
@@ -31,43 +33,53 @@ 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: NSIndexPath) -> Identifier.ReusableType? {
-    return dequeueReusableSupplementaryViewOfKind(elementKind, withReuseIdentifier: identifier.identifier, forIndexPath: indexPath) as? Identifier.ReusableType
+  public func dequeueReusableSupplementaryView<Identifier: ReuseIdentifierType>(ofKind elementKind: String, withReuseIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType?
+    where Identifier.ReusableType: UICollectionReusableView
+  {
+    return dequeueReusableSupplementaryView(ofKind: elementKind, withReuseIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
   /**
    Register a serie of R.nib.* for use in creating new collection view cells.
 
    - 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>(_ nibResources: [Resource])
+    where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell
+  {
+    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) {
-    registerNib(UINib(resource: nibResource), forCellWithReuseIdentifier: nibResource.identifier)
+  public func register<Resource: NibResourceType>(_ nibResource: Resource)
+    where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell
+  {
+    register(UINib(resource: nibResource), forCellWithReuseIdentifier: nibResource.identifier)
   }
 
   /**
    Register a serie of R.nib.* for use in creating supplementary views for the collection view.
 
    - 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>(_ nibResources: [Resource], forSupplementaryViewOfKind kind: String)
+    where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView
+  {
+    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) {
-    registerNib(UINib(resource: nibResource), forSupplementaryViewOfKind: kind, withReuseIdentifier: nibResource.identifier)
+  public func register<Resource: NibResourceType>(_ nibResource: Resource, forSupplementaryViewOfKind kind: String)
+    where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView
+  {
+    register(UINib(resource: nibResource), forSupplementaryViewOfKind: kind, withReuseIdentifier: nibResource.identifier)
   }
 }
diff --git a/Library/UIKit/UIImage+ImageResource.swift b/Library/UIKit/UIImage+ImageResource.swift
diff --git a/Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift b/Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift
diff --git a/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift b/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift
diff --git a/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift b/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift
diff --git a/LibraryTests/RswiftTests.swift b/LibraryTests/RswiftTests.swift
diff --git a/R.swift.Library.xcodeproj/project.pbxproj b/R.swift.Library.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@ public struct StoryboardSegueIdentifier<Segue, Source, Destination>: StoryboardS`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/// Create a new StoryboardSegue based on the identifier and source view controller`
`47`		`- public func storyboardSegueWithSource(sourceViewController: Source)`
	`47`	`+ public func storyboardSegue(withSource source: Source)`
`48`	`48`	`-> StoryboardSegue<Segue, Source, Destination>`
`49`	`49`	`{`
`50`		`- return StoryboardSegue(identifier: self, sourceViewController: sourceViewController)`
	`50`	`+ return StoryboardSegue(identifier: self, source: source)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`@@ -63,7 +63,7 @@ public struct TypedStoryboardSegueInfo<Segue, Source, Destination>: StoryboardSe`
`63`	`63`	`public typealias DestinationType = Destination`
`64`	`64`
`65`	`65`	`/// Segue destination view controller`
`66`		`- public let destinationViewController: Destination`
	`66`	`+ public let destination: Destination`
`67`	`67`
`68`	`68`	`/// Segue identifier`
`69`	`69`	`public let identifier: String`
`@@ -72,7 +72,7 @@ public struct TypedStoryboardSegueInfo<Segue, Source, Destination>: StoryboardSe`
`72`	`72`	`public let segue: Segue`
`73`	`73`
`74`	`74`	`/// Segue source view controller`
`75`		`- public let sourceViewController: Source`
	`75`	`+ public let source: Source`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/// Segue with identifier and source view controller`
`@@ -81,15 +81,15 @@ public struct StoryboardSegue<Segue, Source, Destination> {`
`81`	`81`	`public let identifier: StoryboardSegueIdentifier<Segue, Source, Destination>`
`82`	`82`
`83`	`83`	`/// Segue source view controller`
`84`		`- public let sourceViewController: Source`
	`84`	`+ public let source: Source`
`85`	`85`
`86`	`86`	`/**`
`87`	`87`	`Create a new segue based on the identifier and source view controller`
`88`	`88`
`89`	`89`	`- returns: A new StoryboardSegue`
`90`	`90`	`*/`
`91`		`- public init(identifier: StoryboardSegueIdentifier<Segue, Source, Destination>, sourceViewController: Source) {`
	`91`	`+ public init(identifier: StoryboardSegueIdentifier<Segue, Source, Destination>, source: Source) {`
`92`	`92`	`self.identifier = identifier`
`93`		`- self.sourceViewController = sourceViewController`
	`93`	`+ self.source = source`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,3 @@ public struct StoryboardViewControllerResource<ViewController>: StoryboardViewCo`
`22`	`22`	`self.identifier = identifier`
`23`	`23`	`}`
`24`	`24`	`}`
`25`		`-`