asciidoctor-kroki 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68a706bac6918c95daef5ada0de0d6a8471cbd69cc83ced875119ca69b90f58
-  data.tar.gz: c2683ddf3c70e743faff32a73442ef651fd17145191148e4a5930ac7d16852f9
+  metadata.gz: 1d98287cf9a15751a442de9b1a07565c097206aae0912ca204ecaf4bdede4020
+  data.tar.gz: b1252225ed15a9f093d8a3c1d577e2bfa23c2abe7962981d638f49ea81d90a7b
 SHA512:
-  metadata.gz: 45ea1d0252ebfab9fc9dfba56b13a3497ddf1e5ca58cb05777c941829ec2316f0f194a87bef490483c800d43cd7cf0e008804cb4f92ad4955cc864203ad26dfb
-  data.tar.gz: 3fec5d036175f848b0fa26df6c47439ee2f61a776393c097ecb0e79e0f407939e99df233bb1461360feaf4aae4224377aadff7bbc9d93ffa6fad6af62f7fc40e
+  metadata.gz: 46688eb160c567e33ba1f220ab229848a66874af0713962c339bc4d3b7d3352a5ef3f2f74e9c257bae6c579e03bf6c32cdf55e16f9b64d7b189aa103bf2d8550
+  data.tar.gz: 78a231f8b5921330aab30a2cd5c4f56ab84f917e31dc4cc85d2eb126cec84f04bd52756db2ff1fd8991116086b1100184c0644f35929fadb8ae49f95806e1248

data/.rubocop.yml

@@ -1,8 +1,19 @@
+AllCops:
+  TargetRubyVersion: 2.7
+  SuggestExtensions: false
+  NewCops: enable
+
 Style/Encoding:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 160
+Layout/EndOfLine:
+  EnforcedStyle: lf
+
+Layout/LineLength:
+  Max: 180
+
+Metrics/ClassLength:
+  Max: 150
 
 Metrics/MethodLength:
   Max: 50
@@ -14,4 +25,10 @@ Metrics/PerceivedComplexity:
   Max: 10
 
 Metrics/AbcSize:
-  Max: 30
+  Max: 31
+
+Metrics/ParameterLists:
+  Max: 7
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+3.1.2

data/Gemfile.lock

@@ -1,52 +1,57 @@
 PATH
   remote: .
   specs:
-    asciidoctor-kroki (0.3.0)
+    asciidoctor-kroki (0.6.0)
       asciidoctor (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    asciidoctor (2.0.10)
-    ast (2.4.1)
-    diff-lcs (1.3)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.6)
+    asciidoctor (2.0.11)
+    ast (2.4.2)
+    diff-lcs (1.4.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.2)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.30.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   asciidoctor-kroki!
-  rake (~> 12.3.2)
-  rspec (~> 3.8.0)
-  rubocop (~> 0.74.0)
+  rake (~> 13.0.6)
+  rspec (~> 3.10.0)
+  rubocop (~> 1.30)
 
 BUNDLED WITH
-   1.17.3
+   2.3.15

data/asciidoctor-kroki.gemspec

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'lib/asciidoctor/extensions/asciidoctor_kroki/version'
+
 Gem::Specification.new do |s|
   s.name = 'asciidoctor-kroki'
-  s.version = '0.3.0'
+  s.version = Asciidoctor::AsciidoctorKroki::VERSION
   s.summary = 'Asciidoctor extension to convert diagrams to images using Kroki'
   s.description = 'An extension for Asciidoctor to convert diagrams to images using https://kroki.io'
 
@@ -12,15 +14,15 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/Mogztter/asciidoctor-kroki/issues',
-    'source_code_uri' => 'https://github.com/Mogztter/asciidoctor-kroki'
+    'source_code_uri' => 'https://github.com/Mogztter/asciidoctor-kroki',
+    'rubygems_mfa_required' => 'true'
   }
   s.files = `git ls-files`.split($RS)
-  s.test_files = s.files.grep(%r{^(test|spec|features|tasks)/})
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'asciidoctor', '~> 2.0'
 
-  s.add_development_dependency 'rake', '~> 12.3.2'
-  s.add_development_dependency 'rspec', '~> 3.8.0'
-  s.add_development_dependency 'rubocop', '~> 0.74.0'
+  s.add_development_dependency 'rake', '~> 13.0.6'
+  s.add_development_dependency 'rspec', '~> 3.10.0'
+  s.add_development_dependency 'rubocop', '~> 1.30'
 end

data/lib/asciidoctor/extensions/asciidoctor_kroki/extension.rb

@@ -15,35 +15,90 @@ module AsciidoctorExtensions
     on_context :listing, :literal
     name_positional_attributes 'target', 'format'
 
+    # @param name [String] name of the block macro (optional)
+    # @param config [Hash] a config hash (optional)
+    #   - :logger a logger used to log warning and errors (optional)
+    #
+    def initialize(name = nil, config = {})
+      @logger = (config || {}).delete(:logger) { ::Asciidoctor::LoggerManager.logger }
+      super(name, config)
+    end
+
     def process(parent, reader, attrs)
       diagram_type = @name
       diagram_text = reader.string
-      KrokiProcessor.process(self, parent, attrs, diagram_type, diagram_text)
+      KrokiProcessor.process(self, parent, attrs, diagram_type, diagram_text, @logger)
     end
+
+    protected
+
+    attr_reader :logger
   end
 
   # A block macro extension that converts a diagram into an image.
   #
   class KrokiBlockMacroProcessor < Asciidoctor::Extensions::BlockMacroProcessor
+    include Asciidoctor::Logging
     use_dsl
 
     name_positional_attributes 'format'
 
