Integrate GutenbergExcerptGenerator

Author: kean

Modules/Sources/WordPressKitModels/NSString+Summary.swift

@@ -5,77 +5,19 @@ import WordPressShared
 /// and convert HTML into plain text.
 ///
 extension NSString {
-
-    static let PostDerivedSummaryLength = 150
-
     /// Create a summary for the post based on the post's content.
     ///
     /// - Returns: A summary for the post.
     ///
     @objc
     public func wpkit_summarized() -> String {
-        let characterSet = CharacterSet(charactersIn: "\n")
-
-        return (self as String).strippingGutenbergContentForExcerpt()
-            .replacingOccurrences(of: "<br\\s*/?>", with: " ", options: .regularExpression)
-            .strippingShortcodes()
-            .makePlainText()
-            .trimmingCharacters(in: characterSet)
-            .wp_stringByEllipsizing(withMaxLength: NSString.PostDerivedSummaryLength, preserveWords: true)
+        GutenbergExcerptGenerator.firstParagraph(from: (self as String))
     }
-}
 
-private extension String {
-    func makePlainText() -> String {
-        let characterSet = NSCharacterSet.whitespacesAndNewlines
-
-        return self.strippingHTML()
+    @objc
+    public func wpkit_makePlainText() -> String {
+        self.strippingHTML()
             .stringByDecodingXMLCharacters()
-            .trimmingCharacters(in: characterSet)
-    }
-
-    /// Creates a new string by stripping all shortcodes from this string.
-    ///
-    func strippingShortcodes() -> String {
-        let pattern = "\\[[^\\]]+\\]"
-
-        return removingMatches(pattern: pattern, options: .caseInsensitive)
-    }
-
-    /// This method is the main entry point to generate excerpts for Gutenberg content.
-    ///
-    func strippingGutenbergContentForExcerpt() -> String {
-        return strippingGutenbergGalleries().strippingGutenbergVideoPress()
-    }
-
-    /// Strips Gutenberg galleries from strings.
-    ///
-    func strippingGutenbergGalleries() -> String {
-        let pattern = "(?s)<!--\\swp:gallery?(.*?)wp:gallery\\s-->"
-
-        return removingMatches(pattern: pattern, options: .caseInsensitive)
-    }
-
-    /// Strips VideoPress references from Gutenberg VideoPress and Video blocks.
-    ///
-    func strippingGutenbergVideoPress() -> String {
-        let pattern = "(?s)\n?<!--\\swp:video.*?(.*?)wp:video.*?\\s-->"
-
-        return removingMatches(pattern: pattern, options: .caseInsensitive)
-    }
-
-    /// Creates a new string by removing all matches of the specified regex.
-    ///
-    func removingMatches(pattern: String, options: NSRegularExpression.Options = []) -> String {
-        let range = NSRange(location: 0, length: self.utf16.count)
-        let regex: NSRegularExpression
-
-        do {
-            regex = try NSRegularExpression(pattern: pattern, options: options)
-        } catch {
-            return self
-        }
-
-        return regex.stringByReplacingMatches(in: self, options: .reportCompletion, range: range, withTemplate: "")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
     }
 }

Modules/Sources/WordPressKitObjC/RemoteReaderPost.m

@@ -707,7 +707,7 @@ - (NSString *)createSummaryFromContent:(NSString *)string
  */
 - (NSString *)makePlainText:(NSString *)string
 {
-    return [string wpkit_summarized];
+    return [string wpkit_makePlainText];
 }
 
 /**