asciidoctor-diagram 2.0.5 → 2.2.0

data/spec/blockdiag_spec.rb

@@ -1,16 +1,20 @@
 require_relative 'test_helper'
 
-code = <<-eos
+BLOCKDIAG_CODE = <<-eos
 blockdiag {
    A -> B -> C -> D;
    A -> E -> F -> G;
 }
 eos
 
-describe Asciidoctor::Diagram::BlockDiagBlockMacroProcessor, :broken_on_appveyor do
-  include_examples "block_macro", :blockdiag, code, [:png, :svg, :pdf]
+describe Asciidoctor::Diagram::BlockDiagInlineMacroProcessor do
+  include_examples "inline_macro", :blockdiag, BLOCKDIAG_CODE, [:png, :svg, :pdf]
 end
 
-describe Asciidoctor::Diagram::BlockDiagBlockProcessor, :broken_on_appveyor do
-  include_examples "block", :blockdiag, code, [:png, :svg, :pdf]
-end
+describe Asciidoctor::Diagram::BlockDiagBlockMacroProcessor do
+  include_examples "block_macro", :blockdiag, BLOCKDIAG_CODE, [:png, :svg, :pdf]
+end
+
+describe Asciidoctor::Diagram::BlockDiagBlockProcessor do
+  include_examples "block", :blockdiag, BLOCKDIAG_CODE, [:png, :svg, :pdf]
+end

data/spec/bpmn_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<EOF
+BPNM_CODE = <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0zt4mn9" targetNamespace="http://bpmn.io/schema/bpmn" exporter="bpmn-js (https://demo.bpmn.io)" exporterVersion="5.1.2">
   <bpmn:process id="Process_081h9u7" isExecutable="false">
@@ -47,10 +47,14 @@ code = <<EOF
 </bpmn:definitions>
 EOF
 
+describe Asciidoctor::Diagram::BpmnInlineMacroProcessor do
+  include_examples "inline_macro", :bpmn, BPNM_CODE, [:png, :svg, :pdf]
+end
+
 describe Asciidoctor::Diagram::BpmnBlockMacroProcessor do
-  include_examples "block_macro", :bpmn, code, [:png, :svg, :pdf]
+  include_examples "block_macro", :bpmn, BPNM_CODE, [:png, :svg, :pdf]
 end
 
 describe Asciidoctor::Diagram::BpmnBlockProcessor do
-  include_examples "block", :bpmn, code, [:png, :svg, :pdf]
+  include_examples "block", :bpmn, BPNM_CODE, [:png, :svg, :pdf]
 end

data/spec/bytefield_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+BYTEFIELD_CODE = <<-eos
 ;; This the source for the sample diagram illustrated in the project Read Me.
 
 ;; Some nice default background colors, used to distinguish header sections.
@@ -83,10 +83,14 @@ code = <<-eos
 (draw-bottom)
 eos
 
-describe Asciidoctor::Diagram::BytefieldBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
-  include_examples "block_macro", :bytefield, code, [:svg]
+describe Asciidoctor::Diagram::BytefieldInlineMacroProcessor do
+  include_examples "inline_macro", :bytefield, BYTEFIELD_CODE, [:svg]
 end
 
-describe Asciidoctor::Diagram::BytefieldBlockProcessor, :broken_on_travis, :broken_on_windows do
-  include_examples "block", :bytefield, code, [:svg]
-end
+describe Asciidoctor::Diagram::BytefieldBlockMacroProcessor do
+  include_examples "block_macro", :bytefield, BYTEFIELD_CODE, [:svg]
+end
+
+describe Asciidoctor::Diagram::BytefieldBlockProcessor do
+  include_examples "block", :bytefield, BYTEFIELD_CODE, [:svg]
+end

data/spec/diagrams_spec.rb

@@ -0,0 +1,27 @@
+require_relative 'test_helper'
+
+DIAGRAMS_CODE = <<-eos
+from diagrams import Diagram
+from diagrams.aws.compute import EC2
+from diagrams.aws.database import RDS
+from diagrams.aws.network import ELB
+
+with Diagram("Grouped Workers", show=False, direction="TB"):
+    ELB("lb") >> [EC2("worker1"),
+                  EC2("worker2"),
+                  EC2("worker3"),
+                  EC2("worker4"),
+                  EC2("worker5")] >> RDS("events")
+eos
+
+describe Asciidoctor::Diagram::DiagramsInlineMacroProcessor do
+  include_examples "inline_macro", :diagrams, DIAGRAMS_CODE, [:png, :svg]
+end
+
+describe Asciidoctor::Diagram::DiagramsBlockMacroProcessor do
+  include_examples "block_macro", :diagrams, DIAGRAMS_CODE, [:png, :svg]
+end
+
+describe Asciidoctor::Diagram::DiagramsBlockProcessor do
+  include_examples "block", :diagrams, DIAGRAMS_CODE, [:png, :svg]
+end

data/spec/ditaa_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+DITAA_CODE = <<-eos
 +--------+   +-------+    +-------+
 |        | --+ ditaa +--> |       |
 |  Text  |   +-------+    |diagram|