+    # @param name [String] name of the block macro (optional)
+    # @param config [Hash] a config hash (optional)
+    #   - :logger a logger used to log warning and errors (optional)
+    #
+    def initialize(name = nil, config = {})
+      @logger = (config || {}).delete(:logger) { ::Asciidoctor::LoggerManager.logger }
+      super(name, config)
+    end
+
     def process(parent, target, attrs)
       diagram_type = @name
       target = parent.apply_subs(target, [:attributes])
-      diagram_text = read(target)
-      KrokiProcessor.process(self, parent, attrs, diagram_type, diagram_text)
+
+      unless read_allowed?(target)
+        link = create_inline(parent, :anchor, target, type: :link, target: target)
+        return create_block(parent, :paragraph, link.convert, {}, content_model: :raw)
+      end
+
+      unless (path = resolve_target_path(target))
+        logger.error message_with_context "#{diagram_type} block macro not found: #{target}.", source_location: parent.document.reader.cursor_at_mark
+        return create_block(parent, 'paragraph', unresolved_block_macro_message(diagram_type, target), {})
+      end
+
+      begin
+        diagram_text = read(path)
+      rescue => e # rubocop:disable Style/RescueStandardError
+        logger.error message_with_context "Failed to read #{diagram_type} file: #{path}. #{e}.", source_location: parent.document.reader.cursor_at_mark
+        return create_block(parent, 'paragraph', unresolved_block_macro_message(diagram_type, path), {})
+      end
+      KrokiProcessor.process(self, parent, attrs, diagram_type, diagram_text, @logger)
+    end
+
+    protected
+
+    attr_reader :logger
+
+    def resolve_target_path(target)
+      target
+    end
+
+    def read_allowed?(_target)
+      true
     end
 
     def read(target)
       if target.start_with?('http://') || target.start_with?('https://')
         require 'open-uri'
-        URI.open(target, &:read)
+        ::OpenURI.open_uri(target, &:read)
       else
-        File.open(target, &:read)
+        File.read(target, mode: 'rb:utf-8:utf-8')
       end
     end
+
+    def unresolved_block_macro_message(name, target)
+      "Unresolved block macro - #{name}::#{target}[]"
+    end
   end
 
   # Kroki API
@@ -63,6 +118,7 @@ module AsciidoctorExtensions
       nomnoml
       nwdiag
       packetdiag
+      pikchr
       plantuml
       rackdiag
       seqdiag
@@ -70,19 +126,23 @@ module AsciidoctorExtensions
       umlet
       vega
       vegalite
-      wavedrow
+      wavedrom
+      structurizr
     ].freeze
   end
 
   # Internal processor
   #
   class KrokiProcessor
+    include Asciidoctor::Logging
+
     TEXT_FORMATS = %w[txt atxt utxt].freeze
 
     class << self
-      def process(processor, parent, attrs, diagram_type, diagram_text)
+      # rubocop:disable Metrics/AbcSize
+      def process(processor, parent, attrs, diagram_type, diagram_text, logger)
         doc = parent.document
-        diagram_text = prepend_plantuml_config(diagram_text, diagram_type, doc)
+        diagram_text = prepend_plantuml_config(diagram_text, diagram_type, doc, logger)
         # If "subs" attribute is specified, substitute accordingly.
         # Be careful not to specify "specialcharacters" or your diagram code won't be valid anymore!
         if (subs = attrs['subs'])
@@ -91,12 +151,17 @@ module AsciidoctorExtensions
         title = attrs.delete('title')
         caption = attrs.delete('caption')
         attrs.delete('opts')
-        role = attrs['role']
         format = get_format(doc, attrs, diagram_type)
-        attrs['role'] = get_role(format, role)
+        attrs['role'] = get_role(format, attrs['role'])
         attrs['format'] = format
-        kroki_diagram = KrokiDiagram.new(diagram_type, format, diagram_text)
-        kroki_client = KrokiClient.new(server_url(doc), http_method(doc), KrokiHttpClient)
+        kroki_diagram = KrokiDiagram.new(diagram_type, format, diagram_text, attrs['target'])
+        kroki_client = KrokiClient.new({
+                                         server_url: server_url(doc),
+                                         http_method: http_method(doc),
+                                         max_uri_length: max_uri_length(doc),
+                                         source_location: doc.reader.cursor_at_mark,
+                                         http_client: KrokiHttpClient
+                                       }, logger)
         if TEXT_FORMATS.include?(format)
           text_content = kroki_client.text_content(kroki_diagram)
           block = processor.create_block(parent, 'literal', text_content, attrs)
@@ -109,15 +174,22 @@ module AsciidoctorExtensions
         block.assign_caption(caption, 'figure')
         block
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 
-      def prepend_plantuml_config(diagram_text, diagram_type, doc)
-        if diagram_type == :plantuml && doc.attr?('kroki-plantuml-include')
-          # TODO: this behaves different than the JS version
-          # The file should be added by !include #{plantuml_include}" once we have a preprocessor for ruby
-          config = File.read(doc.attr('kroki-plantuml-include'))
-          diagram_text = config + '\n' + diagram_text
+      def prepend_plantuml_config(diagram_text, diagram_type, doc, logger)
+        if diagram_type == :plantuml && doc.safe < ::Asciidoctor::SafeMode::SECURE && doc.attr?('kroki-plantuml-include')
+          # REMIND: this behaves different than the JS version
+          # Once we have a preprocessor for Ruby, the value should be added in the diagram source as "!include #{plantuml_include}"
+          plantuml_include_path = doc.normalize_system_path(doc.attr('kroki-plantuml-include'))
+          if ::File.readable? plantuml_include_path
+            config = File.read(plantuml_include_path)
+            diagram_text = "#{config}\n#{diagram_text}"
+          else
+            logger.warn message_with_context "Unable to read plantuml-include. File not found or not readable: #{plantuml_include_path}.",
+                                             source_location: doc.reader.cursor_at_mark
+          end
         end
         diagram_text
       end
