Adjust REGEX to get FM (#173)

* Solve issue #158 * Apply suggestions from code review --------- Co-authored-by: Andy Damevin <[email protected]>
quarkiverse · Oct 11, 2024 · e0632b7 · e0632b7
1 parent 8693bff
commit e0632b7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/...main/java/io/quarkiverse/roq/frontmatter/deployment/scan/RoqFrontMatterScanProcessor.java b/...main/java/io/quarkiverse/roq/frontmatter/deployment/scan/RoqFrontMatterScanProcessor.java
@@ -40,7 +40,7 @@
 public class RoqFrontMatterScanProcessor {
     private static final Logger LOGGER = org.jboss.logging.Logger.getLogger(RoqFrontMatterScanProcessor.class);
     private static final Set<String> SUPPORTED_LAYOUT_EXTENSIONS = Set.of(".md", "markdown", ".html", ".asciidoc", ".adoc");
-    public static final Pattern FRONTMATTER_PATTERN = Pattern.compile("^---\\v.*\\v---\\v", Pattern.DOTALL);
+    public static final Pattern FRONTMATTER_PATTERN = Pattern.compile("^---\\v.*?---\\v", Pattern.DOTALL);
     private static final String DRAFT_KEY = "draft";
     private static final String DATE_KEY = "date";
     private static final String LAYOUT_KEY = "layout";
@@ -283,7 +283,7 @@ private static String getFrontMatter(String content) {
     }
 
     private static String stripFrontMatter(String content) {
-        return FRONTMATTER_PATTERN.matcher(content).replaceAll("");
+        return FRONTMATTER_PATTERN.matcher(content).replaceFirst("");
     }
 
     private static boolean hasFrontMatter(String content) {

diff --git a/...eployment/src/test/java/io/quarkiverse/roq/frontmatter/deployment/RoqFrontMatterTest.java b/...eployment/src/test/java/io/quarkiverse/roq/frontmatter/deployment/RoqFrontMatterTest.java
@@ -65,4 +65,10 @@ public void testDateFileName() {
                 .body("html.body.article.span", equalTo("2020-10-24T12:00Z[UTC]"));
     }
 
+    @Test
+    public void testFrontMatterInContent() {
+        RestAssured.when().get("/bar/posts/markdown-post-k8s").then().statusCode(200).log().ifValidationFails()
+                .body(containsString("A K8S post made with markdown"));
+    }
+
 }
diff --git a/roq-frontmatter/deployment/src/test/resources/site/_posts/markdown-post-k8s.md b/roq-frontmatter/deployment/src/test/resources/site/_posts/markdown-post-k8s.md
@@ -0,0 +1,19 @@
+---
+k8s: true
+layout: post
+title: K8S Post
+description: This aims to solve the issue 158
+foo: bar
+date: 2024-09-09 10:45:00 +0200
+---
+
+# A K8S post made with markdown
+
+```yaml
+---
+kind: Deployment
+---
+kind: Pod
+```
+
+Hello!