asciidoctor-diagram 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b7d586b723b3485288bc8127bbae0ce102fb2d6b07269a98790c01952aa2434
-  data.tar.gz: 97316ae03795b92cd09fd0baf9ecd86b5a68618a5a653e20d905fe3e66dd4c6f
+  metadata.gz: e68570e8ec8e10bd6815b05ef8a6884716fe9bdeb6da30c30d813fe15eef3514
+  data.tar.gz: 426bebf1b41d3f4f3d262a41d90db635f1dffe711de6bde0ac112ffd03b6e496
 SHA512:
-  metadata.gz: 498776729f7aa965ad47f6ff9fe11bd16a09e389eab45a060b80675fd638bd05c4917a686e1effa787afaa67002c549817cdb36c8453453cb9010b9c33effa68
-  data.tar.gz: 6d6dc3314c9163832907cf7a5a45a2802976de6c9c04ef737463cdb2ec7ecb0c87db5f79dcf6bc5001705a10ea959635d66a88af7aa2f8b72bdde40af658d26b
+  metadata.gz: f97b8cad30f43d309e2607c8cbcec8e8f64998de86255ea80e717e5886165632b8e5f0ab97674375cf59edb1249807d2a23c475a9b58de64a611a9182b574ccc
+  data.tar.gz: 5d0ff9dd8bed877c2e5db712320779486735b5cc24ea87c0c3623f94a27be949d84849ed6e504e8428535cdf394ffbccaecebdeb4d7e9d98525a8ddf12f66849

data/CHANGELOG.adoc

@@ -1,5 +1,26 @@
 = Asciidoctor-diagram Changelog
 
+== 2.3.2
+
+Enhancements::
+
+* Issue #465: Add support for https://pintorajs.vercel.app/[Pintora]
+* Issue #476: Use PlantUML's Smetana layout engine by default if Graphviz cannot be located
+* Issue #477: Improve support for using plantuml.com as PlantUML rendering server
+* Add support for Structurizr JSON workspaces
+* Prefer non-PDF formats when rendering with HTML backend
+
+== 2.3.1
+
+Enhancements::
+
+* Issue #423: Add support for loading JSyntrax via the `asciidoctor-diagram-jsyntrax` gem (@inponomarev)
+* Issue #464: Remove usage of 'base64' gem to resolve Ruby 3.3+ compatibility issues
+
+Bugfixes::
+
+* Issue #459: Fix lookup of `wavedrom-cli` location on Windows
+
 == 2.3.0
 
 Enhancements::

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -81,6 +81,13 @@ module Asciidoctor
         begin
           source = converter.wrap_source(source)
 
+          if /html/i =~ parent.document.attributes['backend']
+            # Move PDF to the back of the list for the HTML backend
+            if supported_formats.delete(:pdf)
+              supported_formats << :pdf
+            end
+          end
+
           format = source.attributes.delete('format') || source.global_attr('format', supported_formats[0])
           format = format.to_sym if format.respond_to?(:to_sym)
 
@@ -187,17 +194,27 @@ module Asciidoctor
 
           options = converter.collect_options(source)
           result = converter.convert(source, format, options)
-
-          result.force_encoding(params[:encoding])
+          if result.is_a? Hash
+            image = result[:result]
+            extra = result[:extra]
+          else
+            image = result
+            extra = {}
+          end
+          image.force_encoding(params[:encoding])
 
           metadata = source.create_image_metadata
           metadata[:options] = options
 
           allow_image_optimisation = !source.global_opt('nooptimise')
-          result, metadata[:width], metadata[:height] = params[:decoder].post_process_image(result, allow_image_optimisation)
+          image, metadata[:width], metadata[:height] = params[:decoder].post_process_image(image, allow_image_optimisation)
 
           FileUtils.mkdir_p(File.dirname(image_file)) unless Dir.exist?(File.dirname(image_file))
-          File.open(image_file, 'wb') {|f| f.write result}
+          File.open(image_file, 'wb') {|f| f.write image}
+
+          extra.each do |name, data|
+            File.open(image_file + ".#{name}", 'wb') {|f| f.write data}
+          end
 
           if use_cache
             FileUtils.mkdir_p(File.dirname(metadata_file)) unless Dir.exist?(File.dirname(metadata_file))

data/lib/asciidoctor-diagram/diagram_source.rb

@@ -202,14 +202,6 @@ module Asciidoctor
         name = [name] unless name.is_a?(Enumerable)
 
         value = name.lazy.map { |n| @attributes[n] }.reject { |v| v.nil? }.first
-        if value.nil?
-          attr_position = config[:positional_attrs] || 1
-          while value.nil? && !@attributes[attr_position].nil?
-            if @attributes[attr_position] == name
-              value = true
-            end
-          end
-        end
 
         if value.nil? && inherit
           inherited_values = name.lazy.map do |n|