@@ -145,19 +217,19 @@ module AsciidoctorExtensions
       end
 
       def get_format(doc, attrs, diagram_type)
-        format = attrs['format'] || 'svg'
-        # The JavaFX preview doesn't support SVG well, therefore we'll use PNG format...
-        if doc.attr?('env-idea') && format == 'svg'
-          # ... unless the diagram library does not support PNG as output format!
+        format = attrs['format'] || doc.attr('kroki-default-format') || 'svg'
+        if format == 'png'
+          # redirect PNG format to SVG if the diagram library only supports SVG as output format.
+          # this is useful when the default format has been set to PNG
           # Currently, mermaid, nomnoml, svgbob, wavedrom only support SVG as output format.
-          svg_only_diagram_types = %w[:mermaid :nomnoml :svgbob :wavedrom]
-          format = 'png' unless svg_only_diagram_types.include?(diagram_type)
+          svg_only_diagram_types = %i[mermaid nomnoml svgbob wavedrom]
+          format = 'svg' if svg_only_diagram_types.include?(diagram_type)
         end
         format
       end
 
       def create_image_src(doc, kroki_diagram, kroki_client)
-        if doc.attr('kroki-fetch-diagram')
+        if doc.attr('kroki-fetch-diagram') && doc.safe < ::Asciidoctor::SafeMode::SECURE
           kroki_diagram.save(output_dir_path(doc), kroki_client)
         else
           kroki_diagram.get_diagram_uri(server_url(doc))
@@ -172,20 +244,19 @@ module AsciidoctorExtensions
         doc.attr('kroki-http-method', 'adaptive').downcase
       end
 
+      def max_uri_length(doc)
+        doc.attr('kroki-max-uri-length', '4000').to_i
+      end
+
       def output_dir_path(doc)
-        images_output_dir = doc.attr('imagesoutdir')
-        out_dir = doc.attr('outdir')
-        to_dir = doc.attr('to_dir')
-        base_dir = doc.base_dir
         images_dir = doc.attr('imagesdir', '')
-        if images_output_dir
+        if (images_output_dir = doc.attr('imagesoutdir'))
           images_output_dir
-        elsif out_dir
+        # the nested document logic will become obsolete once https://github.com/asciidoctor/asciidoctor/commit/7edc9da023522be67b17e2a085d72e056703a438 is released
+        elsif (out_dir = doc.attr('outdir') || (doc.nested? ? doc.parent_document : doc).options[:to_dir])
           File.join(out_dir, images_dir)
-        elsif to_dir
-          File.join(to_dir, images_dir)
         else
-          File.join(base_dir, images_dir)
+          File.join(doc.base_dir, images_dir)
         end
       end
     end
@@ -198,14 +269,13 @@ module AsciidoctorExtensions
     require 'zlib'
     require 'digest'
 
-    attr_reader :type
-    attr_reader :text
-    attr_reader :format
+    attr_reader :type, :text, :format, :target
 
-    def initialize(type, format, text)
+    def initialize(type, format, text, target = nil)
       @text = text
       @type = type
       @format = format
+      @target = target
     end
 
     def get_diagram_uri(server_url)
@@ -218,23 +288,21 @@ module AsciidoctorExtensions
 
     def save(output_dir_path, kroki_client)
       diagram_url = get_diagram_uri(kroki_client.server_url)
-      diagram_name = "diag-#{Digest::SHA256.hexdigest diagram_url}.#{@format}"
+      diagram_name = "#{@target || 'diag'}-#{Digest::SHA256.hexdigest diagram_url}.#{@format}"
       file_path = File.join(output_dir_path, diagram_name)
-      encoding = if @format == 'txt' || @format == 'atxt' || @format == 'utxt'
+      encoding = case @format
+                 when 'txt', 'atxt', 'utxt', 'svg'
                    'utf8'
-                 elsif @format == 'svg'
-                   'binary'
                  else
                    'binary'
                  end
       # file is either (already) on the file system or we should read it from Kroki
-      contents = File.exist?(file_path) ? File.open(file_path, &:read) : kroki_client.get_image(self, encoding)
-      FileUtils.mkdir_p(output_dir_path)
-      if encoding == 'binary'
-        File.binwrite(file_path, contents)
-      else
-        File.write(file_path, contents)
+      unless File.exist?(file_path)
+        contents = kroki_client.get_image(self, encoding)
+        FileUtils.mkdir_p(output_dir_path)
+        File.write(file_path, contents, mode: 'wb')
       end
+
       diagram_name
     end
 
@@ -243,12 +311,12 @@ module AsciidoctorExtensions
     def _join_uri_segments(base, *uris)
       segments = []
       # remove trailing slashes
-      segments.push(base.gsub(%r{[/]+$}, ''))
+      segments.push(base.gsub(%r{/+$}, ''))
       segments.concat(uris.map do |uri|
         # remove leading and trailing slashes
         uri.to_s
-          .gsub(%r{^[/]+}, '')
-          .gsub(%r{[/]+$}, '')
+          .gsub(%r{^/+}, '')
+          .gsub(%r{/+$}, '')
       end)
       segments.join('/')
     end
@@ -257,20 +325,23 @@ module AsciidoctorExtensions
   # Kroki client
   #
   class KrokiClient
-    attr_reader :server_url
-    attr_reader :method
+    include Asciidoctor::Logging
+
+    attr_reader :server_url, :method, :max_uri_length
 
     SUPPORTED_HTTP_METHODS = %w[get post adaptive].freeze
 
-    def initialize(server_url, http_method, http_client)
-      @server_url = server_url
-      @max_uri_length = 4096
-      @http_client = http_client
-      method = (http_method || 'adaptive').downcase
+    def initialize(opts, logger = ::Asciidoctor::LoggerManager.logger)
+      @server_url = opts[:server_url]
+      @max_uri_length = opts.fetch(:max_uri_length, 4000)
+      @http_client = opts[:http_client]
+      method = opts.fetch(:http_method, 'adaptive').downcase
       if SUPPORTED_HTTP_METHODS.include?(method)
         @method = method
       else
