asciidoctor-diagram 2.2.13 → 2.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bcfe1104d151f5da05b3f237b06e2310ca670ee84f6e4e9b6f43a769820fcf0
-  data.tar.gz: 1d44562539b7320c7fd4b767d16428aa3bc896e181575be73e5e87f2dc59b93f
+  metadata.gz: c2447be8f4a47717d6ef4856ed210cbf44eaa09cd0ae154bb64119f3e309384d
+  data.tar.gz: 8e40700cddd6d026c7ae4cd7cfafdf22704e01b4941eba2d274db91e103d700e
 SHA512:
-  metadata.gz: ce2fb9ac70813787758f76eccf886f4e538313c7c2574915c1034c19ebedd7b7af93ddeeed297c91e24db8d7056acecf9df98d7b01e522b61a7240ed52f8614e
-  data.tar.gz: 1a68a3fa835c7fb8c9d61d4754f4a2a7d1a37eaad67895aabcdb0183d101e45b30c61067e4293a8392e70f54bf19ef327eab00fc6255ea3507fa7cde1a77293d
+  metadata.gz: 2e4c640aaa5ce31f00f94a10398d9ab9a29eca0a97359073645a82cd777ec860ad2a90ebc5ed549e65186a88d3e1c43a9f39250c1d2b6ba2745f31d4b3dd3679
+  data.tar.gz: 9f54def1db4fd022b510a46daf33328b4854fb0d1dd7d3ba4bbc5a5dc1c966e4a37f548fdaa82c626024fdb31bdbf62218e1edbb1e8bdf1a7bf43fbf10116567

data/CHANGELOG.adoc

@@ -1,5 +1,11 @@
 = Asciidoctor-diagram Changelog
 
+== 2.2.14
+
+Bugfixes::
+
+* Issue #441: Fix regression in Wavedrom integration.
+
 == 2.2.13
 
 Enhancements::

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

@@ -13,13 +13,19 @@ 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}"]

data/lib/asciidoctor-diagram/diagram_source.rb

@@ -34,6 +34,10 @@ module Asciidoctor
         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/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/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/version.rb

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

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

@@ -18,9 +18,9 @@ module Asciidoctor
       def convert(source, format, options)
         wavedrom_cli = source.find_command('wavedrom-cli', :raise_on_error => false)
         if wavedrom_cli
-          generate_stdin(wavedrom_cli, format.to_s, source.to_s) do |tool_path, output_path|
+          generate_file(wavedrom_cli, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
             {
-              :args => [Platform.native_path(tool_path), '--input', '-', "--#{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

metadata

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