asciidoctor-diagram 2.2.12 → 2.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa9df554bdc548c3c2ab23f18f44f1931a24b9aca2d691d2514a3ed4f6ac7f5
-  data.tar.gz: f03d45985571af9290798a36220cbbb1d70a7bad321c3f58181a28e975f499ab
+  metadata.gz: c2447be8f4a47717d6ef4856ed210cbf44eaa09cd0ae154bb64119f3e309384d
+  data.tar.gz: 8e40700cddd6d026c7ae4cd7cfafdf22704e01b4941eba2d274db91e103d700e
 SHA512:
-  metadata.gz: a058672b892ced01c4c6686601f8d2f0f4d8ba4393911b96912d204072beb8af2f9be455adf38bb2018049a9b1cd3f3eb6c8de8da697d4717349fa75f0bf7e33
-  data.tar.gz: e6625a076b2dfee01b6e2267fe448aa7a11ddd6f3c0282553670e0ed067988a50109722d1cd408fc4530435df15195cb63718c05354248e613312f239be55af8
+  metadata.gz: 2e4c640aaa5ce31f00f94a10398d9ab9a29eca0a97359073645a82cd777ec860ad2a90ebc5ed549e65186a88d3e1c43a9f39250c1d2b6ba2745f31d4b3dd3679
+  data.tar.gz: 9f54def1db4fd022b510a46daf33328b4854fb0d1dd7d3ba4bbc5a5dc1c966e4a37f548fdaa82c626024fdb31bdbf62218e1edbb1e8bdf1a7bf43fbf10116567

data/CHANGELOG.adoc

@@ -1,5 +1,22 @@
 = Asciidoctor-diagram Changelog
 
+== 2.2.14
+
+Bugfixes::
+
+* Issue #441: Fix regression in Wavedrom integration.
+
+== 2.2.13
+
+Enhancements::
+
+* Issue #436: Allow diagram caching to be disabled using the `nocache` option.
+
+Bugfixes::
+
+* Issue #437: Set working directory when generating diagrams.
+* Issue #439: Resolve errors when using relative imports in D2 diagrams
+
 == 2.2.12
 
 Enhancements::

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

@@ -49,7 +49,10 @@ module Asciidoctor
             args << '-f' << font
           end
 
-          args
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end
       end
 

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

@@ -13,19 +13,29 @@ module Asciidoctor
           [:png, :pdf, :svg]
         end
 
+        def collect_options(source)
+          {
+            :font_path => source.attr('fontpath')
+          }
+        end
+
         def convert(source, format, options)
           # On Debian based systems the Python 3.x packages python3-(act|block|nw|seq)diag executables with
           # a '3' suffix.
           cmd_name = self.class.const_get(:TOOL)
           alt_cmd_name = "#{cmd_name}3"
 
-          font_path = source.attr('fontpath')
+          font_path = options[:font_path]
 
           generate_stdin(source.find_command(cmd_name, :alt_cmds => [alt_cmd_name]), format.to_s, source.to_s) do |tool_path, output_path|
             args = [tool_path, '-a', '-o', Platform.native_path(output_path), "-T#{format.to_s}"]
             args << "-f#{Platform.native_path(font_path)}" if font_path
             args << '-'
-            args
+
+            {
+              :args => args,
+              :chdir => source.base_dir
+            }
           end
         end
       end

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

@@ -54,7 +54,10 @@ module Asciidoctor
             args << '--height' << options[:height]
           end
 
-          args
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -18,7 +18,10 @@ module Asciidoctor
         bytefield_path = source.find_command('bytefield-svg')
 
         generate_stdin(bytefield_path, format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, "--output", Platform.native_path(output_path)]