-        puts "Invalid value '#{method}' for kroki-http-method attribute. The value must be either: 'get', 'post' or 'adaptive'. Proceeding using: 'adaptive'."
+        logger.warn message_with_context "Invalid value '#{method}' for kroki-http-method attribute. The value must be either: " \
+                                         "'get', 'post' or 'adaptive'. Proceeding using: 'adaptive'.",
+                                         source_location: opts[:source_location]
         @method = 'adaptive'
       end
     end
@@ -286,7 +357,7 @@ module AsciidoctorExtensions
       if @method == 'adaptive' || @method == 'get'
         uri = kroki_diagram.get_diagram_uri(server_url)
         if uri.length > @max_uri_length
-          # The request URI is longer than 4096.
+          # The request URI is longer than the max URI length.
           if @method == 'get'
             # The request might be rejected by the server with a 414 Request-URI Too Large.
             # Consider using the attribute kroki-http-method with the value 'adaptive'.
@@ -311,12 +382,28 @@ module AsciidoctorExtensions
     require 'json'
 
     class << self
+      REFERER = "asciidoctor/kroki.rb/#{Asciidoctor::AsciidoctorKroki::VERSION}"
+
       def get(uri, _)
-        ::OpenURI.open_uri(uri, 'r', &:read)
+        uri = URI(uri)
+        request = ::Net::HTTP::Get.new(uri)
+        request['referer'] = REFERER
+        ::Net::HTTP.start(
+          uri.hostname,
+          uri.port,
+          use_ssl: (uri.scheme == 'https')
+        ) do |http|
+          http.request(request).body
+        end
       end
 
       def post(uri, data, _)
-        res = ::Net::HTTP.request_post(uri, data)
+        res = ::Net::HTTP.post(
+          URI(uri),
+          data,
+          'Content-Type' => 'text/plain',
+          'Referer' => REFERER
+        )
         res.body
       end
     end

data/lib/asciidoctor/extensions/asciidoctor_kroki/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Asciidoctor
+  module AsciidoctorKroki
+    VERSION = '0.6.0'
+  end
+end

data/lib/asciidoctor/extensions/asciidoctor_kroki.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
+require_relative 'asciidoctor_kroki/version'
 require_relative 'asciidoctor_kroki/extension'
 
 Asciidoctor::Extensions.register do

data/spec/asciidoctor_kroki_block_macro_spec.rb

@@ -0,0 +1,130 @@
+# rubocop:disable Lint/ConstantDefinitionInBlock
+# frozen_string_literal: true
+
+require 'rspec_helper'
+require 'asciidoctor'
+require_relative '../lib/asciidoctor/extensions/asciidoctor_kroki'
+require_relative '../lib/asciidoctor/extensions/asciidoctor_kroki/extension'
+
+describe ::AsciidoctorExtensions::KrokiBlockMacroProcessor do
+  context 'convert to html5' do
+    it 'should catch exception if target is not readable' do
+      input = <<~'ADOC'
+        plantuml::spec/fixtures/missing.puml[svg,role=sequence]
+      ADOC
+      output = Asciidoctor.convert(input, standalone: false)
+      (expect output).to eql %(<div class="paragraph">
+<p>Unresolved block macro - plantuml::spec/fixtures/missing.puml[]</p>
+</div>)
+    end
+  end
+  context 'using a custom block macro' do
+    it 'should disallow read' do
+      # noinspection RubyClassModuleNamingConvention
+      class DisallowReadKrokiBlockMacroProcessor < ::AsciidoctorExtensions::KrokiBlockMacroProcessor
+        def read_allowed?(_target)
+          false
+        end
+      end
+      registry = Asciidoctor::Extensions.create do
+        block_macro DisallowReadKrokiBlockMacroProcessor, 'plantuml'
+      end
+      input = <<~'ADOC'
+        plantuml::spec/fixtures/alice.puml[svg,role=sequence]
+      ADOC
+      output = Asciidoctor.convert(input, standalone: false, extension_registry: registry)
+      (expect output).to eql %(<div class="paragraph">
+<p><a href="spec/fixtures/alice.puml">spec/fixtures/alice.puml</a></p>
+</div>)
+    end
+    it 'should allow read if target is not a URI' do
+      # noinspection RubyClassModuleNamingConvention
+      class DisallowUriReadKrokiBlockMacroProcessor < ::AsciidoctorExtensions::KrokiBlockMacroProcessor
+        def read_allowed?(target)
+          return false if ::Asciidoctor::Helpers.uriish?(target)
+
+          true
+        end
+      end
+      registry = Asciidoctor::Extensions.create do
+        block_macro DisallowUriReadKrokiBlockMacroProcessor, 'plantuml'
+      end
+      input = <<~'ADOC'
+        plantuml::https://domain.org/alice.puml[svg,role=sequence]
+
+        plantuml::file://path/to/alice.puml[svg,role=sequence]
+
+        plantuml::spec/fixtures/alice.puml[svg,role=sequence]
+      ADOC
+      output = Asciidoctor.convert(input, standalone: false, extension_registry: registry)
+      (expect output).to eql %(<div class="paragraph">
+<p><a href="https://domain.org/alice.puml">https://domain.org/alice.puml</a></p>
+</div>
+<div class="paragraph">
+<p><a href="file://path/to/alice.puml">file://path/to/alice.puml</a></p>
+</div>
+<div class="imageblock sequence kroki-format-svg kroki">
+<div class="content">
+<img src="https://kroki.io/plantuml/svg/eNpLzMlMTlXQtVNIyk-yUshIzcnJ5wIAQ-AGVQ==" alt="Diagram">
+</div>
+</div>)
+    end
+    it 'should override the resolve target method' do
+      # noinspection RubyClassModuleNamingConvention
+      class FixtureResolveTargetKrokiBlockMacroProcessor < ::AsciidoctorExtensions::KrokiBlockMacroProcessor
+        def resolve_target_path(target)
+          "spec/fixtures/#{target}"
+        end
+      end
+      registry = Asciidoctor::Extensions.create do
+        block_macro FixtureResolveTargetKrokiBlockMacroProcessor, 'plantuml'
+      end
+      input = <<~'ADOC'
+        plantuml::alice.puml[svg,role=sequence]
+      ADOC
+      output = Asciidoctor.convert(input, standalone: false, extension_registry: registry)
+      (expect output).to eql %(<div class="imageblock sequence kroki-format-svg kroki">
+<div class="content">
+<img src="https://kroki.io/plantuml/svg/eNpLzMlMTlXQtVNIyk-yUshIzcnJ5wIAQ-AGVQ==" alt="Diagram">
+</div>
+</div>)
+    end
+    it 'should display unresolved block macro message when the target cannot be resolved' do
+      # noinspection RubyClassModuleNamingConvention
+      class UnresolvedTargetKrokiBlockMacroProcessor < ::AsciidoctorExtensions::KrokiBlockMacroProcessor
+        def resolve_target_path(_target)
+          nil
+        end
+      end
+      registry = Asciidoctor::Extensions.create do
+        block_macro UnresolvedTargetKrokiBlockMacroProcessor, 'plantuml'
+      end
+      input = <<~'ADOC'
+        plantuml::alice.puml[svg,role=sequence]
+      ADOC
+      output = Asciidoctor.convert(input, standalone: false, extension_registry: registry)
+      (expect output).to eql %(<div class="paragraph">
+<p>Unresolved block macro - plantuml::alice.puml[]</p>
+</div>)
+    end
+    it 'should override the unresolved block macro message' do
+      # noinspection RubyClassModuleNamingConvention
+      class CustomUnresolvedTargetMessageKrokiBlockMacroProcessor < ::AsciidoctorExtensions::KrokiBlockMacroProcessor
+        def unresolved_block_macro_message(name, target)
+          "*[ERROR: #{name}::#{target}[] - unresolved block macro]*"
+        end
+      end
+      registry = Asciidoctor::Extensions.create do
+        block_macro CustomUnresolvedTargetMessageKrokiBlockMacroProcessor, 'plantuml'
+      end
+      input = <<~'ADOC'
+        plantuml::spec/fixtures/missing.puml[svg,role=sequence]
+      ADOC
+      output = Asciidoctor.convert(input, standalone: false, extension_registry: registry)
+      (expect output).to eql %(<div class="paragraph">
+<p><strong>[ERROR: plantuml::spec/fixtures/missing.puml[] - unresolved block macro]</strong></p>
+</div>)
+    end
+  end
+end
+# rubocop:enable Lint/ConstantDefinitionInBlock

