asciidoctor-diagram 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d16a4ceac53c9b8aa223e3b22a061ee0c92cc6876b24522c224530f7559c6d9
-  data.tar.gz: 86d434f86830db71ea4369b2e1e08d05b0ca8d6ed8f3ed4927c90cb5458f0154
+  metadata.gz: ea06a8ee298a0f1331527d528d1e03bb3e018dda9c0dc69fa52506fb086e6b48
+  data.tar.gz: 26d12a8dd4da3cd38a6007d8e569b05892159c79c9538d99f3958d91be4792a2
 SHA512:
-  metadata.gz: d365c1149d8b2d7ce00a0aecdf0d40435518aeda247448adb4bfe81bc7b4c9cefe69477c3c3a6e3cb1fcbd703dc7efe2ad4e519d49aa4f32a10a51ecf523eaab
-  data.tar.gz: 567f9ba04c8bb97e09e6e2d70bfde26cd51700777257a5dd8a7a683ce101f6b0341f00d6729d12116400b620f38d5f4b3bea1113623641989c9d44a26110c04b
+  metadata.gz: e81762d1af76136b66f1d35fb60aa5ebdcdd2fca3ff9d09cbf59d36485ea82b7d8eab3c4656fb236ebbadd07975b545e1d1ed7e0a205e3d50d28a6377f9f8cc5
+  data.tar.gz: 6e2a003aa9049b72d12b6e5f82dec010029bb6b2e9ccf31c4e66951e6a3beb90694601769c452a2535cef8e891736a7c633aefde39c477647eef3febfcb7427a

data/CHANGELOG.adoc

@@ -1,5 +1,17 @@
 = Asciidoctor-diagram Changelog
 
+== 2.2.8
+
+Enhancements::
+
+* Add support for reusing JSyntrax subprocess instances to improve performance when rendering many syntax diagrams (@gitrbond, @inponomarev)
+* Issue #386: Add basic https://structurizr.com[Structurizr] support
+
+Bugfixes::
+
+* Issue #409: Fix handling of the D2 `sketch` attribute
+* Issue #410: Ensure current directory is always set to document base directory when invoking subprocesses
+
 == 2.2.7
 
 Enhancements::
@@ -25,6 +37,7 @@ Enhancements::
 Enhancements::
 
 * Issue #399: Add support for PlantUML theme attribute
+* Add DBML support via https://github.com/softwaretechnik-berlin/dbml-renderer[dbml-renderer]
 
 == 2.2.3
 

data/README.adoc

@@ -3,8 +3,8 @@ Pepijn Van_Eeckhoudt <https://github.com/pepijnve[@pepijnve]>; Sarah White <http
 :description: README for the Asciidoctor Diagram extension for Asciidoctor.
 
 image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/Linux%20unit%20tests/badge.svg?branch=master["Linux Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22Linux+unit+tests%22"]
-image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/macOS%20unit%20tests/badge.svg?branch=master["macOS Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22macOS+unit+tests%22"]
-image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/Windows%20unit%20tests/badge.svg?branch=master["Windows Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22Windows+unit+tests%22"]
+// image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/macOS%20unit%20tests/badge.svg?branch=master["macOS Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22macOS+unit+tests%22"]
+// image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/Windows%20unit%20tests/badge.svg?branch=master["Windows Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22Windows+unit+tests%22"]
 image:https://badge.fury.io/rb/asciidoctor-diagram.svg[Gem Version, link=https://rubygems.org/gems/asciidoctor-diagram]
 
 Asciidoctor Diagram is a set of Asciidoctor extensions that enable you to add diagrams, which you describe using plain text, to your AsciiDoc document.
@@ -38,4 +38,4 @@ The example below shows an embedded Ditaa diagram block.
 
 After processing by Asciidoctor, the output file will show a rendered version of the diagram instead of the diagram source code.
 
-image::docs/modules/ROOT/images/asciidoctor-diagram-process.png[]
+image::docs/modules/ROOT/images/asciidoctor-diagram-process.png[]

data/docs/modules/ROOT/pages/index.adoc

@@ -5,7 +5,7 @@ include::partial$uris.adoc[]
 
 Asciidoctor Diagram is a set of Asciidoctor extensions that enable you to add diagrams, which you describe using plain text, to your AsciiDoc document.
 
