Merge pull request #30 from 5anniversary/font_family_n_text_align

zhgchgli0718 · web-flow · commit fb2264bcbf58 · 2023-08-27T16:04:26.000+08:00
[Feat] text align style
diff --git a/Sources/ZMarkupParser/Core/Markup/Markups/HeadMarkup.swift b/Sources/ZMarkupParser/Core/Markup/Markups/HeadMarkup.swift
@@ -17,9 +17,9 @@ final class HeadMarkup: Markup {
         case h6
     }
     
-    let levle: Level
-    init(levle: Level) {
-        self.levle = levle
+    let level: Level
+    init(level: Level) {
+        self.level = level
     }
     
     weak var parentMarkup: Markup? = nil
diff --git a/Sources/ZMarkupParser/HTML/HTMLTag/HTMLTagStyleAttribute/HTMLTagStyleAttributeVisitor.swift b/Sources/ZMarkupParser/HTML/HTMLTag/HTMLTagStyleAttribute/HTMLTagStyleAttributeVisitor.swift
@@ -19,6 +19,7 @@ public protocol HTMLTagStyleAttributeVisitor {
     func visit(_ styleAttribute: FontFamilyHTMLTagStyleAttribute) -> Result
     func visit(_ styleAttribute: LineHeightHTMLTagStyleAttribute) -> Result
     func visit(_ styleAttribute: WordSpacingHTMLTagStyleAttribute) -> Result
+    func visit(_ styleAttribute: TextAlignHTMLTagStyleAttribute) -> Result
 }
 
 public extension HTMLTagStyleAttributeVisitor {
@@ -36,7 +37,8 @@ public extension ZHTMLParserBuilder {
             FontWeightHTMLTagStyleAttribute(),
             LineHeightHTMLTagStyleAttribute(),
             WordSpacingHTMLTagStyleAttribute(),
-            FontFamilyHTMLTagStyleAttribute()
+            FontFamilyHTMLTagStyleAttribute(),
+            TextAlignHTMLTagStyleAttribute()
         ]
     }
 }
