Rename files and fix syntax error

Hilen · Hilen · commit e2f569a149fd · 2016-09-15T20:01:47.000+08:00
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+3.0
diff --git a/Package.swift b/Package.swift
diff --git a/Sources/Foundation/Data+TSExtension.swift b/Sources/Foundation/Data+TSExtension.swift
@@ -1,5 +1,5 @@
 //
-//  NSData+TSExtension.swift
+//  Data+TSExtension.swift
 //  TimedSilver
 //  Source: https://github.com/hilen/TimedSilver
 //
diff --git a/Sources/Foundation/Date+TSExtension.swift b/Sources/Foundation/Date+TSExtension.swift
@@ -1,5 +1,5 @@
 //
-//  NSDate+TSExtension.swift
+//  Date+TSExtension.swift
 //  TimedSilver
 //  Source: https://github.com/hilen/TimedSilver
 //
diff --git a/Sources/Foundation/FileManager+TSExtension.swift b/Sources/Foundation/FileManager+TSExtension.swift
@@ -1,5 +1,5 @@
 //
-//  NSFileManager+TSExtension.swift
+//  FileManager+TSExtension.swift
 //  TimedSilver
 //  Source: https://github.com/hilen/TimedSilver
 //
@@ -70,9 +70,10 @@ public extension FileManager {
      - parameter filePath: Path to a file to set an attribute.
      */
     class func ts_addSkipBackupAttributeToFile(_ filePath: String) {
-        if let url: URL = URL(fileURLWithPath: filePath) {
-            do { try (url as NSURL).setResourceValue(NSNumber(value: true as Bool), forKey: URLResourceKey.isExcludedFromBackupKey) } catch {}
-        }
+        let url: URL = URL(fileURLWithPath: filePath)
+        do {
+            try (url as NSURL).setResourceValue(NSNumber(value: true as Bool), forKey: URLResourceKey.isExcludedFromBackupKey)
+        } catch {}
     }
     
     /**
diff --git a/Sources/Foundation/IndexPath+TSOffset.swift b/Sources/Foundation/IndexPath+TSOffset.swift
@@ -1,5 +1,5 @@
 //
-//  NSIndexPath+TSOffset.swift
+//  IndexPath+TSOffset.swift
 //  TimedSilver
 //  Source: https://github.com/hilen/TimedSilver
 //
diff --git a/Sources/Foundation/NSBundle+TSExtension.swift b/Sources/Foundation/NSBundle+TSExtension.swift
@@ -7,6 +7,7 @@
 //  Copyright © 2016 Hilen. All rights reserved.
 //
 
+import Foundation
 import UIKit
 
 public extension Bundle {
diff --git a/Sources/Foundation/NSIndexSet+TSExtension.swift b/Sources/Foundation/NSIndexSet+TSExtension.swift
@@ -22,10 +22,10 @@ import Foundation
 public extension NSIndexSet {
     func ts_indexPathsFromIndexes(section: NSInteger) -> [NSIndexPath] {
         var indexPaths = [NSIndexPath]()
-        self.enumerateIndexesUsingBlock { index, stop in
+        self.enumerate { index, stop in
             let path = NSIndexPath(forItem: index, inSection: section)
             indexPaths.append(path)
         }
         return indexPaths
     }
-}
+}
diff --git a/Sources/Foundation/NSRange+TSExtension.swift b/Sources/Foundation/NSRange+TSExtension.swift
@@ -10,47 +10,120 @@
 import Foundation
 
 public extension NSRange {
+    /**
+     Init with location and length
+     
+     - parameter ts_location: location
+     - parameter ts_length:   length
+     
+     - returns: NSRange
+     */
     init(ts_location:Int, ts_length:Int) {
         self.location = ts_location
         self.length = ts_length
     }
     
-    init(_ location:Int, _ length:Int) {
-        self.location = location
-        self.length = length
+    /**
+     Init with location and length
+     
+     - parameter ts_location: location
+     - parameter ts_length:   length
+     
+     - returns: NSRange
+     */
+    init(_ ts_location:Int, _ ts_length:Int) {
+        self.location = ts_location
+        self.length = ts_length
     }
     
+    /**
+     Init from Range
+     
+     - parameter ts_range:   Range
+     
+     - returns: NSRange
+     */
     init(ts_range:Range <Int>) {
         self.location = ts_range.lowerBound
         self.length = ts_range.upperBound - ts_range.lowerBound
     }
     
-    init(_ range:Range <Int>) {
-        self.location = range.lowerBound
-        self.length = range.upperBound - range.lowerBound
+    /**
+     Init from Range
+     
+     - parameter ts_range:   Range
+     
+     - returns: NSRange
+     */
+    init(_ ts_range:Range <Int>) {
+        self.location = ts_range.lowerBound
+        self.length = ts_range.upperBound - ts_range.lowerBound
     }
     
+    
+    /// Get NSRange start index
     var ts_startIndex:Int { get { return location } }
+    
+    /// Get NSRange end index
     var ts_endIndex:Int { get { return location + length } }
+    
+    /// Convert NSRange to Range
     var ts_asRange:Range<Int> { get { return location..<location + length } }
+    
+    /// Check empty
     var ts_isEmpty:Bool { get { return length == 0 } }
     
+    /**
+     Check NSRange contains index
+     
+     - parameter index: index
+     
+     - returns: Bool
+     */
     func ts_contains(index:Int) -> Bool {
         return index >= location && index < ts_endIndex
     }
     
+    /**
+     Get NSRange's clamp Index
+     
+     - parameter index: index
+     
+     - returns: Bool
+     */
     func ts_clamp(index:Int) -> Int {
         return max(self.ts_startIndex, min(self.ts_endIndex - 1, index))
     }
     
+    /**
+     Check NSRange intersects another NSRange
+     
+     - parameter range: NSRange
+     
+     - returns: Bool
+     */
     func ts_intersects(range:NSRange) -> Bool {
         return NSIntersectionRange(self, range).ts_isEmpty == false
     }
     
+    /**
+     Get the two NSRange's intersection
+     
+     - parameter range: NSRange
+     
+     - returns: NSRange
+     */
     func ts_intersection(range:NSRange) -> NSRange {
         return NSIntersectionRange(self, range)
     }
     
+    /**
+     Get the two NSRange's union value
+     
+     - parameter range: NSRange
+     
+     - returns: NSRange
+     */
     func ts_union(range:NSRange) -> NSRange {
         return NSUnionRange(self, range)
     }
diff --git a/Sources/Foundation/NotificationCenter+TSBlock.swift b/Sources/Foundation/NotificationCenter+TSBlock.swift
diff --git a/Sources/Foundation/Timer+TSBlock.swift b/Sources/Foundation/Timer+TSBlock.swift
@@ -1,5 +1,5 @@
 //
-//  NSTimer+TSBlock.swift
+//  Timer+TSBlock.swift
 //  TimedSilver
 //  Source: https://github.com/hilen/TimedSilver
 //
diff --git a/Sources/Foundation/URLRequest+TScURLCommand.swift b/Sources/Foundation/URLRequest+TScURLCommand.swift
@@ -1,5 +1,5 @@
 //
-//  NSURLRequest+TScURLCommand.swift
+//  URLRequest+TScURLCommand.swift
 //  TimedSilver
 //  Source: https://github.com/hilen/TimedSilver
 //
diff --git a/Sources/Foundation/UserDefault+TSArchiveData.swift b/Sources/Foundation/UserDefault+TSArchiveData.swift
@@ -1,5 +1,5 @@
 //
-//  NSUserDefault+TSArchiveData.swift
+//  UserDefault+TSArchiveData.swift
 //  TimedSilver
 //  Source: https://github.com/hilen/TimedSilver
 //
diff --git a/Sources/Foundation/UserDefault+TSExtension.swift b/Sources/Foundation/UserDefault+TSExtension.swift
@@ -1,5 +1,5 @@
 //
-//  NSUserDefault+TSExtension.swift
+//  UserDefault+TSExtension.swift
 //  TimedSilver
 //  Source: https://github.com/hilen/TimedSilver
 //
diff --git a/Sources/Struct/String+TSCrypto.swift b/Sources/Struct/String+TSCrypto.swift
@@ -35,7 +35,7 @@ public extension String {
 }
 
 /** array of bytes, little-endian representation */
-func arrayOfBytes<T>(_ value: T, length: Int? = nil) -> [UInt8] {
+func ts_arrayOfBytes<T>(_ value: T, length: Int? = nil) -> [UInt8] {
     let totalBytes = length ?? (MemoryLayout<T>.size * 8)
     
     let valuePointer = UnsafeMutablePointer<T>.allocate(capacity: 1)
@@ -58,7 +58,7 @@ func arrayOfBytes<T>(_ value: T, length: Int? = nil) -> [UInt8] {
 extension Int {
     /** Array of bytes with optional padding (little-endian) */
     func bytes(_ totalBytes: Int = MemoryLayout<Int>.size) -> [UInt8] {
-        return arrayOfBytes(self, length: totalBytes)
+        return ts_arrayOfBytes(self, length: totalBytes)
     }
     
 }
@@ -72,14 +72,14 @@ extension NSMutableData {
     
 }
 
-protocol HashProtocol {
+protocol ts_HashProtocol {
     var message: Array<UInt8> { get }
     
     /** Common part for hash calculation. Prepare header data. */
     func prepare(_ len: Int) -> Array<UInt8>
 }
 
-extension HashProtocol {
+extension ts_HashProtocol {
     
     func prepare(_ len: Int) -> Array<UInt8> {
         var tmpMessage = message
@@ -150,7 +150,7 @@ func rotateLeft(_ value: UInt32, bits: UInt32) -> UInt32 {
     return ((value << bits) & 0xFFFFFFFF) | (value >> (32 - bits))
 }
 
-class TS_MD5: HashProtocol {
+class TS_MD5: ts_HashProtocol {
     
     static let size = 16 // 128 / 8
     let message: [UInt8]
diff --git a/Sources/Struct/String+TSExtension.swift b/Sources/Struct/String+TSExtension.swift
@@ -36,6 +36,43 @@ public extension String {
             ).size
         return size.height
     }
+    
+    /**
+     NSRange to Range<String.Index>
+     http://stackoverflow.com/questions/25138339/nsrange-to-rangestring-index
+     
+     - parameter range: Range
+     
+     - returns: NSRange
+     */
+    
+    func ts_NSRange(fromRange range: Range<Index>) -> NSRange {
+        let from = range.lowerBound
+        let to = range.upperBound
+        
+        let location = characters.distance(from: startIndex, to: from)
+        let length = characters.distance(from: from, to: to)
+        
+        return NSRange(location: location, length: length)
+    }
+    
+    /** 
+     Range<String.Index> to NSRange
+     http://stackoverflow.com/questions/25138339/nsrange-to-rangestring-index
+    
+     - parameter nsRange: The NSRange
+    
+     - returns: Range<String.Index>
+    */
+    func ts_Range(from nsRange: NSRange) -> Range<String.Index>? {
+        guard
+            let from16 = utf16.index(utf16.startIndex, offsetBy: nsRange.location, limitedBy: utf16.endIndex),
+            let to16 = utf16.index(from16, offsetBy: nsRange.length, limitedBy: utf16.endIndex),
+            let from = String.Index(from16, within: self),
+            let to = String.Index(to16, within: self)
+            else { return nil }
+        return from ..< to
+    }
 }
 
 
diff --git a/Sources/UIKit/UIView+TSExtension.swift b/Sources/UIKit/UIView+TSExtension.swift
@@ -20,7 +20,7 @@ public extension UIView {
     class func ts_Nib() -> UINib {
         let hasNib: Bool = Bundle.main.path(forResource: self.ts_className, ofType: "nib") != nil
         guard hasNib else {
-            fatalError("\(self.ts_className) nib is not exist")
+            assert(!hasNib, "Nib is not exist")
             return UINib()
         }
         return UINib(nibName: self.ts_className, bundle:nil)
diff --git a/Sources/UIKit/UIViewController+TSExtension.swift b/Sources/UIKit/UIViewController+TSExtension.swift
@@ -54,30 +54,34 @@ public extension UIViewController {
         button.contentHorizontalAlignment = .left
         
         button.ts_addEventHandler(forControlEvent: .touchUpInside, handler: {[weak self] in
-            if self!.navigationController!.viewControllers.count > 1 {
-                self!.navigationController?.popViewController(animated: true)
-            } else if (self!.presentingViewController != nil) {
-                self!.dismiss(animated: true, completion: nil)
+            guard let strongSelf = self else { return }
+            guard let navigationController = strongSelf.navigationController else {
+                assert(false, "Your target ViewController doesn't have a UINavigationController")
+            }
+            
+            if navigationController.viewControllers.count > 1 {
+                navigationController.popViewController(animated: true)
+            } else if (strongSelf.presentingViewController != nil) {
+                strongSelf.dismiss(animated: true, completion: nil)
             }
         })
         
         let barButton = UIBarButtonItem(customView: button)
         let gapItem = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil)
         gapItem.width = -7  //fix the space
-        self.navigationItem.leftBarButtonItems = [gapItem, barButton]
+        navigationItem.leftBarButtonItems = [gapItem, barButton]
     }
     
     /**
      Back to previous, pop or dismiss
      */
     func ts_backToPrevious() {
-        guard self.navigationController != nil else {
+        guard let navigationController = self.navigationController else {
             assert(false, "Your target ViewController doesn't have a UINavigationController")
-            return
         }
-        
-        if self.navigationController!.viewControllers.count > 1 {
-            self.navigationController?.popViewController(animated: true)
+
+        if navigationController.viewControllers.count > 1 {
+            navigationController.popViewController(animated: true)
         } else if (self.presentingViewController != nil) {
             self.dismiss(animated: true, completion: nil)
         }

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ import Foundation`
`22`	`22`	`public extension NSIndexSet {`
`23`	`23`	`func ts_indexPathsFromIndexes(section: NSInteger) -> [NSIndexPath] {`
`24`	`24`	`var indexPaths = [NSIndexPath]()`
`25`		`- self.enumerateIndexesUsingBlock { index, stop in`
	`25`	`+ self.enumerate { index, stop in`
`26`	`26`	`let path = NSIndexPath(forItem: index, inSection: section)`
`27`	`27`	`indexPaths.append(path)`
`28`	`28`	`}`
`29`	`29`	`return indexPaths`
`30`	`30`	`}`
`31`		`-}`
	`31`	`+}`