-The extensions support the {uri-a2s}[AsciiToSVG], BlockDiag ({uri-blockdiag}[BlockDiag], {uri-seqdiag}[SeqDiag], {uri-actdiag}[ActDiag], {uri-nwdiag}[NwDiag]), {uri-bytefield}[Bytefield-SVG], {uri-ditaa}[Ditaa], {uri-dpic}[dpic], {uri-erd}[Erd], {uri-gnuplot}[Gnuplot], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-nomnoml}[Nomnoml], {uri-pikchr}[Pikchr], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {uri-smcat}[State Machine Cat], {uri-svgbob}[SvgBob], {uri-symbolator}[Symbolator], {uri-syntrax}[Syntrax] / {uri-jsyntrax}[JSyntrax], {uri-umlet}[UMLet], {uri-vega}[Vega], {uri-vegalite}[Vega-Lite] and {uri-wavedrom}[WaveDrom] syntax.
+The extensions support the {uri-a2s}[AsciiToSVG], BlockDiag ({uri-blockdiag}[BlockDiag], {uri-seqdiag}[SeqDiag], {uri-actdiag}[ActDiag], {uri-nwdiag}[NwDiag]), {uri-bytefield}[Bytefield-SVG], {uri-dbml}[DBML], {uri-ditaa}[Ditaa], {uri-dpic}[dpic], {uri-erd}[Erd], {uri-gnuplot}[Gnuplot], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-nomnoml}[Nomnoml], {uri-pikchr}[Pikchr], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {uri-smcat}[State Machine Cat], {uri-structurizr}[Structurizr], {uri-svgbob}[SvgBob], {uri-symbolator}[Symbolator], {uri-syntrax}[Syntrax] / {uri-jsyntrax}[JSyntrax], {uri-umlet}[UMLet], {uri-vega}[Vega], {uri-vegalite}[Vega-Lite] and {uri-wavedrom}[WaveDrom] syntax.
 
 Each extension runs the diagram processor to generate an SVG, PNG, or TXT file from the input text.
 The generated file is then inserted into your converted document.

data/docs/modules/ROOT/partials/advanced.adoc

@@ -75,6 +75,7 @@ The following table lists the tools that are required for each diagram type, the
    |bytefield    |{uri-bytefield}[bytefield-svg]                                        |`bytefield-svg`
    |diagrams     |{uri-python}[Python]                                                  |`diagrams-python`
    |D2           |{uri-d2}[D2]                                                          |`d2`
+   |DBML         |{uri-dbml}[dbml-renderer]                                             |`dbml-renderer`
    |ditaa        |{uri-java}[Java]                                                      |`java`
    |dpic         |{uri-dpic}[dpic]                                                      |`dpic`
    |erd          |{uri-erd}[Erd] or {uri-erd-go}[Erd Go]                                |`erd`
@@ -92,9 +93,10 @@ The following table lists the tools that are required for each diagram type, the
    |seqdiag      |{uri-seqdiag}[SeqDiag]                                                |`seqdiag`
    |shaape       |{uri-shaape}[Shaape]                                                  |`shaape`
    |smcat        |{uri-smcat}[State Machine Cat]                                        |`smcat`
+   |structurizr  |{uri-java}[Java] and {uri-structurizr}[Structurizr CLI]               |`java` and the `DIAGRAM_STRUCTURIZRCLI_HOME` environment variable
    |svgbob       |{uri-svgbob}[SvgBob]                                                  |`svgbob`
    |symbolator   |{uri-symbolator}[Symbolator]                                          |`symbolator`
-   |syntrax      |{uri-syntrax}[Syntrax]/{uri-jsyntrax}[JSyntrax]                       |`syntrax`
+   |syntrax      |{uri-syntrax}[Syntrax]/{uri-jsyntrax}[JSyntrax]                       |`syntrax` or `java` and the `DIAGRAM_JSYNTRAX_HOME` environment variable
    |tikz         |A TeX distribution that supports {uri-tikz}[TikZ]                     |`pdflatex` and `pdf2svg`
    |umlet        |{uri-umlet}[Umlet]                                                    |`umlet`
    |vega         |{uri-vega}[vg2png] and/or {uri-vega}[vg2png]                          |`vg2png` and `vg2svg`
@@ -250,6 +252,10 @@ If the maximum size is exceeded, POST requests are used instead
 |font-bol        |Source Sans Pro Bold          |Path to .ttf file to use for the bold font
 |===
 
+==== DBML
+
+No specific attributes.
+
 ==== Diagrams
 
 No specific attributes.
@@ -347,10 +353,19 @@ No specific attributes.
 [cols=">,<,<",options="header"]
 |===
 |Name          |Default value   |Description
-|direction     |unspecifed      |The direction of the state machine diagram. One of `top-down`, `bottom-top`, `left-right` or `right-left`.
+|direction     |unspecified     |The direction of the state machine diagram. One of `top-down`, `bottom-top`, `left-right` or `right-left`.
 |engine        |unspecified     |The layout engine to use. One of `dot`, `circo`, `fdp`, `neato`, `osage`, or `twopi`
 |===
 