diff --git a/Sources/ZMarkupParser/HTML/HTMLTag/HTMLTagStyleAttribute/HTMLTagStyleAttributes/TextAlignHTMLTagStyleAttribute.swift b/Sources/ZMarkupParser/HTML/HTMLTag/HTMLTagStyleAttribute/HTMLTagStyleAttributes/TextAlignHTMLTagStyleAttribute.swift
@@ -0,0 +1,19 @@
+//
+ //  TextAlignHTMLTagStyleAttribute.swift
+ //
+ //
+ //  Created by 오준현 on 2023/08/10.
+ //
+ import Foundation
+
+ public struct TextAlignHTMLTagStyleAttribute: HTMLTagStyleAttribute {
+     public let styleName: String = "text-align"
+
+     public init() {
+
+     }
+
+     public func accept<V>(_ visitor: V) -> V.Result where V : HTMLTagStyleAttributeVisitor {
+         return visitor.visit(self)
+     }
+ }
diff --git a/Sources/ZMarkupParser/HTML/Processor/HTMLElementMarkupComponentMarkupStyleVisitor.swift b/Sources/ZMarkupParser/HTML/Processor/HTMLElementMarkupComponentMarkupStyleVisitor.swift
@@ -96,7 +96,7 @@ struct HTMLElementMarkupComponentMarkupStyleVisitor: MarkupVisitor {
     
     func visit(_ markup: HeadMarkup) -> Result {
         let defaultStyle: MarkupStyle?
-        switch markup.levle {
+        switch markup.level {
         case .h1:
             defaultStyle = .h1
         case .h2:
diff --git a/Sources/ZMarkupParser/HTML/Processor/HTMLTagAttributeToMarkupStyleVisitor.swift b/Sources/ZMarkupParser/HTML/Processor/HTMLTagAttributeToMarkupStyleVisitor.swift
@@ -92,22 +92,47 @@ struct HTMLTagStyleAttributeToMarkupStyleVisitor: HTMLTagStyleAttributeVisitor {
     
     func visit(_ styleAttribute: LineHeightHTMLTagStyleAttribute) -> Result {
         guard let lineHeightFloat = self.convert(fromPX: value) else { return nil }
-        return MarkupStyle(paragraphStyle: MarkupStyleParagraphStyle(minimumLineHeight: CGFloat(lineHeightFloat), maximumLineHeight: CGFloat(lineHeightFloat)))
+        return MarkupStyle(paragraphStyle: MarkupStyleParagraphStyle(minimumLineHeight: lineHeightFloat, maximumLineHeight: lineHeightFloat))
     }
     
     func visit(_ styleAttribute: WordSpacingHTMLTagStyleAttribute) -> Result {
         guard let lineSpacing = self.convert(fromPX: value) else { return nil }
-        return MarkupStyle(paragraphStyle: MarkupStyleParagraphStyle(lineSpacing: CGFloat(lineSpacing)))
+        return MarkupStyle(paragraphStyle: MarkupStyleParagraphStyle(lineSpacing: lineSpacing))
     }
     
-    func convert(fromPX string: String) -> Int? {
-        guard let regex = try? NSRegularExpression(pattern: "([0-9]+)p(x|t)"),
+    func convert(fromPX string: String) -> CGFloat? {
+        guard let regex = try? NSRegularExpression(pattern: "([0-9]+.?[0-9]*)p(x|t)"),
               let firstMatch = regex.firstMatch(in: string, options: [], range: NSRange(location: 0, length: string.utf16.count)),
               firstMatch.range(at: 1).location != NSNotFound,
               let range = Range(firstMatch.range(at: 1), in: string),
               let size = Float(String(string[range])) else {
             return nil
         }
-        return Int(size)
+        return CGFloat(size)
     }
+
+    func visit(_ styleAttribute: TextAlignHTMLTagStyleAttribute) -> MarkupStyle? {
+         return MarkupStyle(
+             paragraphStyle: MarkupStyleParagraphStyle(
+                 alignment: convertAlign(align: value)
+             )
+         )
+     }
+
+    private func convertAlign(align: String) -> NSTextAlignment? {
+         switch align {
+         case "center":
+             return .center
+         case "justified":
+             return .justified
+         case "natural":
+             return .natural
+         case "right":
+             return .right
+         case "left":
+             return .left
+         default:
+             return nil
+         }
+     }
 }
diff --git a/Sources/ZMarkupParser/HTML/Processor/HTMLTagNameToHTMLMarkupVisitor.swift b/Sources/ZMarkupParser/HTML/Processor/HTMLTagNameToHTMLMarkupVisitor.swift
@@ -114,27 +114,27 @@ struct HTMLTagNameToMarkupVisitor: HTMLTagNameVisitor {
     }
     
     func visit(_ tagName: H1_HTMLTagName) -> Result {
-        return  HeadMarkup(levle: .h1)
+        return  HeadMarkup(level: .h1)
     }
     
     func visit(_ tagName: H2_HTMLTagName) -> Result {
-        return  HeadMarkup(levle: .h2)
+        return  HeadMarkup(level: .h2)
     }
     
     func visit(_ tagName: H3_HTMLTagName) -> Result {
-        return  HeadMarkup(levle: .h3)
+        return  HeadMarkup(level: .h3)
     }
     
     func visit(_ tagName: H4_HTMLTagName) -> Result {
-        return  HeadMarkup(levle: .h4)
+        return  HeadMarkup(level: .h4)
     }
     
     func visit(_ tagName: H5_HTMLTagName) -> Result {
-        return  HeadMarkup(levle: .h5)
+        return  HeadMarkup(level: .h5)
     }
     
     func visit(_ tagName: H6_HTMLTagName) -> Result {
-        return  HeadMarkup(levle: .h6)
+        return  HeadMarkup(level: .h6)
     }
     
     func visit(_ tagName: S_HTMLTagName) -> Result {
diff --git a/Tests/ZMarkupParserTests/HTML/AllTagStyleAttributesHasAddToBuilderDefaultListTests.swift b/Tests/ZMarkupParserTests/HTML/AllTagStyleAttributesHasAddToBuilderDefaultListTests.swift
@@ -15,7 +15,7 @@ final class AllTagStyleAttributesHasAddToBuilderDefaultListTests: XCTestCase {
         ZHTMLParserBuilder.styleAttributes.forEach { style in
             let _ = visitor.visit(styleAttribute: style)
         }
-        XCTAssertEqual(visitor.count, 7, "Must added new pre-defined HTMLTagStyleAttribute to ZHTMLParserBuilder.styleAttributes")
+        XCTAssertEqual(visitor.count, 8, "Must added new pre-defined HTMLTagStyleAttribute to ZHTMLParserBuilder.styleAttributes")
     }
 }
 
@@ -63,4 +63,9 @@ private class StubVisitor: HTMLTagStyleAttributeVisitor {
         count += 1
         return count
     }
+
+    func visit(_ styleAttribute: TextAlignHTMLTagStyleAttribute) -> Int {
+        count += 1
+        return count
+    }
 }
diff --git a/Tests/ZMarkupParserTests/HTML/HTMLElementMarkupComponentMarkupStyleVisitorTests.swift b/Tests/ZMarkupParserTests/HTML/HTMLElementMarkupComponentMarkupStyleVisitorTests.swift
@@ -14,7 +14,7 @@ final class HTMLElementMarkupComponentMarkupStyleVisitorTests: XCTestCase {
     func testDefaultStyleByDefault() {
         let visitor = HTMLElementMarkupComponentMarkupStyleVisitor(policy: .respectMarkupStyleFromCode, components: [], styleAttributes: [])
         
-        let result = visitor.visit(markup: HeadMarkup(levle: .h1))
+        let result = visitor.visit(markup: HeadMarkup(level: .h1))
         XCTAssertEqual(result?.font.size, MarkupStyle.h1.font.size)
     }
     
@@ -28,7 +28,7 @@ final class HTMLElementMarkupComponentMarkupStyleVisitorTests: XCTestCase {
     }
     
     func testDefaultStyleShouldOverrideByCustomStyle() {
-        let markup = HeadMarkup(levle: .h1)
+        let markup = HeadMarkup(level: .h1)
         let customStyle = MarkupStyle(font: .init(size: 99))
         let visitor = HTMLElementMarkupComponentMarkupStyleVisitor(policy: .respectMarkupStyleFromCode, components: [.init(markup: markup, value: .init(tag: .init(tagName: H1_HTMLTagName(), customStyle: customStyle), tagAttributedString: NSAttributedString(string: "<h1>test</h1>"), attributes: [:]))], styleAttributes: [])
         
@@ -37,15 +37,15 @@ final class HTMLElementMarkupComponentMarkupStyleVisitorTests: XCTestCase {
     }
     
     func testDefaultStyleShouldOverrideByStyleAttributed() {
-        let markup = HeadMarkup(levle: .h1)
+        let markup = HeadMarkup(level: .h1)
         let visitor = HTMLElementMarkupComponentMarkupStyleVisitor(policy: .respectMarkupStyleFromCode, components: [.init(markup: markup, value: .init(tag: .init(tagName: H1_HTMLTagName()), tagAttributedString: NSAttributedString(string: "<h1>test</h1>"), attributes: ["style": "font-size:99pt"]))], styleAttributes: [FontSizeHTMLTagStyleAttribute()])
         
         let result = visitor.visit(markup: markup)
         XCTAssertEqual(result?.font.size, 99)
     }
     
     func testDefaultStylePolicyRespectMarkupStyleFromCode() {
-        let markup = HeadMarkup(levle: .h1)
+        let markup = HeadMarkup(level: .h1)
         let customStyle = MarkupStyle(font: .init(size: 109))
         let visitor = HTMLElementMarkupComponentMarkupStyleVisitor(policy: .respectMarkupStyleFromCode, components: [.init(markup: markup, value: .init(tag: .init(tagName: H1_HTMLTagName(), customStyle: customStyle), tagAttributedString: NSAttributedString(string: "<h1>test</h1>"), attributes: ["style": "font-size:99pt"]))], styleAttributes: [FontSizeHTMLTagStyleAttribute()])
         
@@ -54,7 +54,7 @@ final class HTMLElementMarkupComponentMarkupStyleVisitorTests: XCTestCase {
     }
     
     func testDefaultStylePolicyRespectMarkupStyleFromHTMLStyleAttribute() {
-        let markup = HeadMarkup(levle: .h1)
+        let markup = HeadMarkup(level: .h1)
         let customStyle = MarkupStyle(font: .init(size: 109))
         let visitor = HTMLElementMarkupComponentMarkupStyleVisitor(policy: .respectMarkupStyleFromHTMLStyleAttribute, components: [.init(markup: markup, value: .init(tag: .init(tagName: H1_HTMLTagName(), customStyle: customStyle), tagAttributedString: NSAttributedString(string: "<h1>test</h1>"), attributes: ["style": "font-size:99pt"]))], styleAttributes: [FontSizeHTMLTagStyleAttribute()])
         

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ final class HeadMarkup: Markup {`
`17`	`17`	`case h6`
`18`	`18`	`}`
`19`	`19`
`20`		`- let levle: Level`
`21`		`- init(levle: Level) {`
`22`		`- self.levle = levle`
	`20`	`+ let level: Level`
	`21`	`+ init(level: Level) {`
	`22`	`+ self.level = level`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`weak var parentMarkup: Markup? = nil`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public protocol HTMLTagStyleAttributeVisitor {`
`19`	`19`	`func visit(_ styleAttribute: FontFamilyHTMLTagStyleAttribute) -> Result`
`20`	`20`	`func visit(_ styleAttribute: LineHeightHTMLTagStyleAttribute) -> Result`
`21`	`21`	`func visit(_ styleAttribute: WordSpacingHTMLTagStyleAttribute) -> Result`
	`22`	`+ func visit(_ styleAttribute: TextAlignHTMLTagStyleAttribute) -> Result`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`public extension HTMLTagStyleAttributeVisitor {`
`@@ -36,7 +37,8 @@ public extension ZHTMLParserBuilder {`
`36`	`37`	`FontWeightHTMLTagStyleAttribute(),`
`37`	`38`	`LineHeightHTMLTagStyleAttribute(),`
`38`	`39`	`WordSpacingHTMLTagStyleAttribute(),`
`39`		`- FontFamilyHTMLTagStyleAttribute()`
	`40`	`+ FontFamilyHTMLTagStyleAttribute(),`
	`41`	`+ TextAlignHTMLTagStyleAttribute()`
`40`	`42`	`]`
`41`	`43`	`}`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,27 +114,27 @@ struct HTMLTagNameToMarkupVisitor: HTMLTagNameVisitor {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`func visit(_ tagName: H1_HTMLTagName) -> Result {`
`117`		`- return HeadMarkup(levle: .h1)`
	`117`	`+ return HeadMarkup(level: .h1)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func visit(_ tagName: H2_HTMLTagName) -> Result {`
`121`		`- return HeadMarkup(levle: .h2)`
	`121`	`+ return HeadMarkup(level: .h2)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`func visit(_ tagName: H3_HTMLTagName) -> Result {`
`125`		`- return HeadMarkup(levle: .h3)`
	`125`	`+ return HeadMarkup(level: .h3)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`func visit(_ tagName: H4_HTMLTagName) -> Result {`
`129`		`- return HeadMarkup(levle: .h4)`
	`129`	`+ return HeadMarkup(level: .h4)`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`func visit(_ tagName: H5_HTMLTagName) -> Result {`
`133`		`- return HeadMarkup(levle: .h5)`
	`133`	`+ return HeadMarkup(level: .h5)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`func visit(_ tagName: H6_HTMLTagName) -> Result {`
`137`		`- return HeadMarkup(levle: .h6)`
	`137`	`+ return HeadMarkup(level: .h6)`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`func visit(_ tagName: S_HTMLTagName) -> Result {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class AllTagStyleAttributesHasAddToBuilderDefaultListTests: XCTestCase {`
`15`	`15`	`ZHTMLParserBuilder.styleAttributes.forEach { style in`
`16`	`16`	`let _ = visitor.visit(styleAttribute: style)`
`17`	`17`	`}`
`18`		`- XCTAssertEqual(visitor.count, 7, "Must added new pre-defined HTMLTagStyleAttribute to ZHTMLParserBuilder.styleAttributes")`
	`18`	`+ XCTAssertEqual(visitor.count, 8, "Must added new pre-defined HTMLTagStyleAttribute to ZHTMLParserBuilder.styleAttributes")`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`@@ -63,4 +63,9 @@ private class StubVisitor: HTMLTagStyleAttributeVisitor {`
`63`	`63`	`count += 1`
`64`	`64`	`return count`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ func visit(_ styleAttribute: TextAlignHTMLTagStyleAttribute) -> Int {`
	`68`	`+ count += 1`
	`69`	`+ return count`
	`70`	`+ }`
`66`	`71`	`}`