asciidoctor-diagram 2.2.3 → 3.0.0

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

@@ -0,0 +1,63 @@
+require_relative '../d2/extension'
+require_relative '../graphviz/extension'
+require_relative '../mermaid/extension'
+require_relative '../plantuml/extension'
+
+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/svgbob/converter.rb

@@ -11,7 +11,7 @@ module Asciidoctor
 
 
       def supported_formats
-        [:svg]
+        [:svg, :txt]
       end
 
       def native_scaling?
@@ -38,6 +38,7 @@ module Asciidoctor
 
 
       def convert(source, format, options)
+        return source.to_s if format == :txt
 
         flags = []
         options.each do |option, value|
@@ -45,7 +46,10 @@ module Asciidoctor
         end
         
         generate_stdin(source.find_command('svgbob', :alt_cmds => ['svgbob_cli']), format.to_s, source.to_s) do |tool_path, output_path|
-          ([tool_path, '-o', Platform.native_path(output_path)] + flags)
+          {
+            :args => ([tool_path, '-o', Platform.native_path(output_path)] + flags),
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -15,7 +15,10 @@ module Asciidoctor
 
       def convert(source, format, options)
         generate_stdin(source.find_command('symbolator'), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, "-i-", "-o#{Platform.native_path(output_path)}", "-f#{format.to_s}"]
+          {
+            :args => [tool_path, "-i-", "-o#{Platform.native_path(output_path)}", "-f#{format.to_s}"],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -9,6 +9,26 @@ module Asciidoctor
       include DiagramConverter
       include CliGenerator
 
+      CLASSPATH_ENV = Java.environment_variable('DIAGRAM_JSYNTRAX_CLASSPATH')
+      CLI_HOME_ENV = Java.environment_variable('DIAGRAM_JSYNTRAX_HOME')
+      JSYNTRAX_JARS = if CLASSPATH_ENV
+                           CLASSPATH_ENV.split(File::PATH_SEPARATOR)
+                         elsif CLI_HOME_ENV
+                           lib_dir = File.expand_path('lib', CLI_HOME_ENV)
+                           Dir.children(lib_dir).select { |c| c.end_with? '.jar' }.map { |c| File.expand_path(c, lib_dir) }
+                         else
+                           begin
+                             require 'asciidoctor-diagram/jsyntrax/classpath'
+                             ::Asciidoctor::Diagram::JsyntraxClasspath::JAR_FILES
+                           rescue LoadError
+                             nil
+                           end
+                         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 +44,65 @@ 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|
+            {
+              :args => ([tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)] + shared_args),
+              :chdir => source.base_dir
+            }
+          end
         end
+
       end
 
       def native_scaling?

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

@@ -15,7 +15,7 @@ module Asciidoctor
 
       def collect_options(source)
         {
-            :preamble => source.attr('preamble') == 'true'
+            :preamble => source.opt('preamble') || source.attr('preamble') == 'true'
         }
       end
 
@@ -64,7 +64,10 @@ END
 
         if svgpath
           generate_file(svgpath, 'pdf', 'svg', pdf) do |tool_path, input_path, output_path|
-            [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
+            {
+              :args => [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)],
+              :chdir => source.base_dir
+            }
           end
         else
           pdf

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

@@ -25,7 +25,10 @@ module Asciidoctor
         end
 
         generate_file(java, 'uxf', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          [tool_path, '-jar', Platform.native_path(umlet), '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"]
+          {
+            :args => [tool_path, '-jar', Platform.native_path(umlet), '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -0,0 +1,25 @@
+module Asciidoctor
+  module Diagram
+    module Base64
+      def self.urlsafe_encode(bin, padding: true)
+        str = [bin].pack("m0")
+        str.chomp!("==") or str.chomp!("=") unless padding
+        str.tr!("+/", "-_")
+        str
+      end
+
+      def self.urlsafe_decode(str)
+        # NOTE: RFC 4648 does say nothing about unpadded input, but says that
+        # "the excess pad characters MAY also be ignored", so it is inferred that
+        # unpadded input is also acceptable.
+        if !str.end_with?("=") && str.length % 4 != 0
+          str = str.ljust((str.length + 3) & ~3, "=")
+          str.tr!("-_", "+/")
+        else
+          str = str.tr("-_", "+/")
+        end
+        str.unpack1("m0")
+      end
+    end
+  end
+end

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
@@ -92,7 +100,7 @@ module Asciidoctor
           exit = status.exitstatus
 
           if exit != 0
-            raise "#{cmd} failed: #{stdout.empty? ? stderr : stdout}"
+            raise "#{cmd} failed: #{stderr.empty? ? stdout : stderr}"
           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/util/java.rb

@@ -58,25 +58,34 @@ module Asciidoctor
         resp[:code] = status_line_parts[1].to_i
         resp[:reason] = status_line_parts[2]
 
+        resp.merge! parse_body(io)
+
+        resp
+      end
+
+      def self.parse_body(io)
+        body = {}
+
+        io.set_encoding Encoding::US_ASCII
         headers = {}
         until (header = io.readline(CRLF).strip).empty?
           key, value = header.split ':', 2
-          headers[key] = value.strip
+          headers[key.downcase] = value.strip
         end
 
-        resp[:headers] = headers
+        body[:headers] = headers
 
-        content_length = headers['Content-Length']
+        content_length = headers['content-length']
         if content_length
           io.set_encoding Encoding::BINARY
-          resp[:body] = io.read(content_length.to_i)
+          body[:body] = io.read(content_length.to_i)
         end
 
-        resp
+        body
       end
 
       def self.create_error(prefix_msg, response)
-        content_type = response[:headers]['Content-Type'] || 'text/plain'
+        content_type = response[:headers]['content-type'] || 'text/plain'
         if content_type.start_with? 'application/json'
           json = JSON.parse(response[:body].force_encoding(Encoding::UTF_8))
           ruby_bt = Kernel.caller(2)
@@ -97,7 +106,6 @@ module Asciidoctor
         @java_exe
       end
 
-      private
       def self.find_java
         case ::Asciidoctor::Diagram::Platform.os
           when :windows

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

@@ -5,6 +5,10 @@ module Asciidoctor
   module Diagram
     # @private
     module Java
+      def self.environment_variable(key)
+        ENV[key] || ENV_JAVA[key.downcase.gsub('_', '.')]
+      end
+
       def self.load
         if defined?(@loaded) && @loaded
           return
@@ -14,6 +18,16 @@ module Asciidoctor
           raise "Classpath item #{j} does not exist" unless File.exist?(j)
           require j
         end
+
+        # Strange issue seen with JRuby where 'java.class.path' has the value ':'.
+        # This causes issue in PlantUML which splits the class path string and then
+        # raises errors when trying to handle empty strings.
+        java_cp = ::Java.java.lang.System.getProperty("java.class.path")
+        new_java_cp = java_cp.split(File::PATH_SEPARATOR)
+                             .reject { |p| p.empty? }
+                             .join "File::PATH_SEPARATOR"
+        ::Java.java.lang.System.setProperty("java.class.path", new_java_cp)
+
         @loaded = true
       end
 

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

@@ -8,6 +8,10 @@ module Asciidoctor
   module Diagram
     # @private
     module Java
+      def self.environment_variable(key)
+        ENV[key]
+      end
+
       class CommandServer
         def initialize(java, classpath)
           classpath.each do |file|

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

@@ -28,8 +28,10 @@ module Asciidoctor
 
         viewbox = root.attributes['viewBox']
         if (v = VIEWBOX_REGEX.match(viewbox)) && width.nil? && height.nil?
-          width = to_numeric(v[:width])
-          height = to_numeric(v[:height])
+          min_x = to_numeric(v[:min_x])
+          min_y = to_numeric(v[:min_y])
+          width ||= to_numeric(v[:width]) - min_x
+          height ||= to_numeric(v[:height]) - min_y
         end
 
         if viewbox.nil? && width && height
@@ -76,7 +78,7 @@ module Asciidoctor
       end
 
       WIDTH_HEIGHT_REGEX = /^\s*(?<value>\d+(?:\.\d+)?)\s*(?<unit>[a-zA-Z]+)?\s*$/
-      VIEWBOX_REGEX = /^\s*\d+(?:\.\d+)?\s*\d+(?:\.\d+)?\s*(?<width>\d+(?:\.\d+)?)\s*(?<height>\d+(?:\.\d+)?)\s*$/
+      VIEWBOX_REGEX = /^\s*(?<min_x>-?\d+(?:\.\d+)?)\s*(?<min_y>-?\d+(?:\.\d+)?)\s*(?<width>\d+(?:\.\d+)?)\s*(?<height>\d+(?:\.\d+)?)\s*$/
 
       def self.to_px_factor(unit)
         case unit

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

@@ -32,14 +32,16 @@ module Asciidoctor
           vega_code = code
         end
 
-        generate_file(source.find_command("vg2#{format}"), "json", format.to_s, vega_code) do |tool_path, input_path, output_path|
+        generate_stdin_stdout(source.find_command("vg2#{format}"), vega_code) do |tool_path|
           args = [tool_path, '--base', Platform.native_path(base_dir)]
           if format == :svg
             args << '--header'
           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/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.2.3"
+    VERSION = "3.0.0"
   end
 end

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

@@ -9,39 +9,53 @@ module Asciidoctor
       include DiagramConverter
       include CliGenerator
 
-
       def supported_formats
         [:png, :svg]
       end
 
-
       def convert(source, format, options)
-        wavedrom_cli = source.find_command('wavedrom-cli', :raise_on_error => false)
-        if wavedrom_cli
-          generate_file(wavedrom_cli, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-            [Platform.native_path(tool_path), '--input', Platform.native_path(input_path), "--#{format.to_s}", Platform.native_path(output_path)]
-          end
-        else
-          wavedrom_cli = source.find_command('wavedrom', :raise_on_error => false)
-          phantomjs = source.find_command('phantomjs', :alt_attrs => ['phantomjs_2'], :raise_on_error => false)
+        wavedrom = source.find_command('wavedrom-cli', :attrs => ['wavedrom'], :raise_on_error => false)
 
-          if wavedrom_cli && !wavedrom_cli.include?('WaveDromEditor') && phantomjs
-            generate_file(wavedrom_cli, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-              [phantomjs, Platform.native_path(tool_path), '-i', Platform.native_path(input_path), "-#{format.to_s[0]}", Platform.native_path(output_path)]
+        unless wavedrom
+          wavedrom = source.find_command('wavedrom', :raise_on_error => false)
+        end
+
+        unless wavedrom
+          if ::Asciidoctor::Diagram::Platform.os == :macosx
+            wavedrom = source.find_command('WaveDromEditor.app', :alt_cmds => ['wavedrom-editor.app'], :attrs => ['WaveDromEditorApp'], :path => ['/Applications'], :raise_on_error => false)
+            if wavedrom
+              wavedrom = File.join(wavedrom, 'Contents/MacOS/nwjs')
             end
           else
-            if ::Asciidoctor::Diagram::Platform.os == :macosx
-              wavedrom = source.find_command('WaveDromEditor.app', :alt_cmds => ['wavedrom-editor.app'], :attrs => ['WaveDromEditorApp'], :path => ['/Applications'])
-              if wavedrom
-                wavedrom = File.join(wavedrom, 'Contents/MacOS/nwjs')
-              end
-            else
-              wavedrom = source.find_command('WaveDromEditor')
-            end
+            wavedrom = source.find_command('WaveDromEditor', :raise_on_error => false)
+          end
+        end
 
-            generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-              [tool_path, 'source', Platform.native_path(input_path), format.to_s, Platform.native_path(output_path)]
-            end
+        unless wavedrom
+          source.find_command('wavedrom-cli', :attrs => ['wavedrom'])
+        end
+
+        if wavedrom.include?('-cli')
+          generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+            {
+              :args => [Platform.native_path(tool_path), '--input', Platform.native_path(input_path), "--#{format.to_s}", Platform.native_path(output_path)],
+              :chdir => source.base_dir
+            }
+          end
+        elsif wavedrom.include?('WaveDromEditor')
+          generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+            {
+              :args => [tool_path, 'source', Platform.native_path(input_path), format.to_s, Platform.native_path(output_path)],
+              :chdir => source.base_dir
+            }
+          end
+        else
+          phantomjs = source.find_command('phantomjs', :alt_attrs => ['phantomjs_2'])
+          generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+            {
+              :args => [phantomjs, Platform.native_path(tool_path), '-i', Platform.native_path(input_path), "-#{format.to_s[0]}", Platform.native_path(output_path)],
+              :chdir => source.base_dir
+            }
           end
         end
       end

data/lib/asciidoctor-diagram.rb

@@ -3,6 +3,8 @@ require_relative 'asciidoctor-diagram/barcode'
 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'
@@ -15,11 +17,14 @@ require_relative 'asciidoctor-diagram/meme'
 require_relative 'asciidoctor-diagram/mermaid'
 require_relative 'asciidoctor-diagram/msc'
 require_relative 'asciidoctor-diagram/nomnoml'
+require_relative 'asciidoctor-diagram/penrose'
 require_relative 'asciidoctor-diagram/pikchr'
+require_relative 'asciidoctor-diagram/pintora'
 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'