WIP

Author: abelsromero

asciidoctor-maven-commons/src/main/java/org/asciidoctor/maven/site/HeadParser.java

@@ -9,6 +9,8 @@
  * This allows Doxia to build:
  * - breadcrumbs
  * - HTML head's meta elements
+ *
+ * @since 3.0.0
  */
 public class HeadParser {
 

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/AsciidoctorAstDoxiaParser.java

@@ -110,8 +110,7 @@ public void parse(Reader reader, Sink sink, String reference) throws ParseExcept
         new HeadParser(sink)
             .parse(headerMetadata);
 
-        // TODO do body inside the DocumentNodeProcessor
-        new NodeProcessorProvider(sink)
+        new NodeSinker(sink)
             .sink(document);
     }
 

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/NodeProcessorProvider.java renamed to asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/NodeSinker.java

@@ -21,11 +21,12 @@
  * @author abelsromero
  * @since 3.1.0
  */
-public class NodeProcessorProvider {
+public class NodeSinker {
 
     private final List<NodeProcessor> nodeProcessors;
 
-    NodeProcessorProvider(Sink sink) {
+    // TODO this should not be public
+    public NodeSinker(Sink sink) {
         nodeProcessors = Arrays.asList(
             new DocumentNodeProcessor(sink, this),
             new ImageNodeProcessor(sink, this),

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/processors/AbstractSinkNodeProcessor.java

@@ -3,7 +3,7 @@
 import org.apache.maven.doxia.sink.Sink;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.ast.StructuralNode;
-import org.asciidoctor.maven.site.parser.NodeProcessorProvider;
+import org.asciidoctor.maven.site.parser.NodeSinker;
 
 /**
  * Recommended base case to build a {@link org.asciidoctor.maven.site.parser.NodeProcessor}.
@@ -14,17 +14,17 @@
 public class AbstractSinkNodeProcessor {
 
     private final Sink sink;
-
-    private final NodeProcessorProvider nodeProcessorProvider;
+    private final NodeSinker nodeSinker;
 
     /**
      * Constructor.
      *
-     * @param sink Doxia {@link Sink}
+     * @param sink       Doxia {@link Sink}
+     * @param nodeSinker
      */
-    public AbstractSinkNodeProcessor(Sink sink, NodeProcessorProvider nodeProcessorProvider) {
+    public AbstractSinkNodeProcessor(Sink sink, NodeSinker nodeSinker) {
         this.sink = sink;
-        this.nodeProcessorProvider = nodeProcessorProvider;
+        this.nodeSinker = nodeSinker;
     }
 
     /**
@@ -36,9 +36,15 @@ protected Sink getSink() {
         return sink;
     }
 
-    // TODO rethink names
-    protected void next(StructuralNode node) {
-        nodeProcessorProvider.sink(node);
+    /**
+     * Delegates the processing of the new node to the appropriate processor.
+     * Similar to {@link org.asciidoctor.maven.site.parser.NodeProcessor#process(StructuralNode)}
+     * but this selects the processor from the ones available.
+     *
+     * @param node Node to process
+     */
+    protected void sink(StructuralNode node) {
+        nodeSinker.sink(node);
     }
 
     /**

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/processors/DescriptionListNodeProcessor.java

@@ -8,7 +8,7 @@
 import org.asciidoctor.ast.ListItem;
 import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.maven.site.parser.NodeProcessor;
-import org.asciidoctor.maven.site.parser.NodeProcessorProvider;
+import org.asciidoctor.maven.site.parser.NodeSinker;
 
 /**
  * Description list processor.
@@ -21,11 +21,11 @@ public class DescriptionListNodeProcessor extends AbstractSinkNodeProcessor impl
     /**
      * Constructor.
      *
-     * @param sink                  Doxia {@link Sink}
-     * @param nodeProcessorProvider
+     * @param sink       Doxia {@link Sink}
+     * @param nodeSinker
      */
-    public DescriptionListNodeProcessor(Sink sink, NodeProcessorProvider nodeProcessorProvider) {
-        super(sink, nodeProcessorProvider);
+    public DescriptionListNodeProcessor(Sink sink, NodeSinker nodeSinker) {
+        super(sink, nodeSinker);
     }
 
     @Override
@@ -58,7 +58,7 @@ public void process(StructuralNode node) {
                 if (description.getBlocks().isEmpty()) {
                     sink.rawText(description.getText());
                 } else {
-                    next(node);
+                    sink(node);
                 }
                 sink.definition_();
             }

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/processors/DocumentNodeProcessor.java

@@ -3,7 +3,7 @@
 import org.apache.maven.doxia.sink.Sink;
 import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.maven.site.parser.NodeProcessor;
-import org.asciidoctor.maven.site.parser.NodeProcessorProvider;
+import org.asciidoctor.maven.site.parser.NodeSinker;
 
 /**
  * Root document processor.
@@ -18,8 +18,8 @@ public class DocumentNodeProcessor extends AbstractSinkNodeProcessor implements
      *
      * @param sink Doxia {@link Sink}
      */
-    public DocumentNodeProcessor(Sink sink, NodeProcessorProvider nodeProcessorProvider) {
-        super(sink, nodeProcessorProvider);
+    public DocumentNodeProcessor(Sink sink, NodeSinker nodeSinker) {
+        super(sink, nodeSinker);
     }
 
     @Override
@@ -29,13 +29,17 @@ public boolean applies(StructuralNode node) {
 
     @Override
     public void process(StructuralNode node) {
-        getSink().body();
-        // NOTE: H1 generation fixed in doxia 2.0.0-MX
-        getSink().rawText(String.format("<h1>%s</h1>", node.getTitle()));
+        final Sink sink = getSink();
+
+        sink.body();
+        // TODO review how this fits with Section titles also being 1
+        sink.sectionTitle1();
+        sink.rawText(node.getTitle());
+        sink.sectionTitle1_();
 
         node.getBlocks()
-            .forEach(super::next);
+            .forEach(this::sink);
 
-        getSink().body_();
+        sink.body_();
     }
 }

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/processors/ImageNodeProcessor.java

@@ -7,7 +7,7 @@
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
 import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.maven.site.parser.NodeProcessor;
-import org.asciidoctor.maven.site.parser.NodeProcessorProvider;
+import org.asciidoctor.maven.site.parser.NodeSinker;
 
 import static org.asciidoctor.maven.commons.StringUtils.isBlank;
 
@@ -22,11 +22,11 @@ public class ImageNodeProcessor extends AbstractSinkNodeProcessor implements Nod
     /**
      * Constructor.
      *
-     * @param sink                  Doxia {@link Sink}
-     * @param nodeProcessorProvider
+     * @param sink       Doxia {@link Sink}
+     * @param nodeSinker
      */
-    public ImageNodeProcessor(Sink sink, NodeProcessorProvider nodeProcessorProvider) {
-        super(sink, nodeProcessorProvider);
+    public ImageNodeProcessor(Sink sink, NodeSinker nodeSinker) {
+        super(sink, nodeSinker);
     }
 
     @Override

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/processors/ListItemNodeProcessor.java

@@ -4,7 +4,7 @@
 import org.asciidoctor.ast.ListItem;
 import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.maven.site.parser.NodeProcessor;
-import org.asciidoctor.maven.site.parser.NodeProcessorProvider;
+import org.asciidoctor.maven.site.parser.NodeSinker;
 
 /**
  * List items processor, including numbered and unnumbered.
@@ -17,11 +17,11 @@ public class ListItemNodeProcessor extends AbstractSinkNodeProcessor implements
     /**
      * Constructor.
      *
-     * @param sink                  Doxia {@link Sink}
-     * @param nodeProcessorProvider
+     * @param sink       Doxia {@link Sink}
+     * @param nodeSinker
      */
-    public ListItemNodeProcessor(Sink sink, NodeProcessorProvider nodeProcessorProvider) {
-        super(sink, nodeProcessorProvider);
+    public ListItemNodeProcessor(Sink sink, NodeSinker nodeSinker) {
+        super(sink, nodeSinker);
     }
 
     @Override
@@ -48,7 +48,7 @@ public void process(StructuralNode node) {
         final String text = item.getText();
         sink.rawText(text == null ? "" : text);
 
-        node.getBlocks().forEach(this::next);
+        node.getBlocks().forEach(this::sink);
 
         switch (listType) {
             case ordered:

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/processors/ListingNodeProcessor.java

@@ -5,7 +5,7 @@
 import org.asciidoctor.jruby.ast.impl.BlockImpl;
 import org.asciidoctor.maven.commons.StringUtils;
 import org.asciidoctor.maven.site.parser.NodeProcessor;
-import org.asciidoctor.maven.site.parser.NodeProcessorProvider;
+import org.asciidoctor.maven.site.parser.NodeSinker;
 
 import static org.asciidoctor.maven.commons.StringUtils.isNotBlank;
 
@@ -25,11 +25,11 @@ public class ListingNodeProcessor extends AbstractSinkNodeProcessor implements N
     /**
      * Constructor.
      *
-     * @param sink                  Doxia {@link Sink}
-     * @param nodeProcessorProvider
+     * @param sink       Doxia {@link Sink}
+     * @param nodeSinker
      */
-    public ListingNodeProcessor(Sink sink, NodeProcessorProvider nodeProcessorProvider) {
-        super(sink, nodeProcessorProvider);
+    public ListingNodeProcessor(Sink sink, NodeSinker nodeSinker) {
+        super(sink, nodeSinker);
     }
 
     @Override
@@ -56,7 +56,7 @@ public void process(StructuralNode node) {
             }
 
             contentBuilder.append("<pre class=\"")
-                    .append(FLUIDO_SKIN_SOURCE_HIGHLIGHTER);
+                .append(FLUIDO_SKIN_SOURCE_HIGHLIGHTER);
             if (isLinenumsEnabled(node))
                 contentBuilder.append(" linenums");
 
@@ -67,9 +67,7 @@ public void process(StructuralNode node) {
             contentBuilder.append("<pre>");
         }
 
-        // TODO validate delegation works
-        node.getBlocks().forEach(this::next);
-        //contentBuilder.append(((BlockImpl) node).getSource());
+        contentBuilder.append(((BlockImpl) node).getSource());
 
         if (isSourceBlock) {
             contentBuilder.append("</code>");
@@ -83,7 +81,7 @@ public void process(StructuralNode node) {
     private boolean isLinenumsEnabled(StructuralNode node) {
         // linenums attribute can be set with empty string value
         return LINENUMS_ATTRIBUTE.equals(node.getAttribute("linenums"))
-                || node.getAttribute(LINENUMS_OPTION_ATTRIBUTE) != null;
+            || node.getAttribute(LINENUMS_OPTION_ATTRIBUTE) != null;
     }
 
     private boolean isSourceBlock(String language, String style) {

asciidoctor-parser-doxia-module/src/main/java/org/asciidoctor/maven/site/parser/processors/LiteralNodeProcessor.java

@@ -4,7 +4,7 @@
 import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.jruby.ast.impl.BlockImpl;
 import org.asciidoctor.maven.site.parser.NodeProcessor;
-import org.asciidoctor.maven.site.parser.NodeProcessorProvider;
+import org.asciidoctor.maven.site.parser.NodeSinker;
 
 /**
  * Literal (aka. monospace) text processor.
@@ -17,11 +17,11 @@ public class LiteralNodeProcessor extends AbstractSinkNodeProcessor implements N
     /**
      * Constructor.
      *
-     * @param sink                  Doxia {@link Sink}
-     * @param nodeProcessorProvider
+     * @param sink       Doxia {@link Sink}
+     * @param nodeSinker
      */
-    public LiteralNodeProcessor(Sink sink, NodeProcessorProvider nodeProcessorProvider) {
-        super(sink, nodeProcessorProvider);
+    public LiteralNodeProcessor(Sink sink, NodeSinker nodeSinker) {
+        super(sink, nodeSinker);
     }
 
     @Override
@@ -35,11 +35,8 @@ public void process(StructuralNode node) {
 
         sink.division();
         sink.rawText("<pre>");
-        // TODO see if this can be delegated now
-        node.getBlocks().forEach(this::next);
-        // contentBuilder.append(((BlockImpl) node).getSource());
-
-        sink.rawText("/<pre>");
+        sink.rawText(((BlockImpl) node).getSource());
+        sink.rawText("</pre>");
         sink.division_();
     }
 }