@@ -12,12 +12,16 @@ code = <<-eos
     +-------------------------+
 eos
 
+describe Asciidoctor::Diagram::DitaaInlineMacroProcessor do
+  include_examples "inline_macro", :ditaa, DITAA_CODE, [:png, :svg]
+end
+
 describe Asciidoctor::Diagram::DitaaBlockMacroProcessor do
-  include_examples "block_macro", :ditaa, code, [:png, :svg]
+  include_examples "block_macro", :ditaa, DITAA_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::DitaaBlockProcessor do
-  include_examples "block", :ditaa, code, [:png, :svg]
+  include_examples "block", :ditaa, DITAA_CODE, [:png, :svg]
 
   it "should support ditaa options as attributes" do
     doc = <<-eos
@@ -145,6 +149,6 @@ This should cause a bug.
 
     expect {
       load_asciidoc doc
-    }.to raise_error(/Cannot follow cell/i)
+    }.to raise_error(/Ambiguous input/i)
   end
 end

data/spec/dpic_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+DPIC_CODE = <<-eos
   arrow "$u$" above
 S: circle rad 10/72.27  # 10 pt
   line right 0.35
@@ -10,10 +10,14 @@ G: box "$G(s)$"
   "$-\;$" below rjust
 eos
 
-describe Asciidoctor::Diagram::DpicBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
-  include_examples "block_macro", :dpic, code, [:svg]
+describe Asciidoctor::Diagram::DpicInlineMacroProcessor, :broken_on_windows do
+  include_examples "inline_macro", :dpic, DPIC_CODE, [:svg]
 end
 
-describe Asciidoctor::Diagram::DpicBlockProcessor, :broken_on_travis, :broken_on_windows do
-  include_examples "block", :dpic, code, [:svg]
-end
+describe Asciidoctor::Diagram::DpicBlockMacroProcessor, :broken_on_windows do
+  include_examples "block_macro", :dpic, DPIC_CODE, [:svg]
+end
+
+describe Asciidoctor::Diagram::DpicBlockProcessor, :broken_on_windows do
+  include_examples "block", :dpic, DPIC_CODE, [:svg]
+end

data/spec/erd_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+ERD_CODE = <<-eos
 title {label: "nfldb Entity-Relationship diagram (condensed)", size: "20"}
 
 # Entities
@@ -83,10 +83,14 @@ play        1--* play_player
 player      1--* play_player
 eos
 
-describe Asciidoctor::Diagram::ErdBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
-  include_examples "block_macro", :erd, code, [:svg]
+describe Asciidoctor::Diagram::ErdInlineMacroProcessor, :broken_on_windows do
+  include_examples "inline_macro", :erd, ERD_CODE, [:png, :svg]
 end
 
-describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_travis, :broken_on_windows do
-  include_examples "block", :erd, code, [:svg]
-end
+describe Asciidoctor::Diagram::ErdBlockMacroProcessor, :broken_on_windows do
+  include_examples "block_macro", :erd, ERD_CODE, [:png, :svg]
+end
+
+describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_windows do
+  include_examples "block", :erd, ERD_CODE, [:png, :svg]
+end

data/spec/gnuplot_spec.rb

@@ -1,15 +1,19 @@
 require_relative 'test_helper'
 
-code = <<-eos
+GNUPLOT_CODE = <<-eos
 plot [0:5][0:20] x**2 title 'O(n^2)'
 eos
 
+describe Asciidoctor::Diagram::GnuplotInlineMacroProcessor do
+  include_examples "inline_macro", :gnuplot, GNUPLOT_CODE, [:png, :svg, :gif]
+end
+
 describe Asciidoctor::Diagram::GnuplotBlockMacroProcessor do
-  include_examples "block_macro", :gnuplot, code, [:png, :svg, :gif, :txt]
+  include_examples "block_macro", :gnuplot, GNUPLOT_CODE, [:png, :svg, :gif, :txt]
 end
 
 describe Asciidoctor::Diagram::GnuplotBlockProcessor do
-  include_examples "block", :gnuplot, code, [:png, :svg, :gif, :txt]
+  include_examples "block", :gnuplot, GNUPLOT_CODE, [:png, :svg, :gif, :txt]
 
   it "should generate images with user defined size" do
     doc = <<-eos
@@ -20,7 +24,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png",width="800", height="600"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -50,7 +54,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", crop=false, transparent=false]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -80,7 +84,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", crop=true, transparent=true]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -110,7 +114,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -140,7 +144,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial,11"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -170,7 +174,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial", scale="0.5"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -200,7 +204,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", background="red"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 

