asciidoctor-diagram 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3bb7f41e7e990ee0daaa88f39381764b379e6c14306c92e8f1e2357c736d06f
-  data.tar.gz: 4b83756e522e433023555cb88100e104a19114131d036407f64c3866c55427f0
+  metadata.gz: f13f5d250305d3a9da90af8da4a0b784c247979b9e23462b8b8bd77f6c92ca0a
+  data.tar.gz: 5f757455ea6ba101f8543d87a2bbe06106ed354e09bec89bf3d22959d1674f96
 SHA512:
-  metadata.gz: 6cf522712d792040de6f53a28fc378be74cf1193449eb80e7fb7684f194b0123d1e99a96349937e777f08d80c3d74b8918526eac48fba15f01a757ee0ff5adb0
-  data.tar.gz: 0c766a4cdb12d395aa8a1d90b4c92be755e09c556ee5c7cb3b0c81d7150d17aa670c52063cdca655c4c26fe63533698f5e6f887e8c3689061ee1d323d56d1b7c
+  metadata.gz: 2e08ce3f20a0d241e177cbf06680f68149af8adc8e65b6ab25fa57bf1e620aead335d7c8fbe96047bb10b95bf52ce7b22d7c67c3160882e8fd4f0a261c597eb2
+  data.tar.gz: 9ff970387205a3686999220bd37e0d54b08f10f5c95be8d37d05764fbf2f46a5606c9efe4184249b951ad845194e108d7d283fd178216fd42958230dbd50afce

data/CHANGELOG.adoc

@@ -1,5 +1,13 @@
 = Asciidoctor-diagram Changelog
 
+== 2.2.1
+
+Bug Fixes::
+
+* Issue #366: Improve correctness of SVG images produced by Ditaa
+* Issue #367: Resolve compatibility issue with rqrcode 2.1.0
+* Issue #368: Respect `options` attribute when generating SVG images
+
 == 2.2.0
 
 Enhancements::

data/docs/modules/ROOT/partials/create_diagram.adoc

@@ -23,7 +23,7 @@ The following diagram types and output formats are available:
 |Diagram Type                      |gif    |pdf    |png    |svg    |txt
 |{uri-a2s}[a2s]                    |       |       |       |{check}|
 |{uri-actdiag}[actdiag]            |       |{check}|{check}|{check}|
-|<barcode,barcode>>                |       |       |{check}|       |{check}
+|<<barcode,barcode>>               |       |       |{check}|       |{check}
 |{uri-blockdiag}[blockdiag]        |       |{check}|{check}|{check}|
 |{uri-bpmn}[bpmn]                  |       |{check}|{check}|{check}|
 |{uri-bytefield}[bytefield]        |       |       |       |{check}|

data/lib/asciidoctor-diagram/barcode/dependencies.rb

@@ -2,8 +2,8 @@ module Asciidoctor
   module Diagram
     module BarcodeDependencies
       BARCODE_DEPENDENCIES = {'barby' => '~> 0.6.8'}
-      PNG_DEPENDENCIES = {'chunky_png' => '~> 1.4.0'}
-      QRCODE_DEPENDENCIES = {'rqrcode' => '~> 2.0.0'}
+      PNG_DEPENDENCIES = {'chunky_png' => '~> 1.4'}
+      QRCODE_DEPENDENCIES = {'rqrcode' => '~> 2.0'}
       ALL_DEPENDENCIES = {}.merge(BARCODE_DEPENDENCIES).merge(PNG_DEPENDENCIES).merge(QRCODE_DEPENDENCIES)
     end
   end

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -238,9 +238,17 @@ module Asciidoctor
         use_absolute_path = source.attr('data-uri', nil, true)
 
         if format == :svg
-          svg_type = source.global_attr('svg-type')
+          if node.option? 'inline'
+            svg_type = 'inline'
+          elsif node.option? 'interactive'
+            svg_type = 'interactive'
+          else
+            svg_type = source.global_attr('svg-type')
+          end
+
           case svg_type
             when nil, 'static'
+              # Nothing to do
             when 'inline', 'interactive'
               node.set_option(svg_type)
               use_absolute_path = true

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.2.0"
+    VERSION = "2.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor-diagram-plantuml
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A family of Asciidoctor extensions that generate images from a broad range