+==== Structurizr
+
+[cols=">,<,<",options="header"]
+|===
+|Name          |Default value   |Description
+|renderer      |plantuml-c4     |The rendering backend to use. One of `d2`, `graphviz`, `mermaid`, `plantuml`, or `plantuml-c4`
+|view          |unspecified     |The key of the view to render
+|===
+
 ==== svgbob
 
 [cols=">,<,<",options="header"]
@@ -367,9 +382,9 @@ No specific attributes.
 [cols=">,<,<",options="header"]
 |===
 |Name          |Default value   |Description
-|heading       |unspecifed      |Diagram title
+|heading       |unspecified      |Diagram title
 |scale         |1               |A scale factor that is applied to the image.
-|style-file    |unspecifed      |Path to a style config file to pass to Syntrax.
+|style-file    |unspecified      |Path to a style config file to pass to Syntrax.
 |transparent   |false           |Makes the background of the image transparent instead of opaque white.
 |===
 

data/docs/modules/ROOT/partials/create_diagram.adoc

@@ -46,6 +46,7 @@ The following diagram types and output formats are available:
 |{uri-seqdiag}[seqdiag]            |       |{check}|{check}|{check}|
 |{uri-shaape}[shaape]              |       |       |{check}|{check}|
 |{uri-smcat}[smcat]                |       |       |       |{check}|
+|{uri-structurizr}[structurizr]    |       |       |{check}|{check}|
 |{uri-svgbob}[svgbob]              |       |       |       |{check}|{check}
 |{uri-symbolator}[symbolator]      |       |{check}|{check}|{check}|
 |{uri-syntrax}[syntrax] (Syntrax)  |       |{check}|{check}|{check}|

data/docs/modules/ROOT/partials/uris.adoc

@@ -6,6 +6,7 @@
 :uri-bpmn: https://github.com/gtudan/bpmn-js-cmd
 :uri-bytefield: https://github.com/Deep-Symmetry/bytefield-svg
 :uri-d2: https://d2lang.com
+:uri-dbml: https://github.com/softwaretechnik-berlin/dbml-renderer
 :uri-diagrams: https://diagrams.mingrammer.com
 :uri-ditaa: http://ditaa.sourceforge.net/
 :uri-dpic: https://gitlab.com/aplevich/dpic
@@ -16,6 +17,7 @@
 :uri-graphviz: https://graphviz.gitlab.io
 :uri-imagemagick: http://www.imagemagick.org
 :uri-java: http://java.sun.com
+:uri-jsyntrax: https://atp-mipt.github.io/jsyntrax/
 :uri-mermaid: https://github.com/mermaid-js/mermaid-cli
 :uri-mscgen: http://www.mcternan.me.uk/mscgen/
 :uri-mscgen-js: https://github.com/mscgenjs/mscgenjs-cli
@@ -31,10 +33,10 @@
 :uri-seqdiag: http://blockdiag.com/en/seqdiag/index.html
 :uri-shaape: https://github.com/christiangoltz/shaape
 :uri-smcat: https://github.com/sverweij/state-machine-cat
+:uri-structurizr: https://structurizr.com
 :uri-svgbob: https://github.com/ivanceras/svgbobrus
 :uri-symbolator: https://github.com/kevinpt/symbolator
 :uri-syntrax: https://kevinpt.github.io/syntrax/
-:uri-jsyntrax: https://atp-mipt.github.io/jsyntrax/
 :uri-tikz: https://github.com/pgf-tikz/pgf
 :uri-umlet: http://www.umlet.com/
 :uri-vega: https://vega.github.io/vega/

data/lib/asciidoctor-diagram/d2/converter.rb

@@ -23,7 +23,7 @@ module Asciidoctor
           :font_regular => source.attr('font-regular'),
           :font_italic => source.attr('font-italic'),
           :font_bold => source.attr('font-bold')
-        }.delete_if { |key, value| value.nil? }
+        }
       end
 
       def convert(source, format, options)
@@ -31,17 +31,25 @@ module Asciidoctor
           args = [tool_path, '--browser', 'false']
 
           options.each_pair do |key, value|
-            args << "--#{key.to_s.gsub('_', '-')}"
+            flag = "--#{key.to_s.gsub('_', '-')}"
 
-            if key.to_s.start_with?('font')
+            if key == :sketch && value != 'false'
+              args << flag
+            elsif key.to_s.start_with?('font') && !value.nil?
               args << Platform.native_path(value)
-            else
+            elsif !value.nil?
+              args << flag
               args << value
             end
           end
 
           args << Platform.native_path(input_path)
           args << Platform.native_path(output_path)
+
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end
       end
     end

data/lib/asciidoctor-diagram/dbml/converter.rb

@@ -0,0 +1,22 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class DbmlConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def convert(source, format, options)
+        generate_stdin_stdout(source.find_command('dbml-renderer'), source.code)
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/dbml/extension.rb

