asciidoctor-diagram 1.5.18 → 2.0.3

data/lib/asciidoctor-diagram/lilypond.rb

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

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

@@ -0,0 +1,54 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class LilypondConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :pdf]
+      end
+
+      def collect_options(source, name)
+        {
+            :resolution => source.attr('resolution', nil, name)
+        }
+      end
+
+      def convert(source, format, options)
+        code = <<-EOF
+\\paper{
+  oddFooterMarkup=##f
+  oddHeaderMarkup=##f
+  bookTitleMarkup=##f
+  scoreTitleMarkup=##f
+}
+
+        EOF
+        code << source.to_s
+
+        resolution = options[:resolution]
+
+        generate_stdin(source.find_command('lilypond'), format.to_s, code) do |tool_path, output_path|
+          args = [tool_path, '-daux-files=#f', '-dbackend=eps', '-dno-gs-load-fonts', '-dinclude-eps-fonts', '-o', Platform.native_path(output_path), '-f', format.to_s]
+
+          args << '-dsafe'
+          args << "-dresolution=#{resolution}" if resolution
+          args << "-dpixmap-format=pngalpha" if format == :png
+
+          args << '-'
+
+          {
+              :args => args,
+              :out_file => "#{output_path}.#{format.to_s}"
+          }
+        end        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class LilypondBlockProcessor < DiagramBlockProcessor
+      use_converter LilypondConverter
+    end
+
+    class LilypondBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter LilypondConverter
+    end
+  end
+end

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

@@ -0,0 +1,122 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require 'tempfile'
+require 'open3'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class MemeConverter
+      include DiagramConverter
+
+
+      def supported_formats
+        [:png, :gif]
+      end
+
+
+      def collect_options(source, name)
+        bg_img = source.attr('background', nil, name)
+        raise "background attribute is required" unless bg_img
+
+        options = source.attr('options', '', name).split(',')
+
+        {
+            :bg_img => bg_img,
+            :top_label => source.attr('top'),
+            :bottom_label => source.attr('bottom'),
+            :fill_color => source.attr('fillcolor', nil, name) || source.attr('fill-color', nil, name),
+            :stroke_color => source.attr('strokecolor', nil, name) || source.attr('stroke-color', nil, name),
+            :stroke_width => source.attr('strokewidth', nil, name) || source.attr('stroke-width', nil, name),
+            :font => source.attr('font', 'Impact', name),
+            :noupcase => options.include?('noupcase'),
+        }
+      end
+
+      def convert(source, format, options)
+        convert = source.find_command('convert')
+        identify = source.find_command('identify')
+
+        bg_img = options[:bg_img]
+        raise "background attribute is required" unless bg_img
+
+        bg_img = source.resolve_path(bg_img, source.attr('imagesdir'))
+
+        top_label = options[:top_label]
+        bottom_label = options[:bottom_label]
+        fill_color = options[:fill_color] || 'white'
+        stroke_color = options[:stroke_color] || 'black'
+        stroke_width = options[:stroke_width] || '2'
+        font = options[:font] || 'Impact'
+        noupcase = options[:noupcase]
+
+        dimensions = Cli.run(identify, '-format', '%w %h', bg_img)[:out].match(/(?<w>\d+) (?<h>\d+)/)
+        bg_width = dimensions['w'].to_i
+        bg_height = dimensions['h'].to_i
+        label_width = bg_width
+        label_height = bg_height / 5
+
+        if top_label
+          top_img = Tempfile.new(['meme', '.png'])
+          Cli.run(
+              convert,
+              '-background', 'none',
+              '-fill', fill_color,
+              '-stroke', stroke_color,
+              '-strokewidth', stroke_width,
+              '-font', font,
+              '-size', "#{label_width}x#{label_height}",
+              '-gravity', 'north',
+              "label:#{prepare_label(top_label, noupcase)}",
+              top_img.path
+          )
+        else
+          top_img = nil
+        end
+
+        if bottom_label
+          bottom_img = Tempfile.new(['meme', '.png'])
+          Cli.run(
+              convert,
+              '-background', 'none',
+              '-fill', fill_color,
+              '-stroke', stroke_color,
+              '-strokewidth', stroke_width,
+              '-font', font,
+              '-size', "#{label_width}x#{label_height}",
+              '-gravity', 'south',
+              "label:#{prepare_label(bottom_label, noupcase)}",
+              bottom_img.path
+          )
+        else
+          bottom_img = nil
+        end
+
+        final_img = Tempfile.new(['meme', ".#{format.to_s}"])
+
+        args = [convert, bg_img]
+        if top_img
+          args << top_img.path << '-geometry' << '+0+0' << '-composite'
+        end
+
+        if bottom_img
+          args << bottom_img.path << '-geometry' << "+0+#{bg_height - label_height}" << '-composite'
+        end
+
+        args << final_img.path
+
+        Cli.run(*args)
+
+        File.binread(final_img)
+      end
+
+      private
+
+      def prepare_label(label, noupcase)
+        label = label.upcase unless noupcase
+        label = label.gsub(' // ', '\n')
+        label
+      end
+    end
+  end
+end

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

@@ -1,112 +1,10 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/which'
-require 'tempfile'
-require 'open3'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Meme
-      include Which
-
-      def self.included(mod)
-        [:png, :gif].each do |format|
-          mod.register_format(format, :image) do |parent, source|
-            meme(parent, source, format)
-          end
-        end
-      end
-
-      def meme(parent_block, source, format)
-        convert = which(parent_block, 'convert')
-        identify = which(parent_block, 'identify')
-        inherit_prefix = name
-
-        bg_img = source.attr('background', nil, inherit_prefix)
-        raise "background attribute is required" unless bg_img
-
-        bg_img = parent_block.normalize_system_path(bg_img, parent_block.attr('imagesdir'))
-
-        top_label = source.attr('top')
-        bottom_label = source.attr('bottom')
-        fill_color = source.attr('fillColor', 'white', inherit_prefix)
-        stroke_color = source.attr('strokeColor', 'black', inherit_prefix)
-        stroke_width = source.attr('strokeWidth', '2', inherit_prefix)
-        font = source.attr('font', 'Impact', inherit_prefix)
-        options = source.attr('options', '', inherit_prefix).split(',')
-        noupcase = options.include?('noupcase')
-
-        dimensions = Cli.run(identify, '-format', '%w %h', bg_img)[:out].match(/(?<w>\d+) (?<h>\d+)/)
-        bg_width = dimensions['w'].to_i
-        bg_height = dimensions['h'].to_i
-        label_width = bg_width
-        label_height = bg_height / 5
-
-        if top_label
-          top_img = Tempfile.new(['meme', '.png'])
-          Cli.run(
-              convert,
-              '-background', 'none',
-              '-fill', fill_color,
-              '-stroke', stroke_color,
-              '-strokewidth', stroke_width,
-              '-font', font,
-              '-size', "#{label_width}x#{label_height}",
-              '-gravity', 'north',
-              "label:#{prepare_label(top_label, noupcase)}",
-              top_img.path
-          )
-        else
-          top_img = nil
-        end
-
-        if bottom_label
-          bottom_img = Tempfile.new(['meme', '.png'])
-          Cli.run(
-              convert,
-              '-background', 'none',
-              '-fill', fill_color,
-              '-stroke', stroke_color,
-              '-strokewidth', stroke_width,
-              '-font', font,
-              '-size', "#{label_width}x#{label_height}",
-              '-gravity', 'south',
-              "label:#{prepare_label(bottom_label, noupcase)}",
-              bottom_img.path
-          )
-        else
-          bottom_img = nil
-        end
-
-        final_img = Tempfile.new(['meme', ".#{format.to_s}"])
-
-        args = [convert, bg_img]
-        if top_img
-          args << top_img.path << '-geometry'<< '+0+0' << '-composite'
-        end
-
-        if bottom_img
-          args << bottom_img.path << '-geometry'<< "+0+#{bg_height - label_height}" << '-composite'
-        end
-
-        args << final_img.path
-
-        Cli.run(*args)
-
-        File.binread(final_img)
-      end
-
-      private
-      def prepare_label(label, noupcase)
-        label = label.upcase unless noupcase
-        label = label.gsub(' // ', '\n')
-        label
-      end
-    end
-
-    class MemeBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Meme
+    class MemeBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter MemeConverter
 
       class StringReader
         def initialize(str)
@@ -123,7 +21,7 @@ module Asciidoctor
       def create_source(parent, target, attributes)
         attributes = attributes.dup
         attributes['background'] = apply_target_subs(parent, target)
-        ::Asciidoctor::Diagram::Extensions::ReaderSource.new(parent, StringReader.new(''), attributes)
+        ::Asciidoctor::Diagram::ReaderSource.new(self, parent, StringReader.new(''), attributes)
       end
     end
   end

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

@@ -0,0 +1,179 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class MermaidConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+      def collect_options(source, name)
+        options = {}
+
+        options[:css] = source.attr('css', nil, name)
+        options[:gantt_config] = source.attr('ganttconfig', nil, name) || source.attr('gantt-config', nil, name)
+        options[:seq_config] = source.attr('sequenceconfig', nil, name) || source.attr('sequence-config', nil, name)
+        options[:width] = source.attr('width', nil, name)
+        options[:height] = source.attr('height', nil, name)
+        options[:theme] = source.attr('theme', nil, name)
+        options[:background] = source.attr('background', nil, name)
+        options[:config] = source.attr('config', nil, name)
+        options[:puppeteer_config] = source.attr('puppeteerconfig', nil, name) || source.attr('puppeteer-config', nil, name)
+
+        options
+      end
+
+      def convert(source, format, options)
+        opts = {}
+
+        css = options[:css]
+        if css
+          opts[:css] = source.resolve_path(css)
+        end
+
+        gantt_config = options[:gantt_config]
+        if gantt_config
+          opts[:gantt] = source.resolve_path(gantt_config)
+        end
+
+        seq_config = options[:seq_config]
+        if seq_config
+          opts[:sequence] = source.resolve_path(seq_config)
+        end
+
+        puppeteer_config = options[:puppeteer_config]
+        if puppeteer_config
+          opts[:puppeteer] = source.resolve_path(puppeteer_config)
+        end
+
+        opts[:width] = options[:width]
+
+        mmdc = source.find_command('mmdc', :raise_on_error => false)
+        node = source.find_command('node', :raise_on_error => false)
+        if mmdc && node
+          opts[:height] = options[:height]
+          opts[:theme] = options[:theme]
+          opts[:background] = options[:background]
+          config = options[:config]
+          if config
+            opts[:config] = source.resolve_path(config)
+          end
+          run_mmdc(node, mmdc, source, format, opts)
+        else
+          mermaid = source.find_command('mermaid')
+          run_mermaid(mermaid, source, format, opts)
+        end
+      end
+
+      private
+      def run_mmdc(node, mmdc, source, format, options = {})
+        generate_file(node, 'mmd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          args = [tool_path, '--unhandled-rejections=strict', mmdc, '-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 = source.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
+
+          if options[:puppeteer]
+            args << '--puppeteerConfigFile' << Platform.native_path(options[:puppeteer])
+          end
+
+          args
+        end
+      end
+
+      def run_mermaid(mermaid, source, format, options = {})
+        source.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 = source.find_command('phantomjs', :alt_attrs => [source.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
+  end
+end