@@ -345,4 +337,4 @@ module Asciidoctor
       end
     end
   end
-end
+end

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

@@ -55,6 +55,7 @@ module Asciidoctor
 
         code << "\n"
         code << source.to_s
+        code << "\n"
 
         generate_stdin_stdout(source.find_command('gnuplot'), code) do |tool|
           {

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

@@ -1,7 +1,7 @@
 require_relative '../diagram_converter'
+require_relative '../util/base64'
 require_relative '../util/platform'
 
-require 'base64'
 require 'net/http'
 require 'uri'
 require 'zlib'
@@ -47,15 +47,20 @@ module Asciidoctor
           compressed = deflate.deflate(code, Zlib::FINISH)
           deflate.close
 
-          encoded = Base64.urlsafe_encode64(compressed)
-          data = '0A' + encoded
+          data = Base64.urlsafe_encode(compressed)
+          # See https://plantuml.com/text-encoding
+          # PlantUML uses a different alphabet than the one from RFC 4648
+          data.tr!(
+            'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
+            '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+          )
 
           path = uri.path.dup
           path << '/' unless path.end_with? '/'
           path << format.to_s
         when :kroki_io
           compressed = Zlib.deflate(code, Zlib::BEST_COMPRESSION)
-          data = Base64.urlsafe_encode64(compressed)
+          data = Base64.urlsafe_encode(compressed)
 
           path = uri.path.dup
           path << '/' unless path.end_with? '/'
@@ -67,7 +72,8 @@ module Asciidoctor
 
         get_path = path.dup << '/' << data
 
-        if get_path.length > options[:max_get_size]
+        host = uri.host
+        if (host.nil? || !host.downcase.end_with?('plantuml.com')) && get_path.length > options[:max_get_size]
           uri.path = path
           get_uri(uri, code, 'text/plain; charset=utf-8')
         else
@@ -105,7 +111,11 @@ module Asciidoctor
                 resolved_uri = new_uri
               end
 
-              get_uri(resolved_uri, post_data, post_content_type, attempt + 1)
+              if response.code == '307'
+                get_uri(resolved_uri, post_data, post_content_type, attempt + 1)
+              else
+                get_uri(resolved_uri, nil, nil, attempt + 1)
+              end
             else
               response.value
           end

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

@@ -1,10 +1,10 @@
-require 'base64'
 require 'json'
 require 'sinatra/base'
 require 'zlib'
 
 require_relative '../diagram_source'
 require_relative '../graphviz/converter'
+require_relative '../util/base64'
 require_relative '../util/which'
 
 module Asciidoctor
@@ -14,7 +14,7 @@ module Asciidoctor
         type = params['type']
         accepts = lambda { |t| params['format'].downcase.to_sym == t }
         raw_source = params['source']
-        decoded_source = Base64.urlsafe_decode64(raw_source)
+        decoded_source = Base64.urlsafe_decode(raw_source)
         decompressed_source = Zlib::Inflate.inflate(decoded_source)
         source = decompressed_source
         render_diagram(type, accepts, source, {})

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

@@ -0,0 +1,60 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class PintoraConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+      def collect_options(source)
+        options = {}
+
+        options[:width] = source.attr('width')
+        options[:theme] = source.attr('theme')
+        options[:background_color] = source.attr('background-color')
+        options[:pixel_ratio] = source.attr('pixel-ratio')
+
+        options
+      end
+
+      def convert(source, format, options)
+        pintora = source.find_command('pintora')
+
+        generate_file(pintora, 'pintora', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          args = [tool_path, 'render', '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)]
+
+
+          if options[:width]
+            args << '-w' << options[:width]
+          end
+
+          if options[:theme]
+            args << '-t' << options[:theme]
+          end
+
+          if options[:pixel_ratio]
+            args << '-p' << options[:pixel_ratio]
+          end
+
+          if options[:background_color]
+            args << '-b' << options[:background_color]
+          end
+
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class PintoraBlockProcessor < DiagramBlockProcessor
+      use_converter PintoraConverter
+    end
+
+    class PintoraBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter PintoraConverter
+    end
+
+    class PintoraInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter PintoraConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/pintora.rb

@@ -0,0 +1,8 @@
+require 'asciidoctor/extensions'
+require_relative 'pintora/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::PintoraBlockProcessor, :pintora
+  block_macro Asciidoctor::Diagram::PintoraBlockMacroProcessor, :pintora
+  inline_macro Asciidoctor::Diagram::PintoraInlineMacroProcessor, :pintora
+end

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

@@ -45,6 +45,8 @@ module Asciidoctor
         theme = source.attr('theme', nil)
         options[:theme] = theme if theme
 
+        options[:debug] = true if source.opt('debug')
+
         options
       end
 
@@ -108,13 +110,15 @@ module Asciidoctor
         add_theme_header(headers, options[:theme])
         add_size_limit_header(headers, options[:size_limit])
 
-        if options[:smetana]
+        dot = source.find_command('dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
+        if options[:smetana] || !dot
           headers['X-Graphviz'] = 'smetana'
         else
-          dot = source.find_command('dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
-          if dot
-            headers['X-Graphviz'] = ::Asciidoctor::Diagram::Platform.host_os_path(dot)
-          end
+          headers['X-Graphviz'] = ::Asciidoctor::Diagram::Platform.host_os_path(dot)
+        end
+
+        if options[:debug]
+          headers['X-PlantUML-Debug'] = 'true'
         end
 
         response = Java.send_request(
@@ -127,7 +131,37 @@ module Asciidoctor
           raise Java.create_error("PlantUML image generation failed", response)
         end
 
-        response[:body]
+        if response[:headers]['content-type'] =~ /multipart\/form-data;\s*boundary=(.*)/
+          boundary = $1
+          parts = {}
+
+          multipart_data = StringIO.new(response[:body])
+          while true
+            multipart_data.readline
+            marker = multipart_data.readline
+            if marker.start_with? "--#{boundary}--"
+              break
+            elsif marker.start_with? "--#{boundary}"
+              part = Java.parse_body(multipart_data)
+              if part[:headers]['content-disposition'] =~ /form-data;\s*name="([^"]*)"/
+                if $1 == 'image'
+                  parts[:result] = part[:body]
+                else
+                  parts[:extra] ||= {}
+                  parts[:extra][$1] = part[:body]
+                end
+              else
+                raise "Unexpected multipart content disposition"
+              end
+            else
+              raise "Unexpected multipart boundary"
+            end
+          end
+
+          parts
+        else
+          response[:body]
+        end
       end
     end
 

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

@@ -17,7 +17,12 @@ module Asciidoctor
                            lib_dir = File.expand_path('lib', CLI_HOME_ENV)
                            Dir.children(lib_dir).select { |c| c.end_with? '.jar' }.map { |c| File.expand_path(c, lib_dir) }
                          else
-                           nil
+                           begin
+                             require 'asciidoctor-diagram/jsyntrax/classpath'
+                             ::Asciidoctor::Diagram::JsyntraxClasspath::JAR_FILES
+                           rescue LoadError
+                             nil
+                           end
                          end
 
       if JSYNTRAX_JARS

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

@@ -15,7 +15,7 @@ module Asciidoctor
 
       def collect_options(source)
         {
-            :preamble => source.attr('preamble') == 'true'
+            :preamble => source.opt('preamble') || source.attr('preamble') == 'true'
         }
       end
 

data/lib/asciidoctor-diagram/util/base64.rb

@@ -0,0 +1,25 @@
+module Asciidoctor
+  module Diagram
+    module Base64
+      def self.urlsafe_encode(bin, padding: true)
+        str = [bin].pack("m0")
+        str.chomp!("==") or str.chomp!("=") unless padding
+        str.tr!("+/", "-_")
+        str
+      end
+
+      def self.urlsafe_decode(str)
+        # NOTE: RFC 4648 does say nothing about unpadded input, but says that
+        # "the excess pad characters MAY also be ignored", so it is inferred that
+        # unpadded input is also acceptable.
+        if !str.end_with?("=") && str.length % 4 != 0
+          str = str.ljust((str.length + 3) & ~3, "=")
+          str.tr!("-_", "+/")
+        else
+          str = str.tr("-_", "+/")
+        end
+        str.unpack1("m0")
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/util/java.rb

@@ -58,25 +58,34 @@ module Asciidoctor
         resp[:code] = status_line_parts[1].to_i
         resp[:reason] = status_line_parts[2]
 
+        resp.merge! parse_body(io)
+
+        resp
+      end
+
+      def self.parse_body(io)
+        body = {}
+
+        io.set_encoding Encoding::US_ASCII
         headers = {}
         until (header = io.readline(CRLF).strip).empty?
           key, value = header.split ':', 2
-          headers[key] = value.strip
+          headers[key.downcase] = value.strip
         end
 
-        resp[:headers] = headers
+        body[:headers] = headers
 
-        content_length = headers['Content-Length']
+        content_length = headers['content-length']
         if content_length
           io.set_encoding Encoding::BINARY
-          resp[:body] = io.read(content_length.to_i)
+          body[:body] = io.read(content_length.to_i)
         end
 
-        resp
+        body
       end
 
       def self.create_error(prefix_msg, response)
-        content_type = response[:headers]['Content-Type'] || 'text/plain'
+        content_type = response[:headers]['content-type'] || 'text/plain'
         if content_type.start_with? 'application/json'
           json = JSON.parse(response[:body].force_encoding(Encoding::UTF_8))
           ruby_bt = Kernel.caller(2)
@@ -97,7 +106,6 @@ module Asciidoctor
         @java_exe
       end
 
-      private
       def self.find_java
         case ::Asciidoctor::Diagram::Platform.os
           when :windows

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.3.0"
+    VERSION = "2.3.2"
   end
 end

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

@@ -35,7 +35,7 @@ module Asciidoctor
           source.find_command('wavedrom-cli', :attrs => ['wavedrom'])
         end
 
-        if wavedrom.end_with?('-cli')
+        if wavedrom.include?('-cli')
           generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
             {
               :args => [Platform.native_path(tool_path), '--input', Platform.native_path(input_path), "--#{format.to_s}", Platform.native_path(output_path)],

data/lib/asciidoctor-diagram.rb

@@ -19,6 +19,7 @@ require_relative 'asciidoctor-diagram/msc'
 require_relative 'asciidoctor-diagram/nomnoml'
 require_relative 'asciidoctor-diagram/penrose'
 require_relative 'asciidoctor-diagram/pikchr'
+require_relative 'asciidoctor-diagram/pintora'
 require_relative 'asciidoctor-diagram/plantuml'
 require_relative 'asciidoctor-diagram/salt'
 require_relative 'asciidoctor-diagram/shaape'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,7 +156,7 @@ files:
 - lib/asciidoctor-diagram/diagrams/extension.rb
 - lib/asciidoctor-diagram/ditaa.rb
 - lib/asciidoctor-diagram/ditaa/converter.rb
-- lib/asciidoctor-diagram/ditaa/ditaa-2.1.0.jar
+- lib/asciidoctor-diagram/ditaa/ditaa-2.2.0.jar
 - lib/asciidoctor-diagram/ditaa/extension.rb
 - lib/asciidoctor-diagram/dpic.rb
 - lib/asciidoctor-diagram/dpic/converter.rb
@@ -196,10 +196,13 @@ files:
 - lib/asciidoctor-diagram/pikchr.rb
 - lib/asciidoctor-diagram/pikchr/converter.rb
 - lib/asciidoctor-diagram/pikchr/extension.rb
+- lib/asciidoctor-diagram/pintora.rb
+- lib/asciidoctor-diagram/pintora/converter.rb
+- lib/asciidoctor-diagram/pintora/extension.rb
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/converter.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
-- lib/asciidoctor-diagram/plantuml/plantuml-2.1.1.jar
+- lib/asciidoctor-diagram/plantuml/plantuml-2.2.4.jar
 - lib/asciidoctor-diagram/salt.rb
 - lib/asciidoctor-diagram/shaape.rb
 - lib/asciidoctor-diagram/shaape/converter.rb
@@ -211,7 +214,7 @@ files:
 - lib/asciidoctor-diagram/structurizr/converter.rb
 - lib/asciidoctor-diagram/structurizr/extension.rb
 - lib/asciidoctor-diagram/structurizr/renderers.rb
-- lib/asciidoctor-diagram/structurizr/structurizr-2.1.1.jar
+- lib/asciidoctor-diagram/structurizr/structurizr-2.2.2.jar
 - lib/asciidoctor-diagram/svgbob.rb
 - lib/asciidoctor-diagram/svgbob/converter.rb
 - lib/asciidoctor-diagram/svgbob/extension.rb
@@ -221,13 +224,14 @@ files:
 - lib/asciidoctor-diagram/syntrax.rb
 - lib/asciidoctor-diagram/syntrax/converter.rb
 - lib/asciidoctor-diagram/syntrax/extension.rb
-- lib/asciidoctor-diagram/syntrax/syntrax-2.1.0.jar
+- lib/asciidoctor-diagram/syntrax/syntrax-2.2.0.jar
 - lib/asciidoctor-diagram/tikz.rb
 - lib/asciidoctor-diagram/tikz/converter.rb
 - lib/asciidoctor-diagram/tikz/extension.rb
 - lib/asciidoctor-diagram/umlet.rb
 - lib/asciidoctor-diagram/umlet/converter.rb
 - lib/asciidoctor-diagram/umlet/extension.rb
+- lib/asciidoctor-diagram/util/base64.rb
 - lib/asciidoctor-diagram/util/binaryio.rb
 - lib/asciidoctor-diagram/util/cli.rb
 - lib/asciidoctor-diagram/util/cli_generator.rb
@@ -238,7 +242,7 @@ files:
 - lib/asciidoctor-diagram/util/pdf.rb
 - lib/asciidoctor-diagram/util/platform.rb
 - lib/asciidoctor-diagram/util/png.rb
-- lib/asciidoctor-diagram/util/server-2.1.0.jar
+- lib/asciidoctor-diagram/util/server-2.2.3.jar
 - lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/util/which.rb
 - lib/asciidoctor-diagram/vega.rb