asciidoctor-diagram 2.1.0 → 2.2.1

data/lib/asciidoctor-diagram/dpic.rb

@@ -4,4 +4,5 @@ require_relative 'dpic/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::DpicBlockProcessor, :dpic
   block_macro Asciidoctor::Diagram::DpicBlockMacroProcessor, :dpic
+  inline_macro Asciidoctor::Diagram::DpicInlineMacroProcessor, :dpic
 end

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class ErdBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter ErdConverter
     end
+
+    class ErdInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter ErdConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/erd.rb

@@ -4,4 +4,5 @@ require_relative 'erd/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::ErdBlockProcessor, :erd
   block_macro Asciidoctor::Diagram::ErdBlockMacroProcessor, :erd
+  inline_macro Asciidoctor::Diagram::ErdInlineMacroProcessor, :erd
 end

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class GnuplotBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter GnuplotConverter
     end
+
+    class GnuplotInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter GnuplotConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/gnuplot.rb

@@ -4,4 +4,5 @@ require_relative 'gnuplot/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::GnuplotBlockProcessor, :gnuplot
   block_macro Asciidoctor::Diagram::GnuplotBlockMacroProcessor, :gnuplot
+  inline_macro Asciidoctor::Diagram::GnuplotInlineMacroProcessor, :gnuplot
 end

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class GraphvizBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter GraphvizConverter
     end
+
+    class GraphvizInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter GraphvizConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/graphviz.rb

@@ -4,4 +4,5 @@ require_relative 'graphviz/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::GraphvizBlockProcessor, :graphviz
   block_macro Asciidoctor::Diagram::GraphvizBlockMacroProcessor, :graphviz
+  inline_macro Asciidoctor::Diagram::GraphvizInlineMacroProcessor, :graphviz
 end

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

@@ -11,6 +11,8 @@ module Asciidoctor
   module Diagram
     # @private
     class HttpConverter
+      DEFAULT_MAX_GET_SIZE = 1024
+
       include DiagramConverter
 
       def initialize(base_uri, type, converter)
@@ -23,6 +25,14 @@ module Asciidoctor
         @converter.supported_formats
       end
 
+      def collect_options(source)
+        options = {}
+
+        options[:max_get_size] = source.global_attr('max-get-size', DEFAULT_MAX_GET_SIZE).to_i
+
+        options
+      end
+
       def convert(source, format, options)
         code = source.code
 
@@ -41,37 +51,49 @@ module Asciidoctor
           encoded = Base64.urlsafe_encode64(compressed)
           data = '0A' + encoded
 
-          path = uri.path
+          path = uri.path.dup
           path << '/' unless path.end_with? '/'
           path << format.to_s
-          path << '/' << data
-          uri.path = path
         when :kroki_io
           compressed = Zlib.deflate(code, Zlib::BEST_COMPRESSION)
           data = Base64.urlsafe_encode64(compressed)
 
-          path = uri.path
+          path = uri.path.dup
           path << '/' unless path.end_with? '/'
           path << source.diagram_type.to_s
           path << '/' << format.to_s
-          path << '/' << data
-          uri.path = path
         else
           raise "Unsupported server type: " + @type
         end
 
-        get_uri(uri)
+        get_path = path.dup << '/' << data
+
+        if get_path.length > options[:max_get_size]
+          uri.path = path
+          get_uri(uri, code, 'text/plain; charset=utf-8')
+        else
+          uri.path = get_path
+          get_uri(uri)
+        end
       end
 
       private
 
-      def get_uri(uri, attempt = 1)
+      def get_uri(uri, post_data = nil, post_content_type = nil, attempt = 1)
         if attempt >= 10
           raise "Too many redirects"
         end
 
+        if post_data.nil?
+          request = Net::HTTP::Get.new(uri.path)
+        else
+          request = Net::HTTP::Post.new(uri.path)
+          request.body = post_data
+          request.set_content_type(post_content_type) if post_content_type
+        end
+
         Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme.downcase == 'https') do |http|
-          response = http.request_get uri.path
+          response = http.request(request)
           case response
             when Net::HTTPSuccess
               response.body
@@ -79,10 +101,12 @@ module Asciidoctor
               location = response['Location']
               new_uri = URI.parse(location)
               if new_uri.relative?
-                get_uri(uri + location, attempt + 1)
+                resolved_uri = uri + location
               else
-                get_uri(new_uri, attempt + 1)
+                resolved_uri = new_uri
               end
+
+              get_uri(resolved_uri, post_data, post_content_type, attempt + 1)
             else
               response.value
           end

data/lib/asciidoctor-diagram/http/server.rb

@@ -104,7 +104,7 @@ module Asciidoctor
         nil
       end
 
-      def code
+      def load_code
         @source
       end
 

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class LilypondBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter LilypondConverter
     end
+
+    class LilypondInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter LilypondConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/lilypond.rb

@@ -4,4 +4,5 @@ require_relative 'lilypond/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::LilypondBlockProcessor, :lilypond
   block_macro Asciidoctor::Diagram::LilypondBlockMacroProcessor, :lilypond
+  inline_macro Asciidoctor::Diagram::LilypondInlineMacroProcessor, :lilypond
 end

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/meme.rb

@@ -3,4 +3,5 @@ require_relative 'meme/extension'
 
 Asciidoctor::Extensions.register do
   block_macro Asciidoctor::Diagram::MemeBlockMacroProcessor, :meme
+  inline_macro Asciidoctor::Diagram::MemeInlineMacroProcessor, :meme
 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/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/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/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/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/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/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/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/plantuml/converter.rb

@@ -1,4 +1,5 @@
 require_relative '../diagram_converter'
+require 'delegate'
 require 'uri'
 
 module Asciidoctor
@@ -23,20 +24,24 @@ module Asciidoctor
       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
+
       def supported_formats
         [:png, :svg, :txt, :atxt, :utxt]
       end
 
       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
@@ -55,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)
@@ -77,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
@@ -119,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