GutenbergExcerptGenerator to always add ellipsis even for shorter posts

Author: kean

Modules/Sources/WordPressShared/Utility/GutenbergExcerptGenerator.swift

@@ -18,21 +18,19 @@ public struct GutenbergExcerptGenerator {
         let rawText = String(content[tagEnd.upperBound..<pEnd.lowerBound])
             .replacingOccurrences(of: "<br\\s*/?>", with: " ", options: .regularExpression)
 
-        // Remove HTML tags AND shortcodes in one pass
         let range = NSRange(rawText.startIndex..., in: rawText)
-        let text = (regex?.stringByReplacingMatches(in: rawText, options: [], range: range, withTemplate: "") ?? rawText)
+        var text = (regex?.stringByReplacingMatches(in: rawText, options: [], range: range, withTemplate: "") ?? rawText)
             .stringByDecodingXMLCharacters()
             .trimmingCharacters(in: .whitespacesAndNewlines)
 
-        // Truncate if needed
-        if text.count <= maxLength {
-            return text
+        if text.count > maxLength {
+            let truncated = String(text.prefix(maxLength))
+            text = truncated.lastIndex(of: " ").map { String(truncated[..<$0]) } ?? truncated
         }
 
-        let truncated = String(text.prefix(maxLength))
-        if let lastSpace = truncated.lastIndex(of: " ") {
-            return String(truncated[..<lastSpace]) + "…"
+        if text.hasSuffix(".") {
+            text = String(text.dropLast())
         }
-        return truncated + "…"
+        return text + "…"
     }
 }

Modules/Tests/WordPressSharedTests/GutenbergExcerptGeneratorTests.swift

@@ -14,29 +14,29 @@ struct GutenbergPostExcerptGeneratorTests {
         let content = "<!-- wp:gallery {\"ids\":[2315,2309,2308]} --><figure class=\"wp-block-gallery columns-3 is-cropped\"><ul class=\"blocks-gallery-grid\"><li class=\"blocks-gallery-item\"><figure><img src=\"https://diegotest4.files.wordpress.com/2020/01/img_0005-1-1.jpg\" data-id=\"2315\" class=\"wp-image-2315\"/><figcaption class=\"blocks-gallery-item__caption\">Asdasdasd</figcaption></figure></li><li class=\"blocks-gallery-item\"><figure><img src=\"https://diegotest4.files.wordpress.com/2020/01/img_0111-1-1.jpg\" data-id=\"2309\" class=\"wp-image-2309\"/><figcaption class=\"blocks-gallery-item__caption\">Asdasdasd</figcaption></figure></li><li class=\"blocks-gallery-item\"><figure><img src=\"https://diegotest4.files.wordpress.com/2020/01/img_0004-1.jpg\" data-id=\"2308\" class=\"wp-image-2308\"/><figcaption class=\"blocks-gallery-item__caption\">Adsasdasdasd</figcaption></figure></li></ul></figure><!-- /wp:gallery --><p>Some Content</p>"
 
         let summary = GutenbergExcerptGenerator.firstParagraph(from: content, maxLength: 150)
-        #expect(summary == "Some Content")
+        #expect(summary == "Some Content…")
     }
 
     @Test func summaryForContentWithGallery2() {
         let content = "<p>Before</p>\n<!-- wp:gallery {\"ids\":[2315,2309,2308]} --><figure class=\"wp-block-gallery columns-3 is-cropped\"><ul class=\"blocks-gallery-grid\"><li class=\"blocks-gallery-item\"><figure><img src=\"https://diegotest4.files.wordpress.com/2020/01/img_0005-1-1.jpg\" data-id=\"2315\" class=\"wp-image-2315\"/><figcaption class=\"blocks-gallery-item__caption\">Asdasdasd</figcaption></figure></li><li class=\"blocks-gallery-item\"><figure><img src=\"https://diegotest4.files.wordpress.com/2020/01/img_0111-1-1.jpg\" data-id=\"2309\" class=\"wp-image-2309\"/><figcaption class=\"blocks-gallery-item__caption\">Asdasdasd</figcaption></figure></li><li class=\"blocks-gallery-item\"><figure><img src=\"https://diegotest4.files.wordpress.com/2020/01/img_0004-1.jpg\" data-id=\"2308\" class=\"wp-image-2308\"/><figcaption class=\"blocks-gallery-item__caption\">Adsasdasdasd</figcaption></figure></li></ul></figure><!-- /wp:gallery --><p>After</p>"
 
         let summary = GutenbergExcerptGenerator.firstParagraph(from: content, maxLength: 150)
-        #expect(summary == "Before")
+        #expect(summary == "Before…")
     }
 
     @Test
     func testVideoPressBlock() {
         let content = "<p>Before</p>\n<!-- wp:videopress/video {\"title\":\"demo\",\"description\":\"\",\"id\":5297,\"guid\":\"AbCDe\",\"videoRatio\":56.333333333333336,\"privacySetting\":2,\"allowDownload\":false,\"rating\":\"G\",\"isPrivate\":true,\"duration\":1673} -->\n<figure class=\"wp-block-videopress-video wp-block-jetpack-videopress jetpack-videopress-player\"><div class=\"jetpack-videopress-player__wrapper\">\nhttps://videopress.com/v/AbCDe?resizeToParent=true&amp;cover=true&amp;preloadContent=metadata&amp;useAverageColor=true\n</div></figure>\n<!-- /wp:videopress/video -->\n<p>After</p>"
 
         let summary = GutenbergExcerptGenerator.firstParagraph(from: content, maxLength: 150)
-        #expect(summary == "Before")
+        #expect(summary == "Before…")
     }
 
     @Test func testPostWithBRTags() {
         let content = #"<p class="wp-block-paragraph">Yes,<br>look behind<br>in remembrance and with gratitude.</p><p class="wp-block-paragraph">Then,<br>stay present,<br>or miss memories in the making.</p>"#
 
         let summary = GutenbergExcerptGenerator.firstParagraph(from: content, maxLength: 150)
         print(summary)
-        #expect(summary == "Yes, look behind in remembrance and with gratitude.")
+        #expect(summary == "Yes, look behind in remembrance and with gratitude…")
     }
 }