data/spec/asciidoctor_kroki_client_spec.rb

@@ -7,17 +7,85 @@ require_relative '../lib/asciidoctor/extensions/asciidoctor_kroki'
 describe ::AsciidoctorExtensions::KrokiClient do
   it 'should use adaptive method when http method is invalid' do
     kroki_http_client = ::AsciidoctorExtensions::KrokiHttpClient
-    kroki_client = ::AsciidoctorExtensions::KrokiClient.new('http://localhost:8000', 'patch', kroki_http_client)
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'http://localhost:8000', http_method: 'patch', http_client: kroki_http_client)
     expect(kroki_client.method).to eq('adaptive')
   end
   it 'should use post method when http method is post' do
     kroki_http_client = ::AsciidoctorExtensions::KrokiHttpClient
-    kroki_client = ::AsciidoctorExtensions::KrokiClient.new('http://localhost:8000', 'POST', kroki_http_client)
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'http://localhost:8000', http_method: 'POST', http_client: kroki_http_client)
     expect(kroki_client.method).to eq('post')
   end
   it 'should use get method when http method is get' do
     kroki_http_client = ::AsciidoctorExtensions::KrokiHttpClient
-    kroki_client = ::AsciidoctorExtensions::KrokiClient.new('http://localhost:8000', 'get', kroki_http_client)
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'http://localhost:8000', http_method: 'get', http_client: kroki_http_client)
     expect(kroki_client.method).to eq('get')
   end
+  it 'should use 4000 as the default max URI length' do
+    kroki_http_client = ::AsciidoctorExtensions::KrokiHttpClient
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'http://localhost:8000', http_method: 'get', http_client: kroki_http_client)
+    expect(kroki_client.max_uri_length).to eq(4000)
+  end
+  it 'should use a custom value as max URI length' do
+    kroki_http_client = ::AsciidoctorExtensions::KrokiHttpClient
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'http://localhost:8000', http_method: 'get', http_client: kroki_http_client, max_uri_length: 8000)
+    expect(kroki_client.max_uri_length).to eq(8000)
+  end
+  it 'should get an image with POST request if the URI length is greater than the value configured' do
+    kroki_http_client = Class.new do
+      class << self
+        def get(uri, _)
+          "GET #{uri}"
+        end
+
+        def post(uri, data, _)
+          "POST #{uri} - #{data}"
+        end
+      end
+    end
+    kroki_diagram = Class.new do
+      attr_reader :type, :text, :format
+
+      def initialize(type, format, text)
+        @text = text
+        @type = type
+        @format = format
+      end
+
+      def get_diagram_uri(_)
+        'diagram-uri'
+      end
+    end.new('type', 'format', 'text')
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'http://localhost:8000', http_method: 'adaptive', http_client: kroki_http_client, max_uri_length: 10)
+    result = kroki_client.get_image(kroki_diagram, 'utf8')
+    expect(result).to eq('POST http://localhost:8000/type/format - text')
+  end
+  it 'should get an image with GET request if the URI length is lower or equals than the value configured' do
+    kroki_http_client = Class.new do
+      class << self
+        def get(uri, _)
+          "GET #{uri}"
+        end
+
+        def post(uri, data, _)
+          "POST #{uri} - #{data}"
+        end
+      end
+    end
+    kroki_diagram = Class.new do
+      attr_reader :type, :text, :format
+
+      def initialize(type, format, text)
+        @text = text
+        @type = type
+        @format = format
+      end
+
+      def get_diagram_uri(_)
+        'diagram-uri'
+      end
+    end.new('type', 'format', 'text')
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'http://localhost:8000', http_method: 'adaptive', http_client: kroki_http_client, max_uri_length: 11)
+    result = kroki_client.get_image(kroki_diagram, 'utf8')
+    expect(result).to eq('GET diagram-uri')
+  end
 end

