Merge branch 'release/3.7.1'

Author: malcommac

ExampleiOS/ViewController.swift

@@ -17,19 +17,19 @@ class ViewController: UIViewController {
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
-        let text = """
-- <img named="check" att="5"/> Performed!
-"""
-        let base = Style {
-            $0.font = UIFont.boldSystemFont(ofSize: 14)
-            $0.color = UIColor(hexString: "#8E8E8E")
-        }
-        
-        let xmlStyle = StyleXML(base: base)
-        xmlStyle.imageProvider = { imageName, attributes in
-            fatalError()
-        }
-        
+//        let text = """
+//- <img named="check" att="5"/> Performed!
+//"""
+//        let base = Style {
+//            $0.font = UIFont.boldSystemFont(ofSize: 14)
+//            $0.color = UIColor(hexString: "#8E8E8E")
+//        }
+//
+//        let xmlStyle = StyleXML(base: base)
+//        xmlStyle.imageProvider = { imageName, attributes in
+//            fatalError()
+//        }
+//
 //        self.textView?.attributedText = text.set(style: xmlStyle)
 
 //        return

Sources/SwiftRichString/Support/Extensions.swift

@@ -37,50 +37,16 @@ import UIKit
 
 extension String {
 
-    // Current implementation by @alexaubry in
-    // https://github.com/alexaubry/HTMLString
+    private static let escapeAmpRegExp = try! NSRegularExpression(pattern: "&(?!(#[0-9]{2,4}|[A-z]{2,6});)", options: NSRegularExpression.Options(rawValue: 0))
+
     public func escapeWithUnicodeEntities() -> String {
-        var copy = self
-        copy.addUnicodeEntities()
-        return copy
-    }
-    
-    internal mutating func addUnicodeEntities() {
-        var position: String.Index? = startIndex
-        let requiredEscapes: Set<Character> = ["!", "\"", "$", "%", "&", "'", "+", ",", "<", "=", ">", "@", "[", "]", "`", "{", "}"]
-        
-        while let cursorPosition = position {
-            guard cursorPosition != endIndex else { break }
-            let character = self[cursorPosition]
-            
-            if requiredEscapes.contains(character) {
-                // One of the required escapes for security reasons
-                let escape = "&#\(character.asciiValue!);" // required escapes can can only be ASCII
-                position = positionAfterReplacingCharacter(at: cursorPosition, with: escape)
-            } else {
-                // Not a required escape, no need to replace the character
-                position = index(cursorPosition, offsetBy: 1, limitedBy: endIndex)
-            }
-        }
+        let range = NSRange(location: 0, length: self.count)
+        return String.escapeAmpRegExp.stringByReplacingMatches(in: self,
+                                                               options: NSRegularExpression.MatchingOptions(rawValue: 0),
+                                                               range: range,
+                                                               withTemplate: "&amp;")
     }
 
-    /// Replaces the character at the given position with the escape and returns the new position.
-    fileprivate mutating func positionAfterReplacingCharacter(at position: String.Index, with escape: String) -> String.Index? {
-        let nextIndex = index(position, offsetBy: 1)
-        
-        if let fittingPosition = index(position, offsetBy: escape.count, limitedBy: endIndex) {
-            // Check if we can fit the whole escape in the receiver
-            replaceSubrange(position ..< nextIndex, with: escape)
-            return fittingPosition
-        } else {
-            // If we can't, remove the character and insert the escape to make it fit.
-            remove(at: position)
-            insert(contentsOf: escape, at: position)
-            return index(position, offsetBy: escape.count, limitedBy: endIndex)
-        }
-    }
-
-    
 }
 
 extension NSNumber {

SwiftRichString.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SwiftRichString"
-  s.version      = "3.7.0"
+  s.version      = "3.7.1"
   s.summary      = "Elegant Strings & Attributed Strings Toolkit for Swift"
   s.description  = <<-DESC
     SwiftRichString is the best toolkit to work easily with Strings and Attributed Strings.

SwiftRichString.xcodeproj/project.pbxproj

@@ -1640,7 +1640,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.7.0;
+				MARKETING_VERSION = 3.7.1;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-iOS";
 				PRODUCT_NAME = SwiftRichString;
@@ -1666,7 +1666,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.7.0;
+				MARKETING_VERSION = 3.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-iOS";
 				PRODUCT_NAME = SwiftRichString;
 				SKIP_INSTALL = YES;
@@ -1718,7 +1718,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.7.0;
+				MARKETING_VERSION = 3.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-watchOS";
 				PRODUCT_NAME = SwiftRichString;
 				SDKROOT = watchos;
@@ -1745,7 +1745,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.7.0;
+				MARKETING_VERSION = 3.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-watchOS";
 				PRODUCT_NAME = SwiftRichString;
 				SDKROOT = watchos;
@@ -1772,7 +1772,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.7.0;
+				MARKETING_VERSION = 3.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-tvOS";
 				PRODUCT_NAME = SwiftRichString;
 				SDKROOT = appletvos;
@@ -1799,7 +1799,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.7.0;
+				MARKETING_VERSION = 3.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-tvOS";
 				PRODUCT_NAME = SwiftRichString;
 				SDKROOT = appletvos;
@@ -1828,7 +1828,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.7.0;
+				MARKETING_VERSION = 3.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-macOS";
 				PRODUCT_NAME = SwiftRichString;
 				SDKROOT = macosx;
@@ -1855,7 +1855,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.7.0;
+				MARKETING_VERSION = 3.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-macOS";
 				PRODUCT_NAME = SwiftRichString;
 				SDKROOT = macosx;