@@ -0,0 +1,18 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class DbmlBlockProcessor < DiagramBlockProcessor
+      use_converter DbmlConverter
+    end
+
+    class DbmlBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter DbmlConverter
+    end
+
+    class DbmlInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter DbmlConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/dbml.rb

@@ -0,0 +1,8 @@
+require 'asciidoctor/extensions'
+require_relative 'dbml/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::DbmlBlockProcessor, :dbml
+  block_macro Asciidoctor::Diagram::DbmlBlockMacroProcessor, :dbml
+  inline_macro Asciidoctor::Diagram::DbmlInlineMacroProcessor, :dbml
+end

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -356,6 +356,7 @@ module Asciidoctor
       include DiagramProcessor
 
       def self.inherited(subclass)
+        subclass.use_dsl
         subclass.name_positional_attributes ['target', 'format']
         subclass.contexts [:listing, :literal, :open]
         subclass.content_model :simple
@@ -374,6 +375,7 @@ module Asciidoctor
       include DiagramProcessor
 
       def self.inherited(subclass)
+        subclass.use_dsl
         subclass.name_positional_attributes ['format']
       end
 

data/lib/asciidoctor-diagram/diagram_source.rb

@@ -50,7 +50,7 @@ module Asciidoctor
       # @return [String] the base directory against which relative paths in this diagram should be resolved
       # @abstract
       def base_dir
-        attr('docdir', nil, true) || Dir.pwd
+        File.expand_path(attr('docdir', "", true))
       end
 
       # Alias for code
@@ -262,7 +262,7 @@ module Asciidoctor
     class FileSource < BasicSource
       def initialize(block_processor, parent_block, file_name, attributes)
         super(block_processor, parent_block, attributes)
-        @file_name = file_name
+        @file_name = File.expand_path(file_name)
       end
 
       def base_dir

data/lib/asciidoctor-diagram/ditaa/converter.rb

@@ -32,12 +32,14 @@ module Asciidoctor
                           require 'asciidoctor-diagram/ditaa/classpath'
                           ::Asciidoctor::Diagram::DitaaClasspath::JAR_FILES
                         rescue LoadError
-                          raise "Could not load Ditaa. Eiter require 'asciidoctor-diagram-ditaamini' or specify the location of the Ditaa JAR(s) using the 'DIAGRAM_DITAA_CLASSPATH' environment variable."
+                          nil
                         end
                       end
 
-      Java.classpath.concat Dir[File.join(File.dirname(__FILE__), '*.jar')]
-      Java.classpath.concat DITAA_JARS
+      if DITAA_JARS
+        Java.classpath.concat Dir[File.join(File.dirname(__FILE__), '*.jar')]
+        Java.classpath.concat DITAA_JARS
+      end
 
       def supported_formats
         [:png, :svg, :txt]
@@ -61,6 +63,10 @@ module Asciidoctor
       def convert(source, format, options)
         return source.to_s if format == :txt
 
+        unless DITAA_JARS
+          raise "Could not load Ditaa. Either require 'asciidoctor-diagram-ditaamini' or specify the location of the Ditaa JAR(s) using the 'DIAGRAM_DITAA_CLASSPATH' environment variable."
+        end
+
         Java.load
 
         flags = []

data/lib/asciidoctor-diagram/plantuml/converter.rb

@@ -17,12 +17,14 @@ module Asciidoctor
                           require 'asciidoctor-diagram/plantuml/classpath'
                           ::Asciidoctor::Diagram::PlantUmlClasspath::JAR_FILES
                         rescue LoadError
-                          raise "Could not load PlantUML. Eiter require 'asciidoctor-diagram-plantuml' or specify the location of the PlantUML JAR(s) using the 'DIAGRAM_PLANTUML_CLASSPATH' environment variable."
+                          nil
                         end
                       end
 
-      Java.classpath.concat Dir[File.join(File.dirname(__FILE__), '*.jar')].freeze
-      Java.classpath.concat PLANTUML_JARS
+      if PLANTUML_JARS
+        Java.classpath.concat Dir[File.join(File.dirname(__FILE__), '*.jar')].freeze
+        Java.classpath.concat PLANTUML_JARS
+      end
 
       def wrap_source(source)
         PlantUMLPreprocessedSource.new(source, self)
@@ -72,6 +74,9 @@ module Asciidoctor
       end
 
       def convert(source, format, options)
+        unless PLANTUML_JARS
+          raise "Could not load PlantUML. Either require 'asciidoctor-diagram-plantuml' or specify the location of the PlantUML JAR(s) using the 'DIAGRAM_PLANTUML_CLASSPATH' environment variable."
+        end
         Java.load
 
         code = source.code

