asciidoctor-diagram 1.5.18 → 2.0.3

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

@@ -1,167 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Mermaid
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            mermaid(parent, source, f)
-          end
-        end
-      end
-
-      def mermaid(parent_block, source, format)
-        inherit_prefix = name
-
-        options = {}
-
-        css = source.attr('css', nil, inherit_prefix)
-        if css
-          options[:css] = parent_block.normalize_system_path(css, source.base_dir)
-        end
-
-        gantt_config = source.attr('ganttConfig', nil, inherit_prefix) || source.attr('ganttconfig', nil, inherit_prefix)
-        if gantt_config
-          options[:gantt] = parent_block.normalize_system_path(gantt_config, source.base_dir)
-        end
-
-        seq_config = source.attr('sequenceConfig', nil, inherit_prefix) || source.attr('sequenceconfig', nil, inherit_prefix)
-        if seq_config
-          options[:sequence] = parent_block.normalize_system_path(seq_config, source.base_dir)
-        end
-
-        options[:width] = source.attr('width', nil, inherit_prefix)
-
-        mmdc = which(parent_block, 'mmdc', :raise_on_error => false)
-        if mmdc
-          options[:height] = source.attr('height', nil, inherit_prefix)
-          options[:theme] = source.attr('theme', nil, inherit_prefix)
-          options[:background] = source.attr('background', nil, inherit_prefix)
-          config = source.attr('config', nil, inherit_prefix) || source.attr('config', nil, inherit_prefix)
-          if config
-            options[:config] = parent_block.normalize_system_path(config, source.base_dir)
-          end
-          run_mmdc(mmdc, source, format, options)
-        else
-          mermaid = which(parent_block, 'mermaid')
-          run_mermaid(mermaid, parent_block, source, format, options)
-        end
-      end
-
-      private
-      def run_mmdc(mmdc, source, format, options = {})
-        generate_file(mmdc, 'mmd', 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)]
-
-          if options[:css]
-            args << '--cssFile' << Platform.native_path(options[:css])
-          end
-
-          if options[:theme]
-            args << '--theme' << options[:theme]
-          end
-
-          if options[:width]
-            args << '--width' << options[:width]
-          end
-
-          if options[:height]
-            args << '--height' << options[:height]
-          end
-
-          if options[:background]
-            bg = options[:background]
-            bg = "##{bg}" unless bg[0] == '#'
-            args << '--backgroundColor' << bg
-          end
-
-          if options[:config]
-            args << '--configFile' << Platform.native_path(options[:config])
-          elsif options[:gantt] || options[:sequence]
-            mermaidConfig = []
-
-            if options[:gantt]
-              mermaidConfig << "\"gantt\": #{File.read(options[:gantt])}"
-            end
-
-            if options[:sequence]
-              configKey = config['mmdcSequenceConfigKey'] ||= begin
-                version_parts = ::Asciidoctor::Diagram::Cli.run(mmdc, '--version')[:out].split('.').map { |p| p.to_i }
-                major = version_parts[0] || 0
-                minor = version_parts[1] || 0
-                patch = version_parts[2] || 0
-                if major > 0 || (major == 0 && minor > 4) || (major == 0 && minor == 4 && patch > 1)
-                  'sequence'
-                else
-                  'sequenceDiagram'
-                end
-              end
-              mermaidConfig << "\"#{configKey}\": #{File.read(options[:sequence])}"
-            end
-
-            config_file = "#{input_path}.json"
-
-            File.write(config_file, "{#{mermaidConfig.join ','}}")
-
-            args << '--configFile' << Platform.native_path(config_file)
-          end
-
-          args
-        end
-      end
-
-      def run_mermaid(mermaid, parent_block, source, format, options = {})
-        config['mermaid>=6'] ||= ::Asciidoctor::Diagram::Cli.run(mermaid, '--version')[:out].split('.')[0].to_i >= 6
-        # Mermaid >= 6.0.0 requires PhantomJS 2.1; older version required 1.9
-        phantomjs = which(parent_block, 'phantomjs', :alt_attrs => [config['mermaid>=6'] ? 'phantomjs_2' : 'phantomjs_19'])
-
-        generate_file(mermaid, 'mmd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          output_dir = File.dirname(output_path)
-          output_file = File.expand_path(File.basename(input_path) + ".#{format.to_s}", output_dir)
-
-          args = [tool_path, '--phantomPath', Platform.native_path(phantomjs), "--#{format.to_s}", '-o', Platform.native_path(output_dir)]
-
-          if options[:css]
-            args << '--css' << Platform.native_path(options[:css])
-          end
-
-          if options[:gantt]
-            args << '--gantt_config' << Platform.native_path(options[:gantt])
-          end
-
-          if options[:sequence]
-            args << '--sequenceConfig' << Platform.native_path(options[:sequence])
-          end
-
-          if options[:width]
-            args << '--width' << options[:width]
-          end
-
-          args << Platform.native_path(input_path)
-
-          {
-              :args => args,
-              :out_file => output_file
-          }
-        end
-      end
-    end
-
-    class MermaidBlockProcessor < Extensions::DiagramBlockProcessor
-      include Mermaid
+    class MermaidBlockProcessor < DiagramBlockProcessor
+      use_converter MermaidConverter
     end
 
-    class MermaidBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Mermaid
+    class MermaidBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter MermaidConverter
     end
   end
 end

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

@@ -0,0 +1,35 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class MscgenConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+      def collect_options(source, name)
+        {:font => source.attr('font', nil, name)}
+      end
+
+      def convert(source, format, options)
+        font = options[:font]
+
+        generate_stdin(source.find_command('mscgen'), format.to_s, source.to_s) do |tool_path, output_path|
+          args = [tool_path, '-o', Platform.native_path(output_path), '-T', format.to_s]
+          if font
+            args << '-F' << font
+          end
+          args << '-'
+          args
+        end
+      end
+    end
+  end
+end

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

@@ -1,44 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Mscgen
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            mscgen(parent, source, f)
-          end
-        end
-      end
-
-      def mscgen(parent, source, format)
-        inherit_prefix = name
-        font = source.attr('font', nil, inherit_prefix)
-
-        generate_stdin(which(parent, 'mscgen'), format.to_s, source.to_s) do |tool_path, output_path|
-          args = [tool_path, '-o', Platform.native_path(output_path), '-T', format.to_s]
-          if font
-            args << '-F' << font
-          end
-          args << '-'
-          args
-        end
-      end
-    end
-
-    class MscBlockProcessor < Extensions::DiagramBlockProcessor
-      include Mscgen
+    class MscBlockProcessor < DiagramBlockProcessor
+      use_converter MscgenConverter
     end
 
-    class MscBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Mscgen
+    class MscBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter MscgenConverter
     end
   end
 end

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

@@ -0,0 +1,25 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class NomnomlConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+
+      def convert(source, format, options)
+        generate_file(source.find_command('nomnoml'), 'nomnoml', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
+        end
+      end
+    end
+  end
+end

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

@@ -1,36 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Nomnoml
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            nomnoml(parent, source, f)
-          end
-        end
-      end
-
-      def nomnoml(parent, source, format)
-        generate_file(which(parent, 'nomnoml'), 'nomnoml', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
-        end
-      end
-    end
-
-    class NomnomlBlockProcessor < Extensions::DiagramBlockProcessor
-      include Nomnoml
+    class NomnomlBlockProcessor < DiagramBlockProcessor
+      use_converter NomnomlConverter
     end
 
-    class NomnomlBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Nomnoml
+    class NomnomlBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter NomnomlConverter
     end
   end
 end

data/lib/asciidoctor-diagram/pikchr.rb

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

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

@@ -0,0 +1,26 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class PikchrConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def convert(source, format, options)
+        pikchr_path = source.find_command('pikchr')
+
+        generate_file_stdout(pikchr_path, format.to_s, source.to_s) do |tool_path, input_path|
+          [tool_path, "--svg-only", input_path]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class PikchrBlockProcessor < DiagramBlockProcessor
+      use_converter PikchrConverter
+    end
+
+    class PikchrBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter PikchrConverter
+    end
+  end
+end

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

@@ -0,0 +1,117 @@
+require_relative '../diagram_converter'
+require 'uri'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class PlantUmlConverter
+      include DiagramConverter
+
+      JARS = [
+          'plantuml-1.3.15.jar',
+          'plantuml.jar',
+          'jlatexmath-minimal-1.0.5.jar',
+          'batik-all-1.10.jar'
+      ].map do |jar|
+        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
+      end
+      Java.classpath.concat JARS
+
+      def supported_formats
+        [:png, :svg, :txt, :atxt, :utxt]
+      end
+
+      def collect_options(source, name)
+        {
+            :config => source.attr('plantumlconfig', nil, true) || source.attr('config', nil, name)
+        }
+      end
+
+      def convert(source, format, options)
+        Java.load
+
+        code = preprocess_code(source, self.class.tag)
+
+        case format
+        when :png
+          mime_type = 'image/png'
+        when :svg
+          mime_type = 'image/svg+xml'
+        when :txt, :utxt
+          mime_type = 'text/plain;charset=utf-8'
+        when :atxt
+          mime_type = 'text/plain'
+        else
+          raise "Unsupported format: #{format}"
+        end
+
+        headers = {
+            'Accept' => mime_type
+        }
+
+        config_file = options[:config]
+        if config_file
+          headers['X-PlantUML-Config'] = File.expand_path(config_file, source.base_dir)
+        end
+
+        dot = source.find_command('dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
+        if dot
+          headers['X-Graphviz'] = ::Asciidoctor::Diagram::Platform.host_os_path(dot)
+        end
+
+        response = Java.send_request(
+            :url => '/plantuml',
+            :body => code,
+            :headers => headers
+        )
+
+        unless response[:code] == 200
+          raise Java.create_error("PlantUML image generation failed", response)
+        end
+
+        response[:body]
+      end
+
+      def preprocess_code(source, tag)
+        code = source.to_s
+
+        code = "@start#{tag}\n#{code}\n@end#{tag}" unless code.index("@start") && code.index("@end")
+
+        code.gsub!(/(?<=<img:)[^>]+(?=>)/) do |match|
+          resolve_path(match, source, source.attr('imagesdir'))
+        end
+
+        code.gsub!(/(?:(?<=!include\s)|(?<=!includesub\s))\s*[^<][^!\n\r]+/) do |match|
+          resolve_path(match.lstrip, source, source.base_dir)
+        end
+
+        code
+      end
+
+      def resolve_path(path, source, base_dir)
+        if path =~ ::URI::ABS_URI
+          uri = ::URI.parse(path)
+          if uri.scheme == 'file'
+            source.resolve_path(uri.path, base_dir)
+          else
+            path
+          end
+        else
+          source.resolve_path(path, base_dir)
+        end
+      end
+    end
+
+    class UmlConverter < PlantUmlConverter
+      def self.tag
+        'uml'
+      end
+    end
+
+    class SaltConverter < PlantUmlConverter
+      def self.tag
+        'salt'
+      end
+    end
+  end
+end