+          {
+            :args => [tool_path, "--output", Platform.native_path(output_path)],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -27,7 +27,7 @@ module Asciidoctor
       end
 
       def convert(source, format, options)
-        generate_file(source.find_command('d2'), "d2", format.to_s, source.code) do |tool_path, input_path, output_path|
+        generate_stdin(source.find_command('d2'), format.to_s, source.code) do |tool_path, output_path|
           args = [tool_path, '--browser', 'false']
 
           options.each_pair do |key, value|
@@ -43,7 +43,7 @@ module Asciidoctor
             end
           end
 
-          args << Platform.native_path(input_path)
+          args << '-'
           args << Platform.native_path(output_path)
 
           {

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

@@ -15,7 +15,12 @@ module Asciidoctor
       end
 
       def convert(source, format, options)
-        generate_stdin_stdout(source.find_command('dbml-renderer'), source.code)
+        generate_stdin_stdout(source.find_command('dbml-renderer'), source.code) do |tool|
+          {
+            :args => [tool],
+            :chdir => source.base_dir
+          }
+        end
       end
     end
   end

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -165,7 +165,9 @@ module Asciidoctor
         image_file = parent.normalize_system_path(image_name, image_output_dir(parent))
         metadata_file = parent.normalize_system_path("#{image_name}.cache", cache_dir(source, parent))
 
-        if File.exist? metadata_file
+        use_cache = !source.global_opt('nocache')
+
+        if use_cache && File.exist?(metadata_file)
           metadata = File.open(metadata_file, 'r') {|f| JSON.load(f, nil, :symbolize_names => true, :create_additions => false) }
         else
           metadata = {}
@@ -191,14 +193,18 @@ module Asciidoctor
           metadata = source.create_image_metadata
           metadata[:options] = options
 
-          allow_image_optimisation = source.attr('optimise', 'true') == 'true'
+          allow_image_optimisation = !source.global_opt('nooptimise')
           result, metadata[:width], metadata[:height] = params[:decoder].post_process_image(result, 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}
 
-          FileUtils.mkdir_p(File.dirname(metadata_file)) unless Dir.exist?(File.dirname(metadata_file))
-          File.open(metadata_file, 'w') {|f| JSON.dump(metadata, f)}
+          if use_cache
+            FileUtils.mkdir_p(File.dirname(metadata_file)) unless Dir.exist?(File.dirname(metadata_file))
+            File.open(metadata_file, 'w') { |f| JSON.dump(metadata, f) }
+          else
+            File.delete(metadata_file) if File.exist?(metadata_file)
+          end
         end
 
         scale = image_attributes['scale']

data/lib/asciidoctor-diagram/diagram_source.rb

@@ -26,10 +26,18 @@ module Asciidoctor
         raise NotImplementedError.new
       end
 
+      def global_opt(opt)
+        global_attr("#{opt}-option")
+      end
+
       def global_attr(name, default_value = nil)
         attr(name) || attr(name, default_value, 'diagram')
       end
 
+      def opt(opt)
+        attr("#{opt}-option")
+      end
+
       # Get the value for the specified attribute. First look in the attributes on
       # this document and return the value of the attribute if found. Otherwise, if
       # this document is a child of the Document document, look in the attributes of the

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

@@ -38,7 +38,10 @@ module Asciidoctor
         begin
           target_file.close
           generate_stdin_file(python_path, code, target_file.path + ".#{format}") do |tool|
-            [tool, '-']
+            {
+              :args => [tool, '-'],
+              :chdir => source.base_dir
+            }
           end
         ensure
           target_file.unlink

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

@@ -22,7 +22,10 @@ module Asciidoctor
         code << "\n.PE" unless code.start_with?("\n.PE")
 
         generate_file_stdout(dpic_path, format.to_s, code) do |tool_path, input_path|
-          [tool_path, "-v", "-z", input_path]
+          {
+            :args => [tool_path, "-v", "-z", input_path],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -23,7 +23,10 @@ module Asciidoctor
         end
 
         generate_stdin(dot_path, format.to_s, dot_code) do |tool_path, output_path|
-          [tool_path, "-o#{Platform.native_path(output_path)}", "-T#{format.to_s}"]
+          {
+            :args => [tool_path, "-o#{Platform.native_path(output_path)}", "-T#{format.to_s}"],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -56,7 +56,12 @@ module Asciidoctor
         code << "\n"
         code << source.to_s
 
-        generate_stdin_stdout(source.find_command('gnuplot'), code)
+        generate_stdin_stdout(source.find_command('gnuplot'), code) do |tool|
+          {
+            :args => [tool],
+            :chdir => source.base_dir
+          }
+        end
       end
     end
   end

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

@@ -24,7 +24,10 @@ module Asciidoctor
           layout = options[:layout]
           args << "-K#{layout}" if layout
 
-          args
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -34,7 +34,10 @@ module Asciidoctor
             args << argument
           end
 
-          args
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -1,5 +1,4 @@
 require_relative '../diagram_converter'
-require_relative '../util/cli_generator'
 require_relative '../util/platform'
 
 require 'base64'

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

@@ -55,7 +55,8 @@ module Asciidoctor
 
           {
               :args => args,
-              :out_file => "#{output_path}.cropped.#{format.to_s}"
+              :out_file => "#{output_path}.cropped.#{format.to_s}",
+              :chdir => source.base_dir
           }
         end        
       end

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

@@ -19,7 +19,6 @@ module Asciidoctor
         bg_img = source.attr('background')
         raise "background attribute is required" unless bg_img
 
-        options = source.attr('options', '').split(',')
         margin = source.attr('margin', '')
         margin_parts = margin.split(' ')
         case margin_parts.length
@@ -55,7 +54,8 @@ module Asciidoctor
             :margin_right => mr,
             :margin_top => mt,
             :margin_bottom => mb,
-            :noupcase => options.include?('noupcase'),
+            :noupcase => source.opt('noupcase'),
+            :imagesdir => source.attr('imagesdir')
         }
       end
 
@@ -74,7 +74,7 @@ module Asciidoctor
         bg_img = options[:bg_img]
         raise "background attribute is required" unless bg_img
 
-        bg_img = source.resolve_path(bg_img, source.attr('imagesdir'))
+        bg_img = source.resolve_path(bg_img, options[:imagesdir])
 
         top_label = options[:top_label]
         bottom_label = options[:bottom_label]

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

@@ -164,7 +164,8 @@ module Asciidoctor
 
           {
               :args => args,
-              :env => {'NODE_OPTIONS' => '--unhandled-rejections=strict'}
+              :env => {'NODE_OPTIONS' => '--unhandled-rejections=strict'},
+              :chdir => source.base_dir
           }
         end
       end
@@ -200,7 +201,8 @@ module Asciidoctor
 
           {
               :args => args,
-              :out_file => output_file
+              :out_file => output_file,
+              :chdir => source.base_dir
           }
         end
       end

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

@@ -27,7 +27,11 @@ module Asciidoctor
             args << '-F' << font
           end
           args << '-'
-          args
+
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -17,7 +17,10 @@ module Asciidoctor
 
       def convert(source, format, options)
         generate_file(source.find_command('nomnoml'), 'nomnoml', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
+          {
+            :args => [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -42,7 +42,10 @@ module Asciidoctor
           args << Platform.native_path(source.resolve_path(style_path))
           args << "--"
 
-          args
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end        
       end
     end

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

@@ -18,7 +18,10 @@ module Asciidoctor
         pikchr_path = source.find_command('pikchr')
 
         output = generate_file_stdout(pikchr_path, format.to_s, source.to_s) do |tool_path, input_path|
-          [tool_path, "--svg-only", input_path]
+          {
+            :args => [tool_path, "--svg-only", input_path],
+            :chdir => source.base_dir
+          }
         end
 
         if output.start_with? '<svg'

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

@@ -17,7 +17,10 @@ module Asciidoctor
 
       def convert(source, format, options)
         generate_stdin(source.find_command('shaape'), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, '-o', Platform.native_path(output_path), '-t', format.to_s, '-']
+          {
+            :args => [tool_path, '-o', Platform.native_path(output_path), '-t', format.to_s, '-'],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -36,7 +36,11 @@ module Asciidoctor
           end
 
           args << '-'
-          args
+
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end
       end
     end

data/lib/asciidoctor-diagram/structurizr/renderers.rb

@@ -40,7 +40,7 @@ module Asciidoctor
       end
 
       def self.get_renderer_type(source)
-        source.attr('renderer', 'plantuml-c4')
+        source.attr('renderer', PLANTUML_C4)
       end
       def self.mime_type(renderer_type)
         case renderer_type

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

@@ -46,7 +46,10 @@ module Asciidoctor
         end
         
         generate_stdin(source.find_command('svgbob', :alt_cmds => ['svgbob_cli']), format.to_s, source.to_s) do |tool_path, output_path|
-          ([tool_path, '-o', Platform.native_path(output_path)] + flags)
+          {
+            :args => ([tool_path, '-o', Platform.native_path(output_path)] + flags),
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -15,7 +15,10 @@ module Asciidoctor
 
       def convert(source, format, options)
         generate_stdin(source.find_command('symbolator'), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, "-i-", "-o#{Platform.native_path(output_path)}", "-f#{format.to_s}"]
+          {
+            :args => [tool_path, "-i-", "-o#{Platform.native_path(output_path)}", "-f#{format.to_s}"],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -91,7 +91,10 @@ module Asciidoctor
           response[:body]
         else
           generate_file(source.find_command('syntrax'), 'spec', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-            [tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)] + shared_args
+            {
+              :args => ([tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)] + shared_args),
+              :chdir => source.base_dir
+            }
           end
         end
 

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

@@ -64,7 +64,10 @@ END
 
         if svgpath
           generate_file(svgpath, 'pdf', 'svg', pdf) do |tool_path, input_path, output_path|
-            [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
+            {
+              :args => [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)],
+              :chdir => source.base_dir
+            }
           end
         else
           pdf

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

@@ -25,7 +25,10 @@ module Asciidoctor
         end
 
         generate_file(java, 'uxf', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          [tool_path, '-jar', Platform.native_path(umlet), '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"]
+          {
+            :args => [tool_path, '-jar', Platform.native_path(umlet), '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"],
+            :chdir => source.base_dir
+          }
         end
       end
     end

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

@@ -32,14 +32,16 @@ module Asciidoctor
           vega_code = code
         end
 
-        generate_file(source.find_command("vg2#{format}"), "json", format.to_s, vega_code) do |tool_path, input_path, output_path|
+        generate_stdin_stdout(source.find_command("vg2#{format}"), vega_code) do |tool_path|
           args = [tool_path, '--base', Platform.native_path(base_dir)]
           if format == :svg
             args << '--header'
           end
 
-          args << Platform.native_path(input_path)
-          args << Platform.native_path(output_path)
+          {
+            :args => args,
+            :chdir => source.base_dir
+          }
         end
       end
     end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.2.12"
+    VERSION = "2.2.14"
   end
 end

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

@@ -19,7 +19,10 @@ module Asciidoctor
         wavedrom_cli = source.find_command('wavedrom-cli', :raise_on_error => false)
         if wavedrom_cli
           generate_file(wavedrom_cli, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-            [Platform.native_path(tool_path), '--input', Platform.native_path(input_path), "--#{format.to_s}", Platform.native_path(output_path)]
+            {
+              :args => [Platform.native_path(tool_path), '--input', Platform.native_path(input_path), "--#{format.to_s}", Platform.native_path(output_path)],
+              :chdir => source.base_dir
+            }
           end
         else
           wavedrom_cli = source.find_command('wavedrom', :raise_on_error => false)
@@ -27,7 +30,10 @@ module Asciidoctor
 
           if wavedrom_cli && !wavedrom_cli.include?('WaveDromEditor') && phantomjs
             generate_file(wavedrom_cli, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-              [phantomjs, Platform.native_path(tool_path), '-i', Platform.native_path(input_path), "-#{format.to_s[0]}", Platform.native_path(output_path)]
+              {
+                :args => [phantomjs, Platform.native_path(tool_path), '-i', Platform.native_path(input_path), "-#{format.to_s[0]}", Platform.native_path(output_path)],
+                :chdir => source.base_dir
+              }
             end
           else
             if ::Asciidoctor::Diagram::Platform.os == :macosx
@@ -40,7 +46,10 @@ module Asciidoctor
             end
 
             generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-              [tool_path, 'source', Platform.native_path(input_path), format.to_s, Platform.native_path(output_path)]
+              {
+                :args => [tool_path, 'source', Platform.native_path(input_path), format.to_s, Platform.native_path(output_path)],
+                :chdir => source.base_dir
+              }
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.2.12
+  version: 2.2.14
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler