asciidoctor-diagram 2.0.0 → 2.1.0

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

@@ -15,42 +15,50 @@ module Asciidoctor
       end
 
 
-      def collect_options(source, name)
-        bg_img = source.attr('background', nil, name)
+      def collect_options(source)
+        bg_img = source.attr('background')
         raise "background attribute is required" unless bg_img
 
-        options = source.attr('options', '', name).split(',')
+        options = source.attr('options', '').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),
+            :fill_color => source.attr(['fillcolor', 'fill-color']),
+            :stroke_color => source.attr(['strokecolor', 'stroke-color']),
+            :stroke_width => source.attr(['strokewidth', 'stroke-width']),
+            :font => source.attr('font', 'Impact'),
             :noupcase => options.include?('noupcase'),
         }
       end
 
       def convert(source, format, options)
-        convert = source.find_command('convert')
-        identify = source.find_command('identify')
+        magick = source.find_command('magick', :raise_on_error => false)
+        if magick
+          convert = ->(*args) { Cli.run(magick, 'convert', *args) }
+          identify = ->(*args) { Cli.run(magick, 'identify', *args) }
+        else
+          convert_cmd = source.find_command('convert')
+          convert = ->(*args) { Cli.run(convert_cmd, *args) }
+          identify_cmd = source.find_command('identify')
+          identify = ->(*args) { Cli.run(identify_cmd, *args) }
+        end
 
         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]
