Merge pull request #52 from asciidoctor/asciidoctor-diagram-2.3.1

asciidoctor-diagram 2.3.1 and asciidoctor-diagram-plantuml 1.2024.5

Author: robertpanzer

.github/workflows/release.yaml

@@ -18,6 +18,16 @@ on:
         type: boolean
         default: true
         required: true
+      publishAsciidoctorJDiagramBatik:
+        description: "Publish asciidoctorj-diagram-batik"
+        type: boolean
+        default: true
+        required: true
+      publishAsciidoctorJDiagramJSyntrax:
+        description: "Publish asciidoctorj-diagram-jsyntrax"
+        type: boolean
+        default: true
+        required: true
 
 env:
   ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEY_ID }}
@@ -42,6 +52,8 @@ jobs:
           if ${{ inputs.publishAsciidoctorJDiagram }}; then GOALS="publishMavenAsciidoctorJDiagramPublicationToSonatypeRepository "; fi
           if ${{ inputs.publishAsciidoctorJDiagramDitaaMini }}; then GOALS="$GOALS publishMavenAsciidoctorJDiagramDitaaminiPublicationToSonatypeRepository "; fi
           if ${{ inputs.publishAsciidoctorJDiagramPlantuml }}; then GOALS="$GOALS publishMavenAsciidoctorJDiagramPlantumlPublicationToSonatypeRepository "; fi
+          if ${{ inputs.publishAsciidoctorJDiagramBatik }}; then GOALS="$GOALS publishMavenAsciidoctorJDiagramBatikPublicationToSonatypeRepository "; fi
+          if ${{ inputs.publishAsciidoctorJDiagramJSyntrax }}; then GOALS="$GOALS publishMavenAsciidoctorJDiagramJSyntraxPublicationToSonatypeRepository "; fi
           echo "Publishing goals: ${GOALS}"
           unset GEM_PATH GEM_HOME JRUBY_OPTS
           ./gradlew --no-daemon clean build

asciidoctorj-diagram-batik/build.gradle

@@ -0,0 +1,23 @@
+dependencies {
+  gems("rubygems:asciidoctor-diagram-batik:${project.version}")
+}
+
+def gemFiles = fileTree("${project.buildDir}/.gems") {
+  include 'specifications/*.gemspec'
+  include 'gems/*/lib/**'
+}
+
+jrubyPrepare {
+  doLast {
+    println "Copy from $gemFiles into $preparedGems"
+    copy { // bundles the gems inside this artifact
+      from gemFiles
+      into preparedGems
+    }
+  }
+}
+
+ext.publicationName = "mavenAsciidoctorJDiagramBatik"
+
+apply from: rootProject.file('gradle/publish.gradle')
+apply from: rootProject.file('gradle/signing.gradle')

asciidoctorj-diagram-batik/gradle.properties

@@ -0,0 +1,4 @@
+properName=AsciidoctorJ Diagram Batik
+description=AsciidoctorJ Diagram Batik bundles the Asciidoctor Diagram Batik RubyGem (asciidoctor-diagram-batik) so it can be loaded into the JVM using JRuby.
+version=1.17
+gem_name=asciidoctor-diagram-batik

asciidoctorj-diagram-jsyntrax/build.gradle

@@ -0,0 +1,26 @@
+dependencies {
+  gems("rubygems:asciidoctor-diagram-jsyntrax:${project.version}") {
+    exclude module: "asciidoctor-diagram-batik"
+  }
+  implementation project(':asciidoctorj-diagram-batik')
+}
+
+def gemFiles = fileTree("${project.buildDir}/.gems") {
+  include 'specifications/*.gemspec'
+  include 'gems/*/lib/**'
+}
+
+jrubyPrepare {
+  doLast {
+    println "Copy from $gemFiles into $preparedGems"
+    copy { // bundles the gems inside this artifact
+      from gemFiles
+      into preparedGems
+    }
+  }
+}
+
+ext.publicationName = "mavenAsciidoctorJDiagramPlantuml"
+
+apply from: rootProject.file('gradle/publish.gradle')
+apply from: rootProject.file('gradle/signing.gradle')

asciidoctorj-diagram-jsyntrax/gradle.properties

@@ -0,0 +1,5 @@
+properName=AsciidoctorJ Diagram JSyntrax
+description=AsciidoctorJ Diagram JSyntrax bundles the Asciidoctor Diagram JSyntrax RubyGem (asciidoctor-diagram-jsyntrax) so it can be loaded into the JVM using JRuby.
+version=1.38.1
+gem_name=asciidoctor-diagram-jsyntrax
+

asciidoctorj-diagram-plantuml/build.gradle