data/lib/asciidoctor-diagram/structurizr/converter.rb

@@ -0,0 +1,67 @@
+require 'set'
+
+require_relative '../diagram_converter'
+require_relative '../diagram_processor'
+require_relative '../plantuml/converter'
+require_relative '../util/java'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class StructurizrConverter
+      include DiagramConverter
+
+      CLASSPATH_ENV = 'DIAGRAM_STRUCTURIZR_CLASSPATH'
+      CLI_HOME_ENV = 'DIAGRAM_STRUCTURIZRCLI_HOME'
+      STRUCTURIZR_JARS = if ENV.has_key?(CLASSPATH_ENV)
+                           ENV[CLASSPATH_ENV].split(File::PATH_SEPARATOR)
+                         elsif ENV.has_key?(CLI_HOME_ENV)
+                           lib_dir = File.expand_path('lib', ENV[CLI_HOME_ENV])
+                           Dir.children(lib_dir).select { |c| c.end_with? '.jar' }.map { |c| File.expand_path(c, lib_dir) }
+                         else
+                           nil
+                         end
+
+      if STRUCTURIZR_JARS
+        Java.classpath.concat Dir[File.join(File.dirname(__FILE__), '*.jar')]
+        Java.classpath.concat STRUCTURIZR_JARS
+      end
+
+      def supported_formats
+        [:txt]
+      end
+
+      def collect_options(source)
+        {
+          :view => source.attr('view'),
+          :renderer => Renderers.get_renderer_type(source)
+        }
+      end
+
+      def convert(source, format, options)
+        unless STRUCTURIZR_JARS
+          raise "Could not load Structurizr. Specify the location of the Structurizr JAR(s) using the 'DIAGRAM_STRUCTURIZRCLI_HOME' or DIAGRAM_STRUCTURIZR_CLASSPATH' environment variable."
+        end
+
+        Java.load
+
+        headers = {
+          'Accept' => Renderers.mime_type(options[:renderer])
+        }
+        headers['X-Structurizr-View'] = options[:view] if options[:view]
+
+        response = Java.send_request(
+          :url => '/structurizr',
+          :body => source.to_s,
+          :headers => headers
+        )
+
+        unless response[:code] == 200
+          raise Java.create_error("Structurizr code generation failed", response)
+        end
+
+        response[:body].force_encoding(Encoding::UTF_8)
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/structurizr/extension.rb

@@ -0,0 +1,52 @@
+require_relative 'converter'
+require_relative 'renderers.rb'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+
+    class StructurizrConvertBlockProcessor < DiagramBlockProcessor
+      use_converter StructurizrConverter
+    end
+
+    class StructurizrBlockProcessor < Asciidoctor::Extensions::BlockProcessor
+      DiagramBlockProcessor.inherited(self)
+
+      def initialize(name = nil, config = nil)
+        super
+        @structurizr = StructurizrConvertBlockMacroProcessor.new(name)
+        @renderers = Renderers.new(name)
+      end
+
+      def process parent, reader, attributes
+        structurizr_attrs = attributes.dup
+        structurizr_attrs['format'] = 'txt'
+
+        renderer_block = @structurizr.process(parent, reader, structurizr_attrs)
+        @renderers.get_renderer(BasicSource.new(self, parent, attributes)).process(parent, renderer_block, attributes)
+      end
+    end
+
+    class StructurizrConvertBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter StructurizrConverter
+    end
+
+    class StructurizrBlockMacroProcessor < Asciidoctor::Extensions::BlockMacroProcessor
+      DiagramBlockMacroProcessor.inherited(self)
+
+      def initialize(name = nil, config = nil)
+        super
+        @structurizr = StructurizrConvertBlockMacroProcessor.new(name)
+        @renderers = Renderers.new(name)
+      end
+
+      def process parent, target, attributes
+        structurizr_attrs = attributes.dup
+        structurizr_attrs['format'] = 'txt'
+
+        renderer_block = @structurizr.process(parent, target, structurizr_attrs)
+        @renderers.get_renderer(BasicSource.new(self, parent, attributes)).process(parent, renderer_block, attributes)
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/structurizr/renderers.rb

