Merge branch 'release/3.0.0'

Author: malcommac

Configs/SwiftRichString.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.5</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

ExampleiOS/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	var window: UIWindow?
 
 
-	private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 		// Override point for customization after application launch.
 		return true
 	}

ExampleiOS/ViewController.swift

@@ -17,6 +17,21 @@ class ViewController: UIViewController {
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
+		/*let baseStyle = Style {
+			$0.font = UIFont.systemFont(ofSize: self.baseFontSize)
+			$0.lineSpacing = 2
+		}
+
+		let linkStyle = Style {
+			$0.font = UIFont.boldSystemFont(ofSize: self.baseFontSize)
+			$0.linkURL = URLRepresentable.tagAttribute("href")
+		}
+
+		let text = "Stile <a href=\"www.facebook.com/agencearcantide/photos/a.346501409312886/346503839312643/?type=3&theater\">link</a>"
+		let s = StyleGroup(base: baseStyle, ["a" : linkStyle])
+		self.textView?.attributedText = text.set(style: s)
+	*/
+
 		let bodyHTML = try! String(contentsOfFile: Bundle.main.path(forResource: "file", ofType: "txt")!)
 
 		let headerStyle = Style {

README.md

@@ -367,7 +367,7 @@ let style = Style {
 SwiftRichString also support some dynamic elements in style applied by reading specific tag parameter's value.
 The following example render the `linkURL` property by reading the value from the source string inside `href` tag (like in real HTML text):
 
-```
+```swift
   let normal = Style {
 	$0.color = UIColor.black
   }

Sources/SwiftRichString/Extensions/AttributedString+Ext.swift

@@ -48,7 +48,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func add(style: String, range: NSRange? = nil) -> AttributedString {
+	func add(style: String, range: NSRange? = nil) -> AttributedString {
 		guard let style = Styles[style] else { return self }
 		return style.add(to: self, range: range)
 	}
@@ -61,7 +61,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func add(styles: [String], range: NSRange? = nil) -> AttributedString {
+	func add(styles: [String], range: NSRange? = nil) -> AttributedString {
 		guard let styles = Styles[styles] else { return self }
 		return styles.mergeStyle().set(to: self, range: range)
 	}
@@ -74,7 +74,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func set(style: String, range: NSRange? = nil) -> AttributedString {
+	func set(style: String, range: NSRange? = nil) -> AttributedString {
 		guard let style = Styles[style] else { return self }
 		return style.set(to: self, range: range)
 	}
@@ -88,7 +88,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func set(styles: [String], range: NSRange? = nil) -> AttributedString {
+	func set(styles: [String], range: NSRange? = nil) -> AttributedString {
 		guard let styles = Styles[styles] else { return self }
 		return styles.mergeStyle().set(to: self, range: range)
 	}
@@ -100,7 +100,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func add(style: StyleProtocol, range: NSRange? = nil) -> AttributedString {
+	func add(style: StyleProtocol, range: NSRange? = nil) -> AttributedString {
 		return style.add(to: self, range: range)
 	}
 
@@ -112,7 +112,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func add(styles: [StyleProtocol], range: NSRange? = nil) -> AttributedString {
+	func add(styles: [StyleProtocol], range: NSRange? = nil) -> AttributedString {
 		return styles.mergeStyle().add(to: self, range: range)
 	}
 
@@ -123,7 +123,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func set(style: StyleProtocol, range: NSRange? = nil) -> AttributedString {
+	func set(style: StyleProtocol, range: NSRange? = nil) -> AttributedString {
 		return style.set(to: self, range: range)
 	}
 
@@ -135,7 +135,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func set(styles: [StyleProtocol], range: NSRange? = nil) -> AttributedString {
+	func set(styles: [StyleProtocol], range: NSRange? = nil) -> AttributedString {
 		return styles.mergeStyle().set(to: self, range: range)
 	}
 
@@ -146,7 +146,7 @@ public extension AttributedString {
 	///   - range: 	range of substring where style will be removed, `nil` to use the entire string.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	@discardableResult
-	public func removeAttributes(_ keys: [NSAttributedString.Key], range: NSRange) -> Self {
+	func removeAttributes(_ keys: [NSAttributedString.Key], range: NSRange) -> Self {
 		keys.forEach { self.removeAttribute($0, range: range) }
 		return self
 	}
@@ -155,7 +155,7 @@ public extension AttributedString {
 	///
 	/// - Parameter style: style to use.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
-	public func remove(_ style: StyleProtocol) -> Self {
+	func remove(_ style: StyleProtocol) -> Self {
 		self.removeAttributes(Array(style.attributes.keys), range: NSMakeRange(0, self.length))
 		return self
 	}

Sources/SwiftRichString/Extensions/String+Ext.swift

@@ -49,7 +49,7 @@ public extension String {
 	///   - style: name of style registered in `StylesManager` singleton.
 	///   - range: range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: rendered attributed string, `nil` if style is not registered.
-	public func set(style: String, range: NSRange? = nil) -> AttributedString? {
+	func set(style: String, range: NSRange? = nil) -> AttributedString? {
 		return StylesManager.shared[style]?.set(to: self, range: range)
 	}
 
@@ -63,7 +63,7 @@ public extension String {
 	///   - styles: ordered list of styles name to apply. Styles must be registed in `StylesManager`.
 	///   - range: range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: attributed string, `nil` if all specified styles required are not registered.
-	public func set(styles: [String], range: NSRange? = nil) -> AttributedString? {
+	func set(styles: [String], range: NSRange? = nil) -> AttributedString? {
 		return StylesManager.shared[styles]?.mergeStyle().set(to: self, range: range)
 	}
 
@@ -73,7 +73,7 @@ public extension String {
 	///   - style: style to apply.
 	///   - range: range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: rendered attributed string.
-	public func set(style: StyleProtocol, range: NSRange? = nil) -> AttributedString {
+	func set(style: StyleProtocol, range: NSRange? = nil) -> AttributedString {
 		return style.set(to: self, range: range)
 	}
 
@@ -86,7 +86,7 @@ public extension String {
 	///   - styles: ordered list of styles to apply. Styles must be registed in `StylesManager`.
 	///   - range: range of substring where style is applied, `nil` to use the entire string.
 	/// - Returns: attributed string.
-	public func set(styles: [StyleProtocol], range: NSRange? = nil) -> AttributedString {
+	func set(styles: [StyleProtocol], range: NSRange? = nil) -> AttributedString {
 		return styles.mergeStyle().set(to: self, range: range)
 	}
 

Sources/SwiftRichString/Extensions/String+Subscript.swift

@@ -30,32 +30,13 @@
 
 import Foundation
 
-public extension Array where Array.Element == Range<String.Index> {
-	
-	/// Convert an array of `String.Index` to an array of `NSRange`
-	public var nsRanges: [NSRange] {
-		return self.map({ $0.nsRange })
-	}
-	
-}
-
-public extension Range where Bound == String.Index {
-	
-	/// Return `NSRange` from standard `Range<String.Index>` range.
-	var nsRange:NSRange {
-		return NSRange(location: self.lowerBound.encodedOffset,
-					   length: self.upperBound.encodedOffset -
-						self.lowerBound.encodedOffset)
-	}
-}
-
 public extension NSRange {
 
 	/// Convert receiver in String's `Range<String.Index>` for given string instance.
 	///
 	/// - Parameter str: source string
 	/// - Returns: range, `nil` if invalid
-	public func `in`(_ str: String) -> Range<String.Index>? {
+	func `in`(_ str: String) -> Range<String.Index>? {
 		return Range(self, in: str)
 	}
 
@@ -80,7 +61,7 @@ public extension String {
 	///   - from: starting index.
 	///   - length: length of string,
 	/// - Returns: substring
-	public func substring(from: Int?, length: Int) -> String? {
+	func substring(from: Int?, length: Int) -> String? {
 		guard length > 0 else { return nil }
 		let start = from ?? 0
 		let end = min(count, max(0, start) + length)
@@ -93,7 +74,7 @@ public extension String {
 	///
 	/// - Parameter index: index of the character
 	/// - Returns: `Character` instance at passed index, `nil` if range is out of bounds.
-	public subscript(index: Int) -> Character? {
+	subscript(index: Int) -> Character? {
 		guard !self.isEmpty, let stringIndex = self.index(startIndex, offsetBy: index, limitedBy: self.index(before: endIndex)) else { return nil }
 		return self[stringIndex]
 	}
@@ -103,7 +84,7 @@ public extension String {
 	/// `String[0..<1]`
 	///
 	/// - Parameter value: substring
-	public subscript(range: Range<Int>) -> Substring? {
+	subscript(range: Range<Int>) -> Substring? {
 		guard let left = offset(by: range.lowerBound) else { return nil }
 		guard let right = index(left, offsetBy: range.upperBound - range.lowerBound,
 								limitedBy: endIndex) else { return nil }
@@ -114,7 +95,7 @@ public extension String {
 	/// `String[..<1]`
 	///
 	/// - Parameter value: substring
-	public subscript(value: PartialRangeUpTo<Int>) -> Substring? {
+	subscript(value: PartialRangeUpTo<Int>) -> Substring? {
 		if value.upperBound < 0 {
 			guard abs(value.upperBound) <= count else { return nil }
 			return self[..<(count - abs(value.upperBound))]
@@ -127,7 +108,7 @@ public extension String {
 	/// `String[...1]`
 	///
 	/// - Parameter range: closed subrange.
-	public subscript(range: ClosedRange<Int>) -> Substring? {
+	subscript(range: ClosedRange<Int>) -> Substring? {
 		if range.upperBound < 0 {
 			guard abs(range.lowerBound) <= count else { return nil }
 			return self[(count - abs(range.lowerBound))...]
@@ -141,7 +122,7 @@ public extension String {
 	/// `String[1...]`
 	///
 	/// - Parameter value: substring
-	public subscript(value: PartialRangeFrom<Int>) -> Substring? {
+	subscript(value: PartialRangeFrom<Int>) -> Substring? {
 		guard let left = self.offset(by: value.lowerBound) else { return nil }
 		return self[left...]
 	}
@@ -150,7 +131,7 @@ public extension String {
 	/// `String[...2]`
 	///
 	/// - Parameter value: substring
-	public subscript(value: PartialRangeThrough<Int>) -> Substring? {
+	subscript(value: PartialRangeThrough<Int>) -> Substring? {
 		guard let right = self.offset(by: value.upperBound) else { return nil }
 		return self[...right]
 	}
@@ -164,7 +145,7 @@ public extension String {
 	///
 	/// - Parameter prefix: prefix to remove.
 	/// - Returns: new instance of the string without the prefix
-	public func removing(prefix: String) -> String {
+	func removing(prefix: String) -> String {
 		if hasPrefix(prefix) {
 			let start = index(startIndex, offsetBy: prefix.count)
 			//			return substring(from: start)
@@ -173,7 +154,7 @@ public extension String {
 		return self
 	}
 
-	public func removing(suffix: String) -> String {
+	func removing(suffix: String) -> String {
 		if hasSuffix(suffix) {
 			let end = index(startIndex, offsetBy: self.count-suffix.count)
 			return self[..<end].string

Sources/SwiftRichString/Extensions/UIKit+Extras.swift

@@ -67,14 +67,15 @@ extension UILabel {
 		}
 	}
 
-	/// Use this to render automatically the texct with the currently set style instance or styleName.
+	/// Use this to render automatically the text with the currently set style instance or styleName.
 	public var styledText: String? {
 		get {
 			return attributedText?.string
 		}
 		set {
 			guard let text = newValue else { return }
-			self.attributedText = self.style?.set(to: text, range: nil)
+            let style = self.style ?? Style()
+            self.attributedText = style.set(to: text, range: nil)
 		}
 	}
 
@@ -108,14 +109,15 @@ extension UITextField {
 		}
 	}
 
-	/// Use this to render automatically the texct with the currently set style instance or styleName.
+	/// Use this to render automatically the text with the currently set style instance or styleName.
 	public var styledText: String? {
 		get {
 			return attributedText?.string
 		}
 		set {
 			guard let text = newValue else { return }
-			self.attributedText = self.style?.set(to: text, range: nil)
+            let style = self.style ?? Style()
+            self.attributedText = style.set(to: text, range: nil)
 		}
 	}
 
@@ -149,14 +151,15 @@ extension UITextView {
 		}
 	}
 
-	/// Use this to render automatically the texct with the currently set style instance or styleName.
+	/// Use this to render automatically the text with the currently set style instance or styleName.
 	public var styledText: String? {
 		get {
 			return attributedText?.string
 		}
 		set {
 			guard let text = newValue else { return }
-			self.attributedText = self.style?.set(to: text, range: nil)
+            let style = self.style ?? Style()
+            self.attributedText = style.set(to: text, range: nil)
 		}
 	}
 

Sources/SwiftRichString/Style/StyleGroup.swift

@@ -86,7 +86,7 @@ public class StyleGroup: StyleProtocol {
 		private func extractParametersFromTags(_ string: String) -> [String: String]? {
 			guard let _ = string.firstIndex(of: " ") else { return nil } // no tags
 
-			let pattern = "\\w*\\s*=\\s*\"?\\s*([\\w\\s%#\\/\\.;:_-]*)\\s*\"?.*?" // maybe shorter?
+			let pattern = "\\w*\\s*=\\s*\"?\\s*([^\"][^\"]*)\\s*\"?.*?" // maybe shorter?
 			guard let regex = try? NSRegularExpression(pattern: pattern, options: .dotMatchesLineSeparators) else {
 				return nil
 			}
@@ -312,7 +312,7 @@ public extension Array where Array.Element == StyleProtocol {
 	/// Merge is made in order where each n+1 elements may replace existing keys defined by n-1 elements.
 	///
 	/// - Returns: merged style
-	public func mergeStyle() -> Style {
+	func mergeStyle() -> Style {
 		var attributes: [NSAttributedString.Key:Any] = [:]
 		self.forEach { attributes.merge($0.attributes, uniquingKeysWith: { (_, new) in return new }) }
 		return Style(dictionary: attributes)

Sources/SwiftRichString/Support/OrderedDictionary.swift

@@ -56,7 +56,7 @@ public struct OrderedDictionary<K: Hashable, V> {
 	}
 
 	public mutating func remove(key: K) -> V? {
-		guard let idx = self.keys.index(of: key) else { return nil }
+		guard let idx = self.keys.firstIndex(of: key) else { return nil }
 		self.keys.remove(at: idx)
 		return self.dict.removeValue(forKey: key)
 	}