#56 Minor refactoring

Author: malcommac

ExampleiOS/ViewController.swift

@@ -16,8 +16,22 @@ class ViewController: UIViewController {
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
+
+		let patternText = "[A-Z0-9a-z._%+]+@[A-Za-z0-9.]+\\.[A-Za-z]{2,4}"
+		let bodyHTML = "daniele [email protected] ciao ciao"
+
+		let baseStyle = Style {
+			$0.font = UIFont.boldSystemFont(ofSize: 12)
+		}
+
+		let highlightedStyle: StyleRegEx = StyleRegEx(base: baseStyle, pattern: patternText) {
+			$0.font = UIFont.systemFont(ofSize: 40, weight: .bold)
+			$0.color = UIColor.red
+		}!
+		self.textView?.attributedText = bodyHTML.set(style: highlightedStyle)
+
 
-		let bodyHTML = try! String(contentsOfFile: Bundle.main.path(forResource: "file", ofType: "txt")!)
+		/*let bodyHTML = try! String(contentsOfFile: Bundle.main.path(forResource: "file", ofType: "txt")!)
 
 		let headerStyle = Style {
 			$0.font = UIFont.boldSystemFont(ofSize: self.baseFontSize * 1.15)
@@ -63,6 +77,6 @@ class ViewController: UIViewController {
 		self.textView?.attributedText = bodyHTML.set(style: style)
         if #available(iOS 10.0, *) {
             self.textView?.adjustsFontForContentSizeCategory = true
-        }
+        }*/
 	}
 }

Sources/SwiftRichString/Attributes/FontData.swift