@@ -1,5 +1,8 @@
 dependencies {
-  gems("rubygems:asciidoctor-diagram-plantuml:${project.version}")
+  gems("rubygems:asciidoctor-diagram-plantuml:${project.version}") {
+    exclude module: "asciidoctor-diagram-batik"
+  }
+  implementation project(':asciidoctorj-diagram-batik')
 }
 
 def gemFiles = fileTree("${project.buildDir}/.gems") {

asciidoctorj-diagram-plantuml/gradle.properties

@@ -1,5 +1,5 @@
 properName=AsciidoctorJ Diagram Plantuml
 description=AsciidoctorJ Diagram Plantuml bundles the Asciidoctor Diagram Plantuml RubyGem (asciidoctor-diagram-plantuml) so it can be loaded into the JVM using JRuby.
-version=1.2024.3
+version=1.2024.5
 gem_name=asciidoctor-diagram-plantuml
 

asciidoctorj-diagram/build.gradle

@@ -12,9 +12,11 @@ dependencies {
     // Exclude gems provided by AsciidoctorJ core
     exclude module: 'asciidoctor'
     exclude module: 'thread_safe'
+    exclude module: 'rexml'
     exclude module: 'asciidoctor-diagram-plantuml'
     exclude module: 'asciidoctor-diagram-ditaamini'
   }
+  gems("rubygems:rexml:$rexmlGemVersion")
 }
 
 def gemFiles = fileTree("${project.buildDir}/.gems") {

asciidoctorj-diagram/gradle.properties

@@ -1,4 +1,4 @@
 properName=AsciidoctorJ Diagram
 description=AsciidoctorJ Diagram bundles the Asciidoctor Diagram RubyGem (asciidoctor-diagram) so it can be loaded into the JVM using JRuby.
-version=2.3.0
+version=2.3.1
 gem_name=asciidoctor-diagram

build.gradle

@@ -31,16 +31,18 @@ ext {
   statusIsRelease = (status == 'release')
 
   // jar versions
-  jrubyVersion = '9.4.2.0'
+  jrubyVersion = '9.4.7.0'
   junitVersion = '5.8.2'
   assertjVersion = '3.22.0'
-  jsoupVersion = '1.15.3'
+  jsoupVersion = '1.17.2'
 
   // gem versions
   asciidoctorJVersion = project.hasProperty('asciidoctorJVersion') ? project.asciidoctorJVersion : '2.5.10'
   asciidoctorDiagramGemVersion = project.hasProperty('asciidoctorDiagramGemVersion') ? project.asciidoctorDiagramGemVersion : project(':asciidoctorj-diagram').version.replace('-', '.')
-  barbyGemVersion = "0.6.8"
+  asciidoctorDiagramBatikGemVersion = "1.17"
+  barbyGemVersion = "0.6.9"
   rqrcodeGemVersion = "2.2.0"
+  rexmlGemVersion = '3.2.6'
 }
 
 allprojects {
@@ -56,11 +58,16 @@ subprojects {
 
   status = _status
 
+  def _javaVersion = 8
+  if (project.name == "itest"
+          || project.name == "asciidoctorj-diagram-jsyntrax") {
+    _javaVersion = 11
+  }
   project.tasks.withType(JavaCompile).configureEach { task ->
-    task.options.release = 8
+    task.options.release = _javaVersion
   }
   project.tasks.withType(GroovyCompile).configureEach {task ->
-    task.options.release = 8
+    task.options.release = _javaVersion
   }
 
   repositories {

gradle.properties

@@ -1,2 +1,2 @@
-version=2.3.0
+version=2.3.1
 gem_name=asciidoctor-diagram

itest/build.gradle

@@ -3,10 +3,11 @@ dependencies {
     testImplementation ("org.asciidoctor:asciidoctorj:$asciidoctorJVersion")
 
     testImplementation project(':asciidoctorj-diagram')
+    testImplementation project(':asciidoctorj-diagram-jsyntrax')
 }
 
 jar.enabled = false
 
-configurations.all {
+configurations.configureEach {
     artifacts.clear()
 }

itest/src/test/java/org.asciidoctor/WhenDocumentContainsDitaaDiagram.java renamed to itest/src/test/java/org.asciidoctor/WhenDocumentContainsDiagrams.java

@@ -6,9 +6,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class WhenDocumentContainsDitaaDiagram {
+public class WhenDocumentContainsDiagrams {
 
-    private Asciidoctor asciidoctor = Asciidoctor.Factory.create();
+    private final Asciidoctor asciidoctor = Asciidoctor.Factory.create();
 
     @Test
     public void png_should_be_rendered_for_diagram() {
@@ -19,10 +19,22 @@ public void png_should_be_rendered_for_diagram() {
         File expectedDiagram = new File(sourceDir, "asciidoctor-diagram-process.png");
         File expectedDiagramCache = new File(sourceDir, ".asciidoctor/diagram/asciidoctor-diagram-process.png.cache");
 
+        File expectedPlantumlDiagram = new File(sourceDir, "plantuml-test.svg");
+        File expectedPlantumlDiagramCache = new File(sourceDir, ".asciidoctor/diagram/plantuml-test.svg.cache");
+
+        File expectedJSyntraxDiagram = new File(sourceDir, "jsyntrax-test.svg");
+        File expectedJSyntraxDiagramCache = new File(sourceDir, ".asciidoctor/diagram/jsyntrax-test.svg.cache");
+
         asciidoctor.requireLibrary("asciidoctor-diagram");
         asciidoctor.convertFile(sourceDocument, Options.builder().backend("html5").build());
 
         assertThat(expectedDiagram).isNotEmpty();
         assertThat(expectedDiagramCache).isNotEmpty();
+
+        assertThat(expectedPlantumlDiagram).isNotEmpty();
+        assertThat(expectedPlantumlDiagramCache).isNotEmpty();
+
+        assertThat(expectedJSyntraxDiagram).isNotEmpty();
+        assertThat(expectedJSyntraxDiagramCache).isNotEmpty();
     }
 }

itest/src/test/resources/sample.adoc

@@ -20,3 +20,18 @@
      +-----------------------------------+
 ....
 
+[plantuml,plantuml-test,svg]
+----
+class A
+class B
+A --> B
+----
+
+[syntrax,jsyntrax-test,svg]
+----
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+----