data/spec/asciidoctor_kroki_diagram_spec.rb

@@ -28,11 +28,32 @@ describe ::AsciidoctorExtensions::KrokiDiagram do
   it 'should fetch a diagram from Kroki and save it to disk' do
     kroki_diagram = ::AsciidoctorExtensions::KrokiDiagram.new('plantuml', 'txt', ' alice -> bob: hello')
     kroki_http_client = ::AsciidoctorExtensions::KrokiHttpClient
-    kroki_client = ::AsciidoctorExtensions::KrokiClient.new('https://kroki.io', 'get', kroki_http_client)
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'https://kroki.io', http_method: 'get', http_client: kroki_http_client)
     output_dir_path = "#{__dir__}/../.asciidoctor/kroki"
     diagram_name = kroki_diagram.save(output_dir_path, kroki_client)
     diagram_path = File.join(output_dir_path, diagram_name)
-    expect(File.exist?(diagram_path)).to be_truthy, "expected diagram to be saved at #{diagram_path}"
+    expect(File.exist?(diagram_path)).to be_truthy, "diagram should be saved at: #{diagram_path}"
+    content = <<-TXT.chomp
+     ,-----.          ,---.
+     |alice|          |bob|
+     `--+--'          `-+-'
+        |    hello      |
+        |-------------->|
+     ,--+--.          ,-+-.
+     |alice|          |bob|
+     `-----'          `---'
+    TXT
+    expect(File.read(diagram_path).split("\n").map(&:rstrip).join("\n")).to eq(content)
+  end
+  it 'should fetch a diagram from Kroki and save it to disk using the target name' do
+    kroki_diagram = ::AsciidoctorExtensions::KrokiDiagram.new('plantuml', 'txt', ' alice -> bob: hello', 'hello-world')
+    kroki_http_client = ::AsciidoctorExtensions::KrokiHttpClient
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'https://kroki.io', http_method: 'get', http_client: kroki_http_client)
+    output_dir_path = "#{__dir__}/../.asciidoctor/kroki"
+    diagram_name = kroki_diagram.save(output_dir_path, kroki_client)
+    diagram_path = File.join(output_dir_path, diagram_name)
+    expect(diagram_name).to start_with('hello-world-'), "diagram name should use the target as a prefix, got: #{diagram_name}"
+    expect(File.exist?(diagram_path)).to be_truthy, "diagram should be saved at: #{diagram_path}"
     content = <<-TXT.chomp
      ,-----.          ,---.
      |alice|          |bob|
@@ -48,14 +69,16 @@ describe ::AsciidoctorExtensions::KrokiDiagram do
   it 'should fetch a diagram from Kroki with the same definition only once' do
     kroki_diagram = ::AsciidoctorExtensions::KrokiDiagram.new('plantuml', 'png', ' guillaume -> dan: hello')
     kroki_http_client = ::AsciidoctorExtensions::KrokiHttpClient
-    kroki_client = ::AsciidoctorExtensions::KrokiClient.new('https://kroki.io', 'get', kroki_http_client)
+    kroki_client = ::AsciidoctorExtensions::KrokiClient.new(server_url: 'https://kroki.io', http_method: 'get', http_client: kroki_http_client)
     output_dir_path = "#{__dir__}/../.asciidoctor/kroki"
     # make sure that we are doing only one GET request
-    expect(kroki_http_client).to receive(:get).once
+    diagram_contents = File.read("#{__dir__}/fixtures/plantuml-diagram.png", mode: 'rb')
+    expect(kroki_http_client).to receive(:get).once.and_return(diagram_contents)
     diagram_name = kroki_diagram.save(output_dir_path, kroki_client)
     diagram_path = File.join(output_dir_path, diagram_name)
-    expect(File.exist?(diagram_path)).to be_truthy, "expected diagram to be saved at #{diagram_path}"
+    expect(File.exist?(diagram_path)).to be_truthy, "diagram should be saved at: #{diagram_path}"
     # calling again... should read the file from disk (and not do a GET request)
     kroki_diagram.save(output_dir_path, kroki_client)
+    expect(File.size(diagram_path)).to be_eql(diagram_contents.length), 'diagram should be fully saved on disk'
   end
 end

