asciidoctor-diagram 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629ba788527640ff6cd5bd7c0e6cc18a1a2b7afa4071737b667f95859491dbfc
-  data.tar.gz: 762433ab8f23c6d7a4e44fc5d580c77a1fa52b56c47780d1ba28077ae1c309ee
+  metadata.gz: 2c2f34fcc568a14ae6c72579b4a9e8ef429cbc1b023ae9c20945084a212ad844
+  data.tar.gz: 7a11bdd3d63d22c3e472671b9a3e74ea3945edf80757350aaf6bfde690a9c392
 SHA512:
-  metadata.gz: eb2cac4b23d86cc7fb37787208b221a42c839d06b31eff51585a108c674b0517e3c9c72afe1f4ed556e671d4ff5bff06c825cff764098a8925f860975e96146b
-  data.tar.gz: 35a265251153d038515a89aea7322373495e6e72d768df42e200c517e905a6b257f8916b7c3b0ff8645a15a8aeff258b345bd7b744c6e514bd6dc7291bf26bdc
+  metadata.gz: ec745e7abc74b9ab114922de70fcc2fe01cd367cb60b1d47e90ee28ce120c7082400fa7d7176c2b0c9f47ea0a643a19dde64861d63460920b19e4157ff1aa706
+  data.tar.gz: 9bc01b94478a69b8782e5fe7c3ffffa95cc9dbdbbc5092f64f3dfc340f84bdc65d0cb62c72445fbb3dbcce12befe2f4d6011782542ade71681e2a9636393872d

data/CHANGELOG.adoc

@@ -1,5 +1,12 @@
 = Asciidoctor-diagram Changelog
 
+== 2.2.3
+
+Enhancements::
+
+* Issue #373: Add support for rendering Ditaa diagrams via PlantUML using ditaamini
+* Issue #383: Allow bullet characters for Ditaa to be overridden
+
 == 2.2.2
 
 Enhancements::

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

@@ -253,6 +253,7 @@ No specific attributes.
 |debug        |false           |Renders the debug grid over the resulting image.
 |fixed-slope  |false           |Makes sides of parallelograms and trapezoids fixed slope instead of fixed width.
 |transparent  |false           |Makes the background of the image transparent instead of using the background color.
+|bullet-characters|*o          |The characters to recognize as bullets
 |===
 
 ==== Gnuplot

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

@@ -20,7 +20,8 @@ module Asciidoctor
           :shadows => lambda { |o, v| o  << '--no-shadows' if v == 'false'},
           :debug => lambda { |o, v| o  << '--debug' if v == 'true'},
           :fixed_slope => lambda { |o, v| o  << '--fixed-slope' if v == 'true'},
-          :transparent => lambda { |o, v| o  << '--transparent' if v == 'true'}
+          :transparent => lambda { |o, v| o  << '--transparent' if v == 'true'},
+          :bullet_characters => lambda { |o, v| o  << '--bullet-characters' << v if v }
       }
 
       CLASSPATH_ENV = 'DIAGRAM_DITAA_CLASSPATH'

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.2.2"
+    VERSION = "2.2.3"
   end
 end

data/spec/ditaa_spec.rb

@@ -151,4 +151,41 @@ This should cause a bug.
       load_asciidoc doc
     }.to raise_error(/Ambiguous input/i)
   end
+
+  it "should support custom bullet characters" do
+    doc = <<-eos
+= Hello, Ditaa!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[ditaa,format="svg",bullet-characters=x]
+----
++-----------------+
+| o Things to do  |
+| cGRE            |
+| x Cut the grass |
+| x Buy jam       |
+| x Fix car       |
+| x Make website  |
++-----------------+
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg$/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
 end

data/spec/plantuml_spec.rb

@@ -393,6 +393,36 @@ salt
     expect(b.attributes['height']).to be_nil
   end
 
+  it 'should support ditaa diagrams' do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="png"]
+----
+@startditaa -E
++---------+
+| example |
++---------+
+@endditaa
+----
+    eos
+
+    d = load_asciidoc doc, :attributes => {'backend' => 'docbook5'}
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    target = b.attributes['target']
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to be_nil
+    expect(b.attributes['height']).to be_nil
+  end
+
   it 'should handle embedded creole images correctly' do
     creole_doc = <<-eos
 = Hello, PlantUML!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2022-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler