Skip to content
This repository has been archived by the owner on Mar 29, 2018. It is now read-only.

Added overloaded ltrimmed and rtrimmed methods #55

Merged
merged 2 commits into from
Jan 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions ExSwift/String.swift
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,16 @@ public extension String {
:returns: Stripped string
*/
func ltrimmed () -> String {
if let range = rangeOfCharacterFromSet(NSCharacterSet.whitespaceAndNewlineCharacterSet().invertedSet) {
return ltrimmed(NSCharacterSet.whitespaceAndNewlineCharacterSet())
}

/**
Strips the specified characters from the beginning of self.

:returns: Stripped string
*/
func ltrimmed (set: NSCharacterSet) -> String {
if let range = rangeOfCharacterFromSet(set.invertedSet) {
return self[range.startIndex..<endIndex]
}

Expand All @@ -150,7 +159,16 @@ public extension String {
:returns: Stripped string
*/
func rtrimmed () -> String {
if let range = rangeOfCharacterFromSet(NSCharacterSet.whitespaceAndNewlineCharacterSet().invertedSet, options: NSStringCompareOptions.BackwardsSearch) {
return rtrimmed(NSCharacterSet.whitespaceAndNewlineCharacterSet())
}

/**
Strips the specified characters from the end of self.

:returns: Stripped string
*/
func rtrimmed (set: NSCharacterSet) -> String {
if let range = rangeOfCharacterFromSet(set.invertedSet, options: NSStringCompareOptions.BackwardsSearch) {
return self[startIndex..<range.endIndex]
}

Expand Down
10 changes: 10 additions & 0 deletions ExSwiftTests/ExSwiftStringTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,14 @@ class ExSwiftStringTests: XCTestCase {
XCTAssertEqual("AB ".rtrimmed(), "AB")
XCTAssertEqual("\n ABC ".rtrimmed(), "\n ABC")
}

func testLTrimmedForSet () {
XCTAssertEqual("ab ".ltrimmed(NSCharacterSet.alphanumericCharacterSet()), " ")
XCTAssertEqual(" ab".ltrimmed(NSCharacterSet.alphanumericCharacterSet()), " ab")
}

func testRTrimmedForSet () {
XCTAssertEqual("ab ".rtrimmed(NSCharacterSet.alphanumericCharacterSet()), "ab ")
XCTAssertEqual(" ab".rtrimmed(NSCharacterSet.alphanumericCharacterSet()), " ")
}
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ Name | Signature
**`matches`**|`matches (pattern: String, ignoreCase: Bool = false) -> [NSTextCheckingResult]?`
**`insert`**|`insert (index: Int, _ string: String) -> String`
**`ltrimmed`**|`ltrimmed () -> String`
**`ltrimmed`**|`ltrimmed (set: NSCharacterSet) -> String`
**`rtrimmed`**|`rtrimmed () -> String`
**`rtrimmed`**|`rtrimmed (set: NSCharacterSet) -> String`
**`trimmed`**|`trimmed () -> String`

#### Class Methods ####
Expand Down