@@ -109,7 +109,7 @@ public class FontData {
 	/// - Parameter size: ignored. It will be overriden by `fontSize` property.
 	/// - Returns: instance of the font
 	var attributes: [NSAttributedString.Key:Any] {
-		guard !self.explicitFont else {
+		guard self.explicitFont == true else {
 			return [:]
 		}
 		return attributes(currentFont: self.font, size: self.size)

Sources/SwiftRichString/Extensions/AttributedString+Ext.swift

@@ -156,7 +156,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 {
-		self.removeAttributes(Array(style.renderingAttributes.keys), range: NSMakeRange(0, self.length))
+		self.removeAttributes(Array(style.attributes.keys), range: NSMakeRange(0, self.length))
 		return self
 	}
 

Sources/SwiftRichString/Style/Style.swift

@@ -608,7 +608,7 @@ public class Style: StyleProtocol {
 	/// Return attributes defined by the style.
 	/// Not all attributes are returned, fonts attributes may be omitted.
 	/// Refer to `attributes` to get the complete list.
-	public var renderingAttributes: [NSAttributedString.Key : Any] {
+	public var attributes: [NSAttributedString.Key : Any] {
 		if let cachedAttributes = self.cachedAttributes {
 			return cachedAttributes
 		}
@@ -618,15 +618,6 @@ public class Style: StyleProtocol {
 		self.cachedAttributes = self.innerAttributes.merging(fontAttributes) { (_, new) in return new }
 		return self.cachedAttributes!
 	}
-
-	/// Return attributes defined by the style.
-	public var attributes: [NSAttributedString.Key : Any] {
-		var allAttributes = self.renderingAttributes
-		if let fontRawAttributes = self.fontData?.attributes(currentFont: self.fontData?.font, size: self.fontData?.size) {
-			allAttributes.merge(fontRawAttributes, uniquingKeysWith: { (_, new) in return new })
-		}
-		return allAttributes
-	}
 
 	/// Create a new style copy of `self` with the opportunity to configure it via configuration callback.
 	///

Sources/SwiftRichString/Style/StyleGroup.swift

@@ -83,12 +83,12 @@ public class StyleGroup: StyleProtocol {
 
 	/// Return all attributes merge of each single `Style` of the group.
 	/// Attributes are reported in order of the insertion regardeless the associated name.
-	public var renderingAttributes: [NSAttributedString.Key : Any] {
+	public var attributes: [NSAttributedString.Key : Any] {
 		var composedAttributes: [NSAttributedString.Key: Any] = [:]
 		self.styles.enumerated().forEach { (arg) in
 
 			let (_, style) = arg
-			composedAttributes.merge(style.renderingAttributes, uniquingKeysWith: { (_, new) in return new })
+			composedAttributes.merge(style.attributes, uniquingKeysWith: { (_, new) in return new })
 		}
 		return composedAttributes
 	}
@@ -240,7 +240,7 @@ public class StyleGroup: StyleProtocol {
 						let length = closingTag.range.location-location
 						let range = NSRange(location: location, length: length)
 						attribute.fontData?.addAttributes(to: attrStr, range: range)
-						attrStr.addAttributes(attribute.renderingAttributes, range: range)
+						attrStr.addAttributes(attribute.attributes, range: range)
 					}
 				}
 
@@ -260,7 +260,7 @@ public extension Array where Array.Element == StyleProtocol {
 	/// - Returns: merged style
 	public func mergeStyle() -> Style {
 		var attributes: [NSAttributedString.Key:Any] = [:]
-		self.forEach { attributes.merge($0.renderingAttributes, uniquingKeysWith: { (_, new) in return new }) }
+		self.forEach { attributes.merge($0.attributes, uniquingKeysWith: { (_, new) in return new }) }
 		return Style(dictionary: attributes)
 	}
 

Sources/SwiftRichString/Style/StyleProtocol.swift

@@ -35,7 +35,7 @@ public typealias AttributedString = NSMutableAttributedString
 public protocol StyleProtocol: class {
 
 	/// Return the attributes of the style in form of dictionary `NSAttributedStringKey`/`Any`.
-	var renderingAttributes: [NSAttributedString.Key : Any] { get }
+	var attributes: [NSAttributedString.Key : Any] { get }
 
 	/// Font unique attributes dictionary.
 	var fontData: FontData? { get }
@@ -56,26 +56,26 @@ public extension StyleProtocol {
 	func set(to source: String, range: NSRange?) -> AttributedString {
 		let attributedText = NSMutableAttributedString(string: source)
 		self.fontData?.addAttributes(to: attributedText, range: nil)
-		attributedText.addAttributes(self.renderingAttributes, range: (range ?? NSMakeRange(0, attributedText.length)))
+		attributedText.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, attributedText.length)))
 		return attributedText
 	}
 
 	func add(to source: AttributedString, range: NSRange?) -> AttributedString {
 		self.fontData?.addAttributes(to: source, range: range)
-		source.addAttributes(self.renderingAttributes, range: (range ?? NSMakeRange(0, source.length)))
+		source.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		return source
 	}
 
 	@discardableResult
 	func set(to source: AttributedString, range: NSRange?) -> AttributedString {
 		self.fontData?.addAttributes(to: source, range: range)
-		source.addAttributes(self.renderingAttributes, range: (range ?? NSMakeRange(0, source.length)))
+		source.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		return source
 	}
 
 	@discardableResult
 	func remove(from source: AttributedString, range: NSRange?) -> AttributedString {
-		self.renderingAttributes.keys.forEach({
+		self.attributes.keys.forEach({
 			source.removeAttribute($0, range: (range ?? NSMakeRange(0, source.length)))
 		})
 		return source

Sources/SwiftRichString/Style/StyleRegEx.swift

@@ -51,8 +51,8 @@ public class StyleRegEx: StyleProtocol {
 	private var style: StyleProtocol
 
 	/// Style attributes
-	public var renderingAttributes: [NSAttributedString.Key : Any] {
-		return self.style.renderingAttributes
+	public var attributes: [NSAttributedString.Key : Any] {
+		return self.style.attributes
 	}
 
 	/// Font attributes
@@ -84,20 +84,20 @@ public class StyleRegEx: StyleProtocol {
 	//MARK: - METHOD OVERRIDES
 
 	public func set(to source: String, range: NSRange?) -> AttributedString {
-		let attributed = NSMutableAttributedString(string: source, attributes: (self.baseStyle?.renderingAttributes ?? [:]))
+		let attributed = NSMutableAttributedString(string: source, attributes: (self.baseStyle?.attributes ?? [:]))
 		return self.applyStyle(to: attributed, add: false, range: range)
 	}
 
 	public func add(to source: AttributedString, range: NSRange?) -> AttributedString {
 		if let base = self.baseStyle {
-			source.addAttributes(base.renderingAttributes, range: (range ?? NSMakeRange(0, source.length)))
+			source.addAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		}
 		return self.applyStyle(to: source, add: true, range: range)
 	}
 
 	public func set(to source: AttributedString, range: NSRange?) -> AttributedString {
 		if let base = self.baseStyle {
-			source.setAttributes(base.renderingAttributes, range: (range ?? NSMakeRange(0, source.length)))
+			source.setAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		}
 		return self.applyStyle(to: source, add: false, range: range)
 	}
@@ -119,9 +119,9 @@ public class StyleRegEx: StyleProtocol {
 			(result : NSTextCheckingResult?, _, _) in
 			if let r = result {
 				if add {
-					str.addAttributes(self.renderingAttributes, range: r.range)
+					str.addAttributes(self.attributes, range: r.range)
 				} else {
-					str.setAttributes(self.renderingAttributes, range: r.range)
+					str.setAttributes(self.attributes, range: r.range)
 				}
 			}
 		}

SwiftRichString.xcodeproj/xcuserdata/daniele.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Sources/SwiftRichString/Style/Style.swift"
-            timestampString = "569605751.212633"
+            timestampString = "569606555.43208"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "302"