asciidoctor-diagram 2.2.17 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e0718c877d72f84af027588bb5a9d100dda3568b34e89655f26c7cf7a4eb07
-  data.tar.gz: a4ecd6791f531cb9654651ae982e7e52406a462075814a78106188729388f45e
+  metadata.gz: ba1fe3f7c564342dde9942ddb021de41fd84e10d2661b0fe29f8e716c960e145
+  data.tar.gz: 5b504adb1364e2c7a709adebebe54b68af6e5571de5192f3784567178839c24a
 SHA512:
-  metadata.gz: 5982bee6e194b651cac1b55af22fb0cc7ccc51341e952f08f70c978efbf2a58d1392f2095607e574ab3078bc4c3b4c9b2424f75c0420f2bad7f8e033c45b52ee
-  data.tar.gz: 402707bbd842e2ec8fcf3da65ee60287d08dcbb0f5b0610313ca05985899c03d06a1199aab25632b06239df57d83408f7be73b53981653aaaa49c4f4884df4b8
+  metadata.gz: cd0ce65811837cd0ee3be1b00eb1e3fe8a951f3b4f0e8c94846450489adc8692d80eab616d1a653fc8bfc8444e92b345e9cb79acac007f5ef49e1fae99108553
+  data.tar.gz: 2289407dc63908392cdcd9bd3e4980b7ec95dd0f2e0ed38f493ea243d62c2f3fa68fff8128b4a3ef7a7dbbc7e46822696551e70b1ef4230f2bf9a7f130a37d49

data/CHANGELOG.adoc

@@ -1,5 +1,28 @@
 = Asciidoctor-diagram Changelog
 
+== 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::
+
+* Issue #457: Relaxed Java version requirement from 11 to 1.8 (for tools that support it)
+
+== 2.2.18
+
+Enhancements::
+
+* Add opt-in support for the PlantUML Smetana layout engine
+
 == 2.2.17
 
 Bugfixes::

data/README.adoc

@@ -2,9 +2,9 @@
 Pepijn Van_Eeckhoudt <https://github.com/pepijnve[@pepijnve]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
 :description: README for the Asciidoctor Diagram extension for Asciidoctor.
 
-image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/Linux%20unit%20tests/badge.svg?branch=master["Linux Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22Linux+unit+tests%22"]
-// image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/macOS%20unit%20tests/badge.svg?branch=master["macOS Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22macOS+unit+tests%22"]
-// image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/Windows%20unit%20tests/badge.svg?branch=master["Windows Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22Windows+unit+tests%22"]
+image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/Linux%20unit%20tests/badge.svg?branch=main["Linux Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22Linux+unit+tests%22"]
+// image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/macOS%20unit%20tests/badge.svg?branch=main["macOS Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22macOS+unit+tests%22"]
+// image:https://github.com/asciidoctor/asciidoctor-diagram/workflows/Windows%20unit%20tests/badge.svg?branch=main["Windows Build Status", link="https://github.com/asciidoctor/asciidoctor-diagram/actions?query=workflow%3A%22Windows+unit+tests%22"]
 image:https://badge.fury.io/rb/asciidoctor-diagram.svg[Gem Version, link=https://rubygems.org/gems/asciidoctor-diagram]
 
 Asciidoctor Diagram is a set of Asciidoctor extensions that enable you to add diagrams, which you describe using plain text, to your AsciiDoc document.

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? '/'

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/plantuml/converter.rb

@@ -37,9 +37,11 @@ module Asciidoctor
 
       def collect_options(source)
         options = {
-            :size_limit => source.attr('size-limit', '4096')
+            :size_limit => source.attr('size-limit', '4096'),
         }
 
+        options[:smetana] = true if source.opt('smetana')
+
         theme = source.attr('theme', nil)
         options[:theme] = theme if theme
 
@@ -106,9 +108,13 @@ module Asciidoctor
         add_theme_header(headers, options[:theme])
         add_size_limit_header(headers, options[:size_limit])
 
-        dot = source.find_command('dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
-        if dot
-          headers['X-Graphviz'] = ::Asciidoctor::Diagram::Platform.host_os_path(dot)
+        if options[:smetana]
+          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
         end
 
         response = Java.send_request(

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

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.2.17"
+    VERSION = "2.3.1"
   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)],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.2.17
+  version: 2.3.1
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-02 00:00:00.000000000 Z
+date: 2024-06-16 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.0.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
@@ -199,7 +199,7 @@ files:
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/converter.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
-- lib/asciidoctor-diagram/plantuml/plantuml-2.0.0.jar
+- lib/asciidoctor-diagram/plantuml/plantuml-2.2.1.jar
 - lib/asciidoctor-diagram/salt.rb
 - lib/asciidoctor-diagram/shaape.rb
 - lib/asciidoctor-diagram/shaape/converter.rb
@@ -211,7 +211,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.0.5.jar
+- lib/asciidoctor-diagram/structurizr/structurizr-2.2.0.jar
 - lib/asciidoctor-diagram/svgbob.rb
 - lib/asciidoctor-diagram/svgbob/converter.rb
 - lib/asciidoctor-diagram/svgbob/extension.rb
@@ -221,13 +221,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.0.2.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 +239,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.0.0.jar
+- lib/asciidoctor-diagram/util/server-2.2.0.jar
 - lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/util/which.rb
 - lib/asciidoctor-diagram/vega.rb
@@ -253,7 +254,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/asciidoctor/asciidoctor-diagram/issues
-  changelog_uri: https://github.com/asciidoctor/asciidoctor-diagram/blob/master/CHANGELOG.adoc
+  changelog_uri: https://github.com/asciidoctor/asciidoctor-diagram/blob/main/CHANGELOG.adoc
   documentation_uri: https://docs.asciidoctor.org/diagram-extension/latest/
   homepage_uri: https://github.com/asciidoctor/asciidoctor-diagram
   source_code_uri: https://github.com/asciidoctor/asciidoctor-diagram.git