asciidoctor-diagram 2.0.5 → 2.2.0

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

@@ -3,26 +3,24 @@ require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    class MemeBlockMacroProcessor < DiagramBlockMacroProcessor
-      use_converter MemeConverter
-
-      class StringReader
-        def initialize(str)
-          @str = str
-        end
-
-        def lines
-          @str.lines.map { |l| l.rstrip }
-        end
-      end
-
-      name_positional_attributes %w(top bottom target format)
-
+    module MemeProcessor
       def create_source(parent, target, attributes)
         attributes = attributes.dup
         attributes['background'] = apply_target_subs(parent, target)
-        ::Asciidoctor::Diagram::ReaderSource.new(self, parent, StringReader.new(''), attributes)
+        ::Asciidoctor::Diagram::ReaderSource.new(self, parent, '', attributes)
       end
     end
+    
+    class MemeBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter MemeConverter
+      name_positional_attributes %w(top bottom target format)
+      include MemeProcessor
+    end
+
+    class MemeInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter MemeConverter
+      name_positional_attributes %w(top bottom target format)
+      include MemeProcessor
+    end
   end
 end

data/lib/asciidoctor-diagram/mermaid.rb

@@ -4,4 +4,5 @@ require_relative 'mermaid/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::MermaidBlockProcessor, :mermaid
   block_macro Asciidoctor::Diagram::MermaidBlockMacroProcessor, :mermaid
+  inline_macro Asciidoctor::Diagram::MermaidInlineMacroProcessor, :mermaid
 end

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

@@ -64,9 +64,15 @@ module Asciidoctor
 
         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
+        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]
@@ -75,17 +81,25 @@ module Asciidoctor
           if config
             opts[:config] = source.resolve_path(config)
           end
-          run_mmdc(node, mmdc, source, format, opts)
+          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
 
       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)]
+      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])
@@ -148,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/mermaid/extension.rb

@@ -10,5 +10,9 @@ module Asciidoctor
     class MermaidBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter MermaidConverter
     end
+
+    class MermaidInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter MermaidConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/msc.rb

@@ -4,4 +4,5 @@ require_relative 'msc/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::MscBlockProcessor, :msc
   block_macro Asciidoctor::Diagram::MscBlockMacroProcessor, :msc
+  inline_macro Asciidoctor::Diagram::MscInlineMacroProcessor, :msc
 end

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class MscBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter MscgenConverter
     end
+    
+    class MscInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter MscgenConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/nomnoml.rb

@@ -4,4 +4,5 @@ require_relative 'nomnoml/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::NomnomlBlockProcessor, :nomnoml
   block_macro Asciidoctor::Diagram::NomnomlBlockMacroProcessor, :nomnoml
+  inline_macro Asciidoctor::Diagram::NomnomlInlineMacroProcessor, :nomnoml
 end

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class NomnomlBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter NomnomlConverter
     end
+
+    class NomnomlInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter NomnomlConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/pikchr.rb

@@ -4,4 +4,5 @@ require_relative 'pikchr/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::PikchrBlockProcessor, :pikchr
   block_macro Asciidoctor::Diagram::PikchrBlockMacroProcessor, :pikchr
+  inline_macro Asciidoctor::Diagram::PikchrInlineMacroProcessor, :pikchr
 end

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

@@ -17,9 +17,16 @@ module Asciidoctor
       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|
+        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

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class PikchrBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter PikchrConverter
     end
+
+    class PikchrInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter PikchrConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/plantuml.rb

@@ -4,4 +4,5 @@ require_relative 'plantuml/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::PlantUmlBlockProcessor, :plantuml
   block_macro Asciidoctor::Diagram::PlantUmlBlockMacroProcessor, :plantuml
+  inline_macro Asciidoctor::Diagram::PlantUmlInlineMacroProcessor, :plantuml
 end

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

@@ -1,4 +1,5 @@
 require_relative '../diagram_converter'
+require 'delegate'
 require 'uri'
 
 module Asciidoctor
@@ -7,15 +8,25 @@ 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]
@@ -23,14 +34,14 @@ module Asciidoctor
 
       def collect_options(source)
         {
-            :config => source.attr('plantumlconfig', nil, true) || source.attr('config')
+            :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', nil, false))
-        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/plantuml/extension.rb

@@ -11,6 +11,10 @@ module Asciidoctor
       use_converter UmlConverter
     end
 
+    class PlantUmlInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter UmlConverter
+    end
+
     class SaltBlockProcessor < DiagramBlockProcessor
       use_converter SaltConverter
     end
@@ -18,5 +22,9 @@ module Asciidoctor
     class SaltBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter SaltConverter
     end
+
+    class SaltInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter SaltConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/salt.rb

@@ -4,4 +4,5 @@ require_relative 'plantuml/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::SaltBlockProcessor, :salt
   block_macro Asciidoctor::Diagram::SaltBlockMacroProcessor, :salt
+  inline_macro Asciidoctor::Diagram::SaltInlineMacroProcessor, :salt
 end

data/lib/asciidoctor-diagram/shaape.rb

@@ -4,4 +4,5 @@ require_relative 'shaape/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::ShaapeBlockProcessor, :shaape
   block_macro Asciidoctor::Diagram::ShaapeBlockMacroProcessor, :shaape
+  inline_macro Asciidoctor::Diagram::ShaapeInlineMacroProcessor, :shaape
 end

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class ShaapeBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter ShaapeConverter
     end
+
+    class ShaapeInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter ShaapeConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/smcat.rb

@@ -4,4 +4,5 @@ require_relative 'smcat/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::SmcatBlockProcessor, :smcat
   block_macro Asciidoctor::Diagram::SmcatBlockMacroProcessor, :smcat
+  inline_macro Asciidoctor::Diagram::SmcatInlineMacroProcessor, :smcat
 end

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class SmcatBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter SmcatConverter
     end
+
+    class SmcatInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter SmcatConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/svgbob.rb

@@ -4,4 +4,5 @@ require_relative 'svgbob/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::SvgBobBlockProcessor, :svgbob
   block_macro Asciidoctor::Diagram::SvgBobBlockMacroProcessor, :svgbob
+  inline_macro Asciidoctor::Diagram::SvgBobInlineMacroProcessor, :svgbob
 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 },

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class SvgBobBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter SvgbobConverter
     end
+
+    class SvgBobInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter SvgbobConverter
+    end
   end
 end