data/spec/graphviz_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+DOT_CODE = <<-eos
 digraph foo {
   node [style=rounded]
   node1 [shape=box]
@@ -11,10 +11,14 @@ digraph foo {
 }
 eos
 
+describe Asciidoctor::Diagram::GraphvizInlineMacroProcessor do
+  include_examples "inline_macro", :graphviz, DOT_CODE, [:png, :svg]
+end
+
 describe Asciidoctor::Diagram::GraphvizBlockMacroProcessor do
-  include_examples "block_macro", :graphviz, code, [:png, :svg]
+  include_examples "block_macro", :graphviz, DOT_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::GraphvizBlockProcessor do
-  include_examples "block", :graphviz, code, [:png, :svg]
+  include_examples "block", :graphviz, DOT_CODE, [:png, :svg]
 end

data/spec/lilypond_spec.rb

@@ -1,13 +1,17 @@
 require_relative 'test_helper'
 
-code = <<-eos
+LILYPOND_CODE = <<-eos
 \\relative c' { f d f a d f e d cis a cis e a g f e }
 eos
 
-describe Asciidoctor::Diagram::LilypondBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :lilypond, code, [:png]
+describe Asciidoctor::Diagram::LilypondInlineMacroProcessor do
+  include_examples "inline_macro", :lilypond, LILYPOND_CODE, [:png]
 end
 
-describe Asciidoctor::Diagram::LilypondBlockProcessor, :broken_on_windows do
-  include_examples "block", :lilypond, code, [:png]
-end
+describe Asciidoctor::Diagram::LilypondBlockMacroProcessor do
+  include_examples "block_macro", :lilypond, LILYPOND_CODE, [:png]
+end
+
+describe Asciidoctor::Diagram::LilypondBlockProcessor do
+  include_examples "block", :lilypond, LILYPOND_CODE, [:png]
+end

data/spec/mermaid_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+MERMAID_CODE = <<-eos
 graph LR
     A[Square Rect] -- Link text --> B((Circle))
     A --> C(Round Rect)
@@ -8,8 +8,12 @@ graph LR
     C --> D
 eos
 
+describe Asciidoctor::Diagram::MermaidInlineMacroProcessor do
+  include_examples "inline_macro", :mermaid, MERMAID_CODE, [:png, :svg]
+end
+
 describe Asciidoctor::Diagram::MermaidBlockMacroProcessor do
-  include_examples "block_macro", :mermaid, code, [:png, :svg]
+  include_examples "block_macro", :mermaid, MERMAID_CODE, [:png, :svg]
 
   it "should respect the sequenceConfig attribute" do
     seq_diag = <<-eos
@@ -135,7 +139,44 @@ mermaid::mermaid.txt[target="without_config"]
 end
 
 describe Asciidoctor::Diagram::MermaidBlockProcessor do
-  include_examples "block", :mermaid, code, [:png, :svg]
+  include_examples "block", :mermaid, MERMAID_CODE, [:png, :svg]
+
+  it "should work with kroki.io" do
+    doc = <<-eos
+= Hello, kroki!
+:diagram-server-url: https://kroki.io/
+:diagram-server-type: kroki_io
+Doc Writer <doc@example.com>
+
+== First Section
+
+[mermaid, format=svg]
+----
+graph TD
+  A[ Anyone ] -->|Can help | B( Go to github.com/yuzutech/kroki )
+  B --> C{ How to contribute? }
+  C --> D[ Reporting bugs ]
+  C --> E[ Sharing ideas ]
+  C --> F[ Advocating ]
+----
+    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
 
   it "should report unsupported scaling factors" do
     doc = <<-eos

data/spec/msc_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+MSC_CODE = <<-eos
 # MSC for some fictional process
 msc {
   hscale = "2";
@@ -24,10 +24,14 @@ msc {
 }
 eos
 
-describe Asciidoctor::Diagram::MscBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :msc, code, [:png, :svg]
+describe Asciidoctor::Diagram::MscInlineMacroProcessor do
+  include_examples "inline_macro", :msc, MSC_CODE, [:png, :svg]
 end
 
-describe Asciidoctor::Diagram::MscBlockProcessor, :broken_on_windows do
-  include_examples "block", :msc, code, [:png, :svg]
-end
+describe Asciidoctor::Diagram::MscBlockMacroProcessor do
+  include_examples "block_macro", :msc, MSC_CODE, [:png, :svg]
+end
+
+describe Asciidoctor::Diagram::MscBlockProcessor do
+  include_examples "block", :msc, MSC_CODE, [:png, :svg]
+end

data/spec/nomnoml_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+NOMNOML_CODE = <<-eos
 [Pirate
   [beard]--[parrot]
   [beard]-:>[foul mouth]
@@ -23,10 +23,14 @@ code = <<-eos
 [<actor>Sailor] - [<usecase>shiver me;timbers]
 eos
 
+describe Asciidoctor::Diagram::NomnomlInlineMacroProcessor do
+  include_examples "inline_macro", :nomnoml, NOMNOML_CODE, [:svg]
+end
+
 describe Asciidoctor::Diagram::NomnomlBlockMacroProcessor do
-  include_examples "block_macro", :nomnoml, code, [:svg]
+  include_examples "block_macro", :nomnoml, NOMNOML_CODE, [:svg]
 end
 
-describe Asciidoctor::Diagram::NomnomlBlockProcessor, :broken_on_windows do
-  include_examples "block", :nomnoml, code, [:svg]
-end
+describe Asciidoctor::Diagram::NomnomlBlockProcessor do
+  include_examples "block", :nomnoml, NOMNOML_CODE, [:svg]
+end