@@ -0,0 +1,58 @@
+module Asciidoctor
+  module Diagram
+    class Renderers
+      D2 = 'd2'
+      GRAPHVIZ = 'graphviz'
+      MERMAID = 'mermaid'
+      PLANTUML_C4 = 'plantuml-c4'
+      PLANTUML = 'plantuml'
+      DEFAULT_RENDERER = PLANTUML_C4
+
+      def initialize(name)
+        @d2 = D2BlockProcessor.new(name)
+        @graphviz = GraphvizBlockProcessor.new(name)
+        @plantuml = PlantUmlBlockProcessor.new(name)
+        @mermaid = MermaidBlockProcessor.new(name)
+      end
+
+      def renderer(renderer_type)
+        case renderer_type
+        when D2
+          @d2
+        when GRAPHVIZ
+          @graphviz
+        when MERMAID
+          @mermaid
+        when PLANTUML, PLANTUML_C4
+          @plantuml
+        else
+          raise "Unsupported renderer: '#{renderer_type}'"
+        end
+      end
+
+      def get_renderer(source)
+        renderer(Renderers.get_renderer_type(source))
+      end
+
+      def self.get_renderer_type(source)
+        source.attr('renderer', 'plantuml-c4')
+      end
+      def self.mime_type(renderer_type)
+        case renderer_type
+        when D2
+          'text/x-d2'
+        when GRAPHVIZ
+          'text/vnd.graphviz'
+        when MERMAID
+          'text/x-mermaid'
+        when PLANTUML
+          'text/x-plantuml'
+        when PLANTUML_C4
+          'text/x-plantuml-c4'
+        else
+          raise "Unsupported renderer: '#{renderer_type}'"
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/structurizr.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'structurizr/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::StructurizrBlockProcessor, :structurizr
+  block_macro Asciidoctor::Diagram::StructurizrBlockMacroProcessor, :structurizr
+end

data/lib/asciidoctor-diagram/syntrax/converter.rb

@@ -9,6 +9,21 @@ module Asciidoctor
       include DiagramConverter
       include CliGenerator
 
+      CLASSPATH_ENV = 'DIAGRAM_JSYNTRAX_CLASSPATH'
+      CLI_HOME_ENV = 'DIAGRAM_JSYNTRAX_HOME'
+      JSYNTRAX_JARS = if ENV.has_key?(CLASSPATH_ENV)
+                           ENV[CLASSPATH_ENV].split(File::PATH_SEPARATOR)
+                         elsif ENV.has_key?(CLI_HOME_ENV)
+                           lib_dir = File.expand_path('lib', ENV[CLI_HOME_ENV])
+                           Dir.children(lib_dir).select { |c| c.end_with? '.jar' }.map { |c| File.expand_path(c, lib_dir) }
+                         else
+                           nil
+                         end
+
+      if JSYNTRAX_JARS
+        Java.classpath.concat Dir[File.join(File.dirname(__FILE__), '*.jar')]
+        Java.classpath.concat JSYNTRAX_JARS
+      end
 
       def supported_formats
         [:png, :svg]
@@ -24,30 +39,62 @@ module Asciidoctor
       end
 
       def convert(source, format, options)
-        generate_file(source.find_command('syntrax'), 'spec', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          args = [tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)]
+        shared_args = []
+        title = options[:heading]
+        if title
+          shared_args << '--title' << title
+        end
 
-          title = options[:heading]
-          if title
-            args << '--title' << title
-          end
+        scale = options[:scale]
+        if scale
+          shared_args << '--scale' << scale
+        end
 
-          scale = options[:scale]
-          if scale
-            args << '--scale' << scale
-          end
+        transparent = options[:transparent]
+        if transparent == 'true'
+          shared_args << '--transparent'
+        end
+        style = options[:style]
+        if style
+          shared_args << '--style' << style
+        end
 
-          transparent = options[:transparent]
-          if transparent == 'true'
-            args << '--transparent'
+        if JSYNTRAX_JARS
+          Java.load
+
+          options_string = shared_args.join(' ')
+
+          case format
+          when :png
+            mime_type = 'image/png'
+          when :svg
+            mime_type = 'image/svg+xml'
+          else
+            raise "Unsupported format: #{format}"
           end
-          style = options[:style]
-          if style
-            args << '--style' << style
+
+          headers = {
+            'Accept' => mime_type,
+            'X-Options' => options_string
+          }
+
+          response = Java.send_request(
+            :url => '/syntrax',
+            :body => source.to_s,
+            :headers => headers
+          )
+
+          unless response[:code] == 200
+            raise Java.create_error("JSyntrax code generation failed", response)
           end
 
-          args
+          response[:body]
+        else
+          generate_file(source.find_command('syntrax'), 'spec', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+            [tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)] + shared_args
+          end
         end
+
       end
 
       def native_scaling?

data/lib/asciidoctor-diagram/util/cli.rb

@@ -9,8 +9,13 @@ module Asciidoctor
         require_relative 'java'
 
         def self.run(*args)
-          opts = args.pop.dup if args.last.is_a? Hash
-          in_data = opts && opts[:stdin_data]
+          if args.last.is_a? Hash
+            opts = args.pop.dup
+          else
+            opts = {}
+          end
+
+          in_data = opts[:stdin_data]
 
           if Hash === args.first
             env = args.shift.dup