data/spec/asciidoctor_kroki_processor_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rspec_helper'
+require 'asciidoctor'
+require_relative '../lib/asciidoctor/extensions/asciidoctor_kroki'
+
+describe '::AsciidoctorExtensions::KrokiProcessor' do
+  it 'should return the images output directory (imagesoutdir attribute)' do
+    doc = Asciidoctor.load('hello', attributes: { 'imagesoutdir' => '.asciidoctor/kroki/images', 'imagesdir' => '../images' })
+    output_dir_path = AsciidoctorExtensions::KrokiProcessor.send(:output_dir_path, doc)
+    expect(output_dir_path).to eq '.asciidoctor/kroki/images'
+  end
+  it 'should return a path relative to output directory (to_dir option)' do
+    doc = Asciidoctor.load('hello', to_dir: '.asciidoctor/kroki/relative', attributes: { 'imagesdir' => '../images' })
+    output_dir_path = AsciidoctorExtensions::KrokiProcessor.send(:output_dir_path, doc)
+    expect(output_dir_path).to eq '.asciidoctor/kroki/relative/../images'
+  end
+  it 'should return a path relative to output directory (outdir attribute)' do
+    doc = Asciidoctor.load('hello', attributes: { 'imagesdir' => 'resources/images', 'outdir' => '.asciidoctor/kroki/out' })
+    output_dir_path = AsciidoctorExtensions::KrokiProcessor.send(:output_dir_path, doc)
+    expect(output_dir_path).to eq '.asciidoctor/kroki/out/resources/images'
+  end
+  it 'should return a path relative to the base directory (base_dir option)' do
+    doc = Asciidoctor.load('hello', base_dir: '.asciidoctor/kroki', attributes: { 'imagesdir' => 'img' })
+    output_dir_path = AsciidoctorExtensions::KrokiProcessor.send(:output_dir_path, doc)
+    expect(output_dir_path).to eq "#{::Dir.pwd}/.asciidoctor/kroki/img"
+  end
+  it 'should return a path relative to the base directory (default value is current working directory)' do
+    doc = Asciidoctor.load('hello', attributes: { 'imagesdir' => 'img' })
+    output_dir_path = AsciidoctorExtensions::KrokiProcessor.send(:output_dir_path, doc)
+    expect(output_dir_path).to eq "#{::Dir.pwd}/img"
+  end
+end

data/spec/asciidoctor_kroki_spec.rb

@@ -20,31 +20,90 @@ describe ::AsciidoctorExtensions::KrokiBlockProcessor do
 </div>
 </div>)
     end
-    it 'should use png if env-idea is defined' do
+    it 'should use png if kroki-default-format is set to png' do
       input = <<~'ADOC'
         [plantuml]
         ....
         alice -> bob: hello
         ....
       ADOC
-      output = Asciidoctor.convert(input, attributes: { 'env-idea' => '' }, standalone: false)
+      output = Asciidoctor.convert(input, attributes: { 'kroki-default-format' => 'png' }, standalone: false)
       (expect output).to eql %(<div class="imageblock kroki">
 <div class="content">
 <img src="https://kroki.io/plantuml/png/eNpLzMlMTlXQtVNIyk-yUshIzcnJBwA9iwZL" alt="Diagram">
 </div>
 </div>)
     end
-    it 'should include the plantuml-include file' do
+    it 'should use svg if kroki-default-format is set to png and the diagram type does not support png' do
+      input = <<~'ADOC'
+        [mermaid]
+        ....
+        graph TD;
+          A-->B;
+        ....
+      ADOC
+      output = Asciidoctor.convert(input, attributes: { 'kroki-default-format' => 'png' }, standalone: false)
+      (expect output).to eql %(<div class="imageblock kroki">
+<div class="content">
+<img src="https://kroki.io/mermaid/svg/eNpLL0osyFAIcbHmUlBw1NW1c7IGADLKBKY=" alt="Diagram">
+</div>
+</div>)
+    end
+    it 'should include the plantuml-include file when safe mode is safe' do
+      input = <<~'ADOC'
+        [plantuml]
+        ....
+        alice -> bob: hello
+        ....
+      ADOC
+      output = Asciidoctor.convert(input,
+                                   attributes: { 'kroki-plantuml-include' => 'spec/fixtures/config.puml' },
+                                   standalone: false, safe: :safe)
+      (expect output).to eql %(<div class="imageblock kroki">
+<div class="content">
+<img src="https://kroki.io/plantuml/svg/eNorzs7MK0gsSsxVyM3Py0_OKMrPTVUoKSpN5eJKzMlMTlXQtVNIyk-yUshIzcnJBwCT9xBc" alt="Diagram">
+</div>
+</div>)
+    end
+    it 'should normalize plantuml-include path when safe mode is safe' do
       input = <<~'ADOC'
         [plantuml]
         ....
         alice -> bob: hello
         ....
       ADOC
-      output = Asciidoctor.convert(input, attributes: { 'env-idea' => '', 'kroki-plantuml-include' => 'spec/fixtures/config.puml' }, standalone: false)
+      output = Asciidoctor.convert(input, attributes: { 'kroki-plantuml-include' => '../../../spec/fixtures/config.puml' }, standalone: false, safe: :safe)
       (expect output).to eql %(<div class="imageblock kroki">
 <div class="content">
-<img src="https://kroki.io/plantuml/png/eNorzs7MK0gsSsxVyM3Py0_OKMrPTVUoKSpN5YrJS8zJTE5V0LVTSMpPslLISM3JyQcArVsRHA==" alt="Diagram">
+<img src="https://kroki.io/plantuml/svg/eNorzs7MK0gsSsxVyM3Py0_OKMrPTVUoKSpN5eJKzMlMTlXQtVNIyk-yUshIzcnJBwCT9xBc" alt="Diagram">
+</div>
+</div>)
+    end
+    it 'should not include file which reside outside of the parent directory of the source when safe mode is safe' do
+      input = <<~'ADOC'
+        [plantuml]
+        ....
+        alice -> bob: hello
+        ....
+      ADOC
+      output = Asciidoctor.convert(input, attributes: { 'kroki-plantuml-include' => '/etc/passwd' }, standalone: false, safe: :safe)
+      (expect output).to eql %(<div class="imageblock kroki">
+<div class="content">
+<img src="https://kroki.io/plantuml/svg/eNpLzMlMTlXQtVNIyk-yUshIzcnJBwA9iwZL" alt="Diagram">
+</div>
+</div>)
+    end
+    it 'should not include file when safe mode is secure' do
+      input = <<~'ADOC'
+        [plantuml]
+        ....
+        alice -> bob: hello
+        ....
+      ADOC
+      output = Asciidoctor.convert(input, attributes: { 'kroki-plantuml-include' => 'spec/fixtures/config.puml' }, standalone: false, safe: :secure)
+      (expect output).to eql %(<div class="imageblock kroki">
+<div class="content">
+<img src="https://kroki.io/plantuml/svg/eNpLzMlMTlXQtVNIyk-yUshIzcnJBwA9iwZL" alt="Diagram">
 </div>
 </div>)
     end