-        bottom_label = options[:bottom]
+        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+)/)
+        dimensions = identify.call('-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
@@ -58,8 +66,7 @@ module Asciidoctor
 
         if top_label
           top_img = Tempfile.new(['meme', '.png'])
-          Cli.run(
-              convert,
+          convert.call(
               '-background', 'none',
               '-fill', fill_color,
               '-stroke', stroke_color,
@@ -76,8 +83,7 @@ module Asciidoctor
 
         if bottom_label
           bottom_img = Tempfile.new(['meme', '.png'])
-          Cli.run(
-              convert,
+          convert.call(
               '-background', 'none',
               '-fill', fill_color,
               '-stroke', stroke_color,
@@ -94,7 +100,7 @@ module Asciidoctor
 
         final_img = Tempfile.new(['meme', ".#{format.to_s}"])
 
-        args = [convert, bg_img]
+        args = [bg_img]
         if top_img
           args << top_img.path << '-geometry' << '+0+0' << '-composite'
         end
@@ -105,7 +111,7 @@ module Asciidoctor
 
         args << final_img.path
 
-        Cli.run(*args)
+        convert.call(*args)
 
         File.binread(final_img)
       end

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

@@ -15,18 +15,26 @@ module Asciidoctor
         [:png, :svg]
       end
 
-      def collect_options(source, name)
+      def native_scaling?
+        true
+      end
+
+      def collect_options(source)
         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[:css] = source.attr('css')
+        options[:gantt_config] = source.attr(['ganttconfig', 'gantt-config'])
+        options[:seq_config] = source.attr(['sequenceconfig', 'sequence-config'])
+        options[:width] = source.attr('width')
+        options[:height] = source.attr('height')
+        options[:scale] = source.attr('scale')
+        if options[:scale]
+          raise "Mermaid only supports integer scale factors: #{options[:scale]}" unless options[:scale] =~ /^[0-9]+$/
+        end
+        options[:theme] = source.attr('theme')
+        options[:background] = source.attr('background')
+        options[:config] = source.attr('config')
+        options[:puppeteer_config] = source.attr(['puppeteerconfig', 'puppeteer-config'])
 
         options
       end
@@ -56,9 +64,17 @@ module Asciidoctor
 
         opts[:width] = options[:width]
 
-        mmdc = source.find_command('mmdc', :raise_on_error => false)
+        mmdc = nil
+        mmdc_exception = nil
+        begin
+          mmdc = source.find_command('mmdc')
+        rescue => e
+          mmdc_exception = e
+        end
+
         if mmdc
           opts[:height] = options[:height]
+          opts[:scale] = options[:scale]
           opts[:theme] = options[:theme]
           opts[:background] = options[:background]
           config = options[:config]
@@ -67,8 +83,16 @@ module Asciidoctor
           end
           run_mmdc(mmdc, source, format, opts)
         else
-          mermaid = source.find_command('mermaid')
-          run_mermaid(mermaid, source, format, opts)
+          begin
+            mermaid = source.find_command('mermaid')
+            run_mermaid(mermaid, source, format, opts)
+          rescue
+            if mmdc_exception
+              raise mmdc_exception
+            else
+              raise
+            end
+          end
         end
       end
 
@@ -93,6 +117,10 @@ module Asciidoctor
             args << '--height' << options[:height]
           end
 
+          if options[:scale]
+            args << '--scale' << options[:scale]
+          end
+
           if options[:background]
             bg = options[:background]
             bg = "##{bg}" unless bg[0] == '#'
@@ -134,7 +162,10 @@ module Asciidoctor
             args << '--puppeteerConfigFile' << Platform.native_path(options[:puppeteer])
           end
 
-          args
+          {
+              :args => args,
+              :env => {'NODE_OPTIONS' => '--unhandled-rejections=strict'}
+          }
         end
       end
 

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

@@ -14,8 +14,8 @@ module Asciidoctor
         [:png, :svg]
       end
 
-      def collect_options(source, name)
-        {:font => source.attr('font', nil, name)}
+      def collect_options(source)
+        {:font => source.attr('font')}
       end
 
       def convert(source, format, options)

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,33 @@
+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')
+
+        output = generate_file_stdout(pikchr_path, format.to_s, source.to_s) do |tool_path, input_path|
+          [tool_path, "--svg-only", input_path]
+        end
+
+        if output.start_with? '<svg'
+          output
+        else
+          error = output.gsub(/<\/?[a-z]+>\n?/i, '')
+          raise error
+        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

@@ -7,23 +7,29 @@ module Asciidoctor
     class PlantUmlConverter
       include DiagramConverter
 
-      JARS = [
-          'plantuml-1.3.14.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
+      CLASSPATH_ENV = 'DIAGRAM_PLANTUML_CLASSPATH'
+      LIB_DIR = File.expand_path('../..', File.dirname(__FILE__))
+      PLANTUML_JARS = if ENV.has_key?(CLASSPATH_ENV)
+                        ENV[CLASSPATH_ENV].split(File::PATH_SEPARATOR)
+                      else
+                        begin
+                          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."
+                        end
+                      end
+
+      Java.classpath.concat Dir[File.join(File.dirname(__FILE__), '*.jar')].freeze
+      Java.classpath.concat PLANTUML_JARS
 
       def supported_formats
-        [:png, :svg, :txt]
+        [:png, :svg, :txt, :atxt, :utxt]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {
-            :config => source.attr('plantumlconfig', nil, true) || source.attr('config', nil, name)
+            :config => source.attr('plantumlconfig', nil, true) || source.attr('config')
         }
       end
 
@@ -37,8 +43,10 @@ module Asciidoctor
           mime_type = 'image/png'
         when :svg
           mime_type = 'image/svg+xml'
-        when :txt
+        when :txt, :utxt
           mime_type = 'text/plain;charset=utf-8'
+        when :atxt
+          mime_type = 'text/plain'
         else
           raise "Unsupported format: #{format}"
         end
@@ -76,7 +84,7 @@ module Asciidoctor
         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'))
+          resolve_path(match, source, source.attr('imagesdir', nil, false))
         end
 
         code.gsub!(/(?:(?<=!include\s)|(?<=!includesub\s))\s*[^<][^!\n\r]+/) do |match|

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

@@ -14,10 +14,10 @@ module Asciidoctor
         [:svg]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {
-            :direction => source.attr('direction', nil, name),
-            :engine => source.attr('engine', nil, name)
+            :direction => source.attr('direction'),
+            :engine => source.attr('engine')
         }
       end
 

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

@@ -14,10 +14,38 @@ module Asciidoctor
         [:svg]
       end
 
+      def native_scaling?
+        true
+      end
+
+      OPTIONS = {
+          :font_family => lambda { |o, v| o << '--font-family' << v if v },
+          :font_size => lambda { |o, v| o << '--font-size' << v if v },
+          :stroke_width => lambda { |o, v| o << '--stroke-width' << v if v },
+          :scale => lambda { |o, v| o << '--scale' << v if v }
+      }
+
+      def collect_options(source)
+        options = {}
+
+        OPTIONS.keys.each do |option|
+          attr_name = option.to_s.tr('_', '-')
+          options[option] = source.attr(attr_name) || source.attr(attr_name, nil, 'svgbob-option')
+        end
+
+        options
+      end
+
 
       def convert(source, format, options)
+
+        flags = []
+        options.each do |option, value|
+          OPTIONS[option].call(flags, value)
+        end
+        
         generate_stdin(source.find_command('svgbob'), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, '-o', Platform.native_path(output_path)]
+          ([tool_path, '-o', Platform.native_path(output_path)] + flags)
         end
       end
     end

data/lib/asciidoctor-diagram/symbolator.rb

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

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

@@ -0,0 +1,23 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SymbolatorConverter
+      include DiagramConverter
+      include CliGenerator
+
+      def supported_formats
+        [:png, :pdf, :svg]
+      end
+
+      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}"]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative '../diagram_processor'
+require_relative 'converter'
+
+module Asciidoctor
+  module Diagram
+    class SymbolatorBlockProcessor < DiagramBlockProcessor
+      use_converter SymbolatorConverter
+    end
+
+    class SymbolatorBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SymbolatorConverter
+    end
+  end
+end

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

@@ -14,16 +14,15 @@ module Asciidoctor
         [:png, :svg]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {
-            :heading => source.attr('heading', nil, name),
-            :scale => source.attr('scale', nil, name),
-            :transparent => source.attr('transparent', nil, name),
-            :style => source.attr('style', nil, name)
+            :heading => source.attr('heading'),
+            :scale => source.attr('scale'),
+            :transparent => source.attr('transparent'),
+            :style => source.attr('style')
         }
       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)]
@@ -50,6 +49,10 @@ module Asciidoctor
           args
         end
       end
+
+      def native_scaling?
+        true
+      end
     end
   end
 end