Fix crash due to range out of bounds - caused by #107

ActiveLabel/ActiveBuilder.swift

@@ -35,16 +35,17 @@ struct ActiveBuilder {
                 .stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
 
             guard let maxChar = maxChar where word.characters.count > maxChar else {
+                let newRange = (text as NSString).rangeOfString(word)
                 let element = ActiveElement.create(with: type, text: word)
-                elements.append((match.range, element, type))
+                elements.append((newRange, element, type))
                 continue
             }
 
             let trimmedWord = word.trim(to: maxChar)
             text = text.stringByReplacingOccurrencesOfString(word, withString: trimmedWord)
-            let element = ActiveElement.URL(original: word, trimmed: trimmedWord)
 
-            let newRange = NSRange(location: match.range.location, length: trimmedWord.characters.count + 1)
+            let newRange = (text as NSString).rangeOfString(trimmedWord)
+            let element = ActiveElement.URL(original: word, trimmed: trimmedWord)
             elements.append((newRange, element, type))
         }
         return (elements, text)

ActiveLabel/ActiveLabel.swift

@@ -247,6 +247,9 @@ typealias ElementTuple = (range: NSRange, element: ActiveElement, type: ActiveTy
 
         addLinkAttribute(mutAttrString)
         textStorage.setAttributedString(mutAttrString)
+        _customizing = true
+        text = mutAttrString.string
+        _customizing = false
         setNeedsDisplay()
     }
 
@@ -291,7 +294,7 @@ typealias ElementTuple = (range: NSRange, element: ActiveElement, type: ActiveTy
     }
 
     /// use regex check all link ranges
-    private func parseTextAndExtractActiveElements(attrString: NSMutableAttributedString) -> String{
+    private func parseTextAndExtractActiveElements(attrString: NSMutableAttributedString) -> String {
         var textString = attrString.string
         var textLength = textString.utf16.count
         var textRange = NSRange(location: 0, length: textLength)

ActiveLabelTests/ActiveTypeTests.swift

@@ -326,4 +326,12 @@ class ActiveTypeTests: XCTestCase {
         XCTAssertEqual(currentElementString, "are")
         XCTAssertEqual(currentElementType, customEmptyType)
     }
+
+    func testStringTrimming() {
+        let text = "Tweet with long url: https://twitter.com/twicket_app/status/649678392372121601 and short url: https://hello.co"
+        label.urlMaximumLength = 30
+        label.text = text
+
+        XCTAssertNotEqual(text.characters.count, label.text!.characters.count)
+    }
 }