@@ -54,11 +113,24 @@ describe ::AsciidoctorExtensions::KrokiBlockProcessor do
 
         plantuml::spec/fixtures/alice.puml[svg,role=sequence]
       ADOC
-      output = Asciidoctor.convert(input, attributes: { 'kroki-fetch-diagram' => '' }, standalone: false)
+      output = Asciidoctor.convert(input, attributes: { 'kroki-fetch-diagram' => '' }, standalone: false, safe: :safe)
       (expect output).to eql %(<div class="imageblock sequence kroki-format-svg kroki">
 <div class="content">
 <img src=".asciidoctor/kroki/diag-f6acdc206506b6ca7badd3fe722f252af992871426e580c8361ff4d47c2c7d9b.svg" alt="Diagram">
 </div>
+</div>)
+    end
+    it 'should not fetch diagram when safe mode is secure' do
+      input = <<~'ADOC'
+        :imagesdir: .asciidoctor/kroki
+
+        plantuml::spec/fixtures/alice.puml[svg,role=sequence]
+      ADOC
+      output = Asciidoctor.convert(input, attributes: { 'kroki-fetch-diagram' => '' }, standalone: false)
+      (expect output).to eql %(<div class="imageblock sequence kroki-format-svg kroki">
+<div class="content">
+<img src="https://kroki.io/plantuml/svg/eNpLzMlMTlXQtVNIyk-yUshIzcnJ5wIAQ-AGVQ==" alt="Diagram">
+</div>
 </div>)
     end
     it 'should create PNG diagram in imagesdir if kroki-fetch-diagram is set' do
@@ -67,7 +139,7 @@ describe ::AsciidoctorExtensions::KrokiBlockProcessor do
 
         plantuml::spec/fixtures/alice.puml[png,role=sequence]
       ADOC
-      output = Asciidoctor.convert(input, attributes: { 'kroki-fetch-diagram' => '' }, standalone: false)
+      output = Asciidoctor.convert(input, attributes: { 'kroki-fetch-diagram' => '' }, standalone: false, safe: :safe)
       (expect output).to eql %(<div class="imageblock sequence kroki-format-png kroki">
 <div class="content">
 <img src=".asciidoctor/kroki/diag-d4f314b2d4e75cc08aa4f8c2c944f7bf78321895d8ec5f665b42476d4e67e610.png" alt="Diagram">
@@ -75,12 +147,23 @@ describe ::AsciidoctorExtensions::KrokiBlockProcessor do
 </div>)
     end
   end
+  context 'instantiate' do
+    it 'should instantiate block processor without warning' do
+      original_stderr = $stderr
+      $stderr = StringIO.new
+      ::AsciidoctorExtensions::KrokiBlockProcessor.new :plantuml, {}
+      output = $stderr.string
+      (expect output).to eql ''
+    ensure
+      $stderr = original_stderr
+    end
+  end
 end
 
 describe ::AsciidoctorExtensions::Kroki do
   it 'should return the list of supported diagrams' do
     diagram_names = ::AsciidoctorExtensions::Kroki::SUPPORTED_DIAGRAM_NAMES
-    expect(diagram_names).to include('vegalite', 'plantuml', 'bytefield', 'bpmn', 'excalidraw')
+    expect(diagram_names).to include('vegalite', 'plantuml', 'bytefield', 'bpmn', 'excalidraw', 'wavedrom', 'pikchr', 'structurizr')
   end
   it 'should register the extension for the list of supported diagrams' do
     doc = Asciidoctor::Document.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-kroki
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Guillaume Grossetie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: '1.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: '1.30'
 description: An extension for Asciidoctor to convert diagrams to images using https://kroki.io
 email:
 - ggrossetie@yuzutech.fr
@@ -84,12 +84,16 @@ files:
 - lib/asciidoctor-kroki.rb
 - lib/asciidoctor/extensions/asciidoctor_kroki.rb
 - lib/asciidoctor/extensions/asciidoctor_kroki/extension.rb
+- lib/asciidoctor/extensions/asciidoctor_kroki/version.rb
 - spec/.rubocop.yml
+- spec/asciidoctor_kroki_block_macro_spec.rb
 - spec/asciidoctor_kroki_client_spec.rb
 - spec/asciidoctor_kroki_diagram_spec.rb
+- spec/asciidoctor_kroki_processor_spec.rb
 - spec/asciidoctor_kroki_spec.rb
 - spec/fixtures/alice.puml
 - spec/fixtures/config.puml
+- spec/fixtures/plantuml-diagram.png
 - spec/require_spec.rb
 - spec/rspec_helper.rb
 - tasks/bundler.rake
@@ -101,6 +105,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/Mogztter/asciidoctor-kroki/issues
   source_code_uri: https://github.com/Mogztter/asciidoctor-kroki
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -116,19 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Asciidoctor extension to convert diagrams to images using Kroki
-test_files:
-- spec/.rubocop.yml
-- spec/asciidoctor_kroki_client_spec.rb
-- spec/asciidoctor_kroki_diagram_spec.rb
-- spec/asciidoctor_kroki_spec.rb
-- spec/fixtures/alice.puml
-- spec/fixtures/config.puml
-- spec/require_spec.rb
-- spec/rspec_helper.rb
-- tasks/bundler.rake
-- tasks/lint.rake
-- tasks/rspec.rake
+test_files: []