asciidoctor-diagram 2.0.2 → 2.1.2

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

@@ -1,4 +1,5 @@
 require_relative '../diagram_converter'
+require 'delegate'
 require 'uri'
 
 module Asciidoctor
@@ -7,30 +8,40 @@ module Asciidoctor
     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__)
+      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 wrap_source(source)
+        PlantUMLPreprocessedSource.new(source, self.class.tag)
       end
-      Java.classpath.concat JARS
 
       def supported_formats
         [: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)
+            :size_limit => source.attr('size-limit', '4096')
         }
       end
 
       def convert(source, format, options)
         Java.load
 
-        code = preprocess_code(source, self.class.tag)
+        code = source.code
 
         case format
         when :png
@@ -49,9 +60,9 @@ module Asciidoctor
             'Accept' => mime_type
         }
 
-        config_file = options[:config]
-        if config_file
-          headers['X-PlantUML-Config'] = File.expand_path(config_file, source.base_dir)
+        size_limit = options[:size_limit]
+        if size_limit
+          headers['X-PlantUML-SizeLimit'] = size_limit
         end
 
         dot = source.find_command('dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
@@ -71,35 +82,6 @@ module Asciidoctor
 
         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
@@ -113,5 +95,48 @@ module Asciidoctor
         'salt'
       end
     end
+
+    class PlantUMLPreprocessedSource < SimpleDelegator
+      def initialize(source, tag)
+        super(source)
+        @tag = tag
+      end
+
+      def code
+        @code ||= load_code
+      end
+
+      def load_code
+        Java.load
+
+        code = __getobj__.code
+
+        code = "@start#{@tag}\n#{code}\n@end#{@tag}" unless code.index("@start") && code.index("@end")
+
+        headers = {}
+
+        config_file = attr('plantumlconfig', nil, true) || attr('config')
+        if config_file
+          headers['X-PlantUML-Config'] = File.expand_path(config_file, base_dir)
+        end
+
+        headers['X-PlantUML-Basedir'] = Platform.native_path(File.expand_path(base_dir))
+
+        response = Java.send_request(
+          :url => '/plantumlpreprocessor',
+          :body => code,
+          :headers => headers
+        )
+
+        unless response[:code] == 200
+          raise Java.create_error("PlantUML preprocessing failed", response)
+        end
+
+        code = response[:body]
+        code.force_encoding(Encoding::UTF_8)
+
+        code
+      end
+    end
   end
 end

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,6 +14,10 @@ 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 },
@@ -21,12 +25,12 @@ module Asciidoctor
           :scale => lambda { |o, v| o << '--scale' << v if v }
       }
 
-      def collect_options(source, name)
+      def collect_options(source)
         options = {}
 
         OPTIONS.keys.each do |option|
           attr_name = option.to_s.tr('_', '-')
-          options[option] = source.attr(attr_name, nil, name) || source.attr(attr_name, nil, 'svgbob-option')
+          options[option] = source.attr(attr_name) || source.attr(attr_name, nil, 'svgbob-option')
         end
 
         options

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-file')
         }
       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