@@ -19,6 +24,9 @@ module Asciidoctor
           end
 
           pb = java.lang.ProcessBuilder.new(*args)
+
+          pb.directory(java.io.File.new(opts[:chdir] || Dir.pwd))
+
           env.each_pair do |key, value|
             pb.environment.put(key, value)
           end

data/lib/asciidoctor-diagram/util/cli_generator.rb

@@ -81,6 +81,7 @@ module Asciidoctor
             args = opts[:args]
             out_file = opts[:out_file]
             env = opts[:env] || {}
+            open3_opts[:chdir] = opts[:chdir] if opts[:chdir]
           else
             raise "Block passed to generate_file should return an Array or a Hash"
         end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.2.7"
+    VERSION = "2.2.8"
   end
 end

data/lib/asciidoctor-diagram.rb

@@ -4,6 +4,7 @@ require_relative 'asciidoctor-diagram/blockdiag'
 require_relative 'asciidoctor-diagram/bpmn'
 require_relative 'asciidoctor-diagram/bytefield'
 require_relative 'asciidoctor-diagram/d2'
+require_relative 'asciidoctor-diagram/dbml'
 require_relative 'asciidoctor-diagram/diagrams'
 require_relative 'asciidoctor-diagram/ditaa'
 require_relative 'asciidoctor-diagram/dpic'
@@ -21,6 +22,7 @@ require_relative 'asciidoctor-diagram/plantuml'
 require_relative 'asciidoctor-diagram/salt'
 require_relative 'asciidoctor-diagram/shaape'
 require_relative 'asciidoctor-diagram/smcat'
+require_relative 'asciidoctor-diagram/structurizr'
 require_relative 'asciidoctor-diagram/svgbob'
 require_relative 'asciidoctor-diagram/symbolator'
 require_relative 'asciidoctor-diagram/syntrax'

data/spec/d2_spec.rb

@@ -34,4 +34,27 @@ end
 
 describe Asciidoctor::Diagram::D2BlockProcessor, :broken_on_windows do
   include_examples "block", :d2, D2_CODE, [:svg]
+
+  it "should support sketch mode" do
+    doc = <<-eos
+= Hello, D2!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[d2, sketch=true]
+----
+#{D2_CODE}
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+    target = b.attributes['target']
+    expect(target).to match(/\.svg$/)
+    expect(File.exist?(target)).to be true
+  end
 end

data/spec/dbml_spec.rb

@@ -0,0 +1,32 @@
+require_relative 'test_helper'
+
+DBML_CODE = <<-eos
+Table users {
+    id integer
+    username varchar
+    role varchar
+    created_at timestamp
+}
+
+Table posts {
+    id integer [primary key]
+    title varchar
+    body text [note: 'Content of the post']
+    user_id integer
+    created_at timestamp
+}
+
+Ref: posts.user_id > users.id
+eos
+
+describe Asciidoctor::Diagram::DbmlInlineMacroProcessor, :broken_on_windows do
+  include_examples "inline_macro", :dbml, DBML_CODE, [:svg]
+end
+
+describe Asciidoctor::Diagram::DbmlBlockMacroProcessor, :broken_on_windows do
+  include_examples "block_macro", :dbml, DBML_CODE, [:svg]
+end
+
+describe Asciidoctor::Diagram::DbmlBlockProcessor, :broken_on_windows do
+  include_examples "block", :dbml, DBML_CODE, [:svg]
+end

data/spec/plantuml_spec.rb

@@ -278,7 +278,7 @@ Foo1 -> Foo2 : To boundary
     expect(File.exist?(target)).to be true
 
     svg = File.read(target, :encoding => Encoding::UTF_8)
-    expect(svg).to match(/<[^<]+ fill=["']url\(#gvl9ibi66ipfc0\)["']/)
+    expect(svg).to match(/<[^<]+ stop-color=["']#7C9AB9["']/)
   end
 
   it 'should use plantuml include dir when specified as a document attribute' do

data/spec/shared_examples.rb

@@ -757,8 +757,8 @@ Doc Writer <doc@example.com>
     scaled_image = d.find { |bl| bl.context == :image }
 
     unless formats[0] == :pdf
-      expect(scaled_image.attributes['width']).to be_within(1).of(unscaled_image.attributes['width'] * 2)
-      expect(scaled_image.attributes['height']).to be_within(1).of(unscaled_image.attributes['height'] * 2)
+      expect(scaled_image.attributes['width']).to be_within(10).of(unscaled_image.attributes['width'] * 2)
+      expect(scaled_image.attributes['height']).to be_within(10).of(unscaled_image.attributes['height'] * 2)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,6 +159,9 @@ files:
 - lib/asciidoctor-diagram/d2.rb
 - lib/asciidoctor-diagram/d2/converter.rb
 - lib/asciidoctor-diagram/d2/extension.rb
+- lib/asciidoctor-diagram/dbml.rb
+- lib/asciidoctor-diagram/dbml/converter.rb
+- lib/asciidoctor-diagram/dbml/extension.rb
 - lib/asciidoctor-diagram/diagram_converter.rb
 - lib/asciidoctor-diagram/diagram_processor.rb
 - lib/asciidoctor-diagram/diagram_source.rb
@@ -167,7 +170,7 @@ files:
 - lib/asciidoctor-diagram/diagrams/extension.rb
 - lib/asciidoctor-diagram/ditaa.rb
 - lib/asciidoctor-diagram/ditaa/converter.rb
-- lib/asciidoctor-diagram/ditaa/ditaa-1.3.21.jar
+- lib/asciidoctor-diagram/ditaa/ditaa-2.0.0.jar
 - lib/asciidoctor-diagram/ditaa/extension.rb
 - lib/asciidoctor-diagram/dpic.rb
 - lib/asciidoctor-diagram/dpic/converter.rb
@@ -207,7 +210,7 @@ files:
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/converter.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
-- lib/asciidoctor-diagram/plantuml/plantuml-1.3.24.jar
+- lib/asciidoctor-diagram/plantuml/plantuml-2.0.0.jar
 - lib/asciidoctor-diagram/salt.rb
 - lib/asciidoctor-diagram/shaape.rb
 - lib/asciidoctor-diagram/shaape/converter.rb
@@ -215,6 +218,11 @@ files:
 - lib/asciidoctor-diagram/smcat.rb
 - lib/asciidoctor-diagram/smcat/converter.rb
 - lib/asciidoctor-diagram/smcat/extension.rb
+- lib/asciidoctor-diagram/structurizr.rb
+- lib/asciidoctor-diagram/structurizr/converter.rb
+- lib/asciidoctor-diagram/structurizr/extension.rb
+- lib/asciidoctor-diagram/structurizr/renderers.rb
+- lib/asciidoctor-diagram/structurizr/structurizr-2.0.1.jar
 - lib/asciidoctor-diagram/svgbob.rb
 - lib/asciidoctor-diagram/svgbob/converter.rb
 - lib/asciidoctor-diagram/svgbob/extension.rb
@@ -224,6 +232,7 @@ files:
 - lib/asciidoctor-diagram/syntrax.rb
 - lib/asciidoctor-diagram/syntrax/converter.rb
 - lib/asciidoctor-diagram/syntrax/extension.rb
+- lib/asciidoctor-diagram/syntrax/syntrax-2.0.2.jar
 - lib/asciidoctor-diagram/tikz.rb
 - lib/asciidoctor-diagram/tikz/converter.rb
 - lib/asciidoctor-diagram/tikz/extension.rb
@@ -240,7 +249,7 @@ files:
 - lib/asciidoctor-diagram/util/pdf.rb
 - lib/asciidoctor-diagram/util/platform.rb
 - lib/asciidoctor-diagram/util/png.rb
-- lib/asciidoctor-diagram/util/server-1.3.21.jar
+- lib/asciidoctor-diagram/util/server-2.0.0.jar
 - lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/util/which.rb
 - lib/asciidoctor-diagram/vega.rb
@@ -256,6 +265,7 @@ files:
 - spec/bpmn_spec.rb
 - spec/bytefield_spec.rb
 - spec/d2_spec.rb
+- spec/dbml_spec.rb
 - spec/diagrams_spec.rb
 - spec/ditaa_spec.rb
 - spec/dpic_spec.rb
@@ -285,8 +295,13 @@ files:
 homepage: https://github.com/asciidoctor/asciidoctor-diagram
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  bug_tracker_uri: https://github.com/asciidoctor/asciidoctor-diagram/issues
+  changelog_uri: https://github.com/asciidoctor/asciidoctor-diagram/blob/master/CHANGELOG.adoc
+  documentation_uri: https://docs.asciidoctor.org/diagram-extension/latest/
+  homepage_uri: https://github.com/asciidoctor/asciidoctor-diagram
+  source_code_uri: https://github.com/asciidoctor/asciidoctor-diagram.git
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -301,8 +316,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: A family of Asciidoctor extensions that generate images from a broad range
   of embedded plain text diagram descriptions, including PlantUML, ditaa, Kroki, and
@@ -314,6 +329,7 @@ test_files:
 - spec/bpmn_spec.rb
 - spec/bytefield_spec.rb
 - spec/d2_spec.rb
+- spec/dbml_spec.rb
 - spec/diagrams_spec.rb
 - spec/ditaa_spec.rb
 - spec/dpic_spec.rb