asciidoctor-diagram 2.0.2 → 2.1.2

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,207 +24,10 @@ msc {
 }
 eos
 
-describe Asciidoctor::Diagram::MscBlockMacroProcessor, :broken_on_windows do
-  it "should generate PNG images when format is set to 'png'" do
-    File.write('msc.txt', code)
-
-    doc = <<-eos
-= Hello, Msc!
-Doc Writer <doc@example.com>
-
-== First Section
-
-msc::msc.txt[format="png"]
-    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(/\.png$/)
-    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 generate SVG images when format is set to 'svg'" do
-    File.write('msc.txt', code)
-
-    doc = <<-eos
-= Hello, Msc!
-Doc Writer <doc@example.com>
-
-== First Section
-
-msc::msc.txt[format="svg"]
-    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
+describe Asciidoctor::Diagram::MscBlockMacroProcessor do
+  include_examples "block_macro", :msc, MSC_CODE, [:png, :svg]
 end
 
-describe Asciidoctor::Diagram::MscBlockProcessor, :broken_on_windows do
-  it "should generate PNG images when format is set to 'png'" do
-    doc = <<-eos
-= Hello, Msc!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[msc, format="png"]
-----
-#{code}
-----
-    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(/\.png$/)
-    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 generate SVG images when format is set to 'svg'" do
-    doc = <<-eos
-= Hello, Msc!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[msc, format="svg"]
-----
-#{code}
-----
-    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 raise an error when when format is set to an invalid value" do
-    doc = <<-eos
-= Hello, Msc!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[msc, format="foobar"]
-----
-----
-    eos
-
-    expect { load_asciidoc doc }.to raise_error(/support.*format/i)
-  end
-
-  it "should not regenerate images when source has not changed" do
-    File.write('msc.txt', code)
-
-    doc = <<-eos
-= Hello, Msc!
-Doc Writer <doc@example.com>
-
-== First Section
-
-msc::msc.txt
-
-[msc, format="png"]
-----
-#{code}
-----
-    eos
-
-    d = load_asciidoc doc
-    b = d.find { |bl| bl.context == :image }
-    expect(b).to_not be_nil
-    target = b.attributes['target']
-    mtime1 = File.mtime(target)
-
-    sleep 1
-
-    d = load_asciidoc doc
-
-    mtime2 = File.mtime(target)
-
-    expect(mtime2).to eq mtime1
-  end
-
-  it "should handle two block macros with the same source" do
-    File.write('msc.txt', code)
-
-    doc = <<-eos
-= Hello, Msc!
-Doc Writer <doc@example.com>
-
-== First Section
-
-msc::msc.txt[]
-msc::msc.txt[]
-    eos
-
-    load_asciidoc doc
-    expect(File.exist?('msc.png')).to be true
-  end
-
-  it "should respect target attribute in block macros" do
-    File.write('msc.txt', code)
-
-    doc = <<-eos
-= Hello, Msc!
-Doc Writer <doc@example.com>
-
-== First Section
-
-msc::msc.txt["foobar"]
-msc::msc.txt["foobaz"]
-    eos
-
-    load_asciidoc doc
-    expect(File.exist?('foobar.png')).to be true
-    expect(File.exist?('foobaz.png')).to be true
-    expect(File.exist?('msc.png')).to be false
-  end
-end
+describe Asciidoctor::Diagram::MscBlockProcessor do
+  include_examples "block", :msc, MSC_CODE, [:png, :svg]
+end

data/spec/nomnoml_spec.rb

@@ -1,7 +1,7 @@
 require_relative 'test_helper'
 
-code = <<-eos
-[Pirate|eyeCount: Int|raid();pillage()|
+NOMNOML_CODE = <<-eos
+[Pirate
   [beard]--[parrot]
   [beard]-:>[foul mouth]
 ]
@@ -11,7 +11,7 @@ code = <<-eos
 [jollyness]->[Pirate]
 [jollyness]->[rum]
 [jollyness]->[singing]
-[Pirate]-> *[rum|tastiness: Int|swig()]
+[Pirate]-> *[rum]
 [Pirate]->[singing]
 [singing]<->[rum]
 
@@ -24,147 +24,9 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::NomnomlBlockMacroProcessor do
-  it "should generate SVG images when format is set to 'svg'" do
-    File.write('nomnoml.txt', code)
-
-    doc = <<-eos
-= Hello, Nomnoml!
-Doc Writer <doc@example.com>
-
-== First Section
-
-nomnoml::nomnoml.txt[format="svg"]
-    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
+  include_examples "block_macro", :nomnoml, NOMNOML_CODE, [:svg]
 end
 
-describe Asciidoctor::Diagram::NomnomlBlockProcessor, :broken_on_windows do
-  it "should generate SVG images when format is set to 'svg'" do
-    doc = <<-eos
-= Hello, Nomnoml!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[nomnoml, format="svg"]
-----
-#{code}
-----
-    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 raise an error when when format is set to an invalid value" do
-    doc = <<-eos
-= Hello, Nomnoml!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[nomnoml, format="foobar"]
-----
-----
-    eos
-
-    expect { load_asciidoc doc }.to raise_error(/support.*format/i)
-  end
-
-  it "should not regenerate images when source has not changed" do
-    File.write('nomnoml.txt', code)
-
-    doc = <<-eos
-= Hello, Nomnoml!
-Doc Writer <doc@example.com>
-
-== First Section
-
-nomnoml::nomnoml.txt
-
-[nomnoml, format="svg"]
-----
-#{code}
-----
-    eos
-
-    d = load_asciidoc doc
-    b = d.find { |bl| bl.context == :image }
-    expect(b).to_not be_nil
-    target = b.attributes['target']
-    mtime1 = File.mtime(target)
-
-    sleep 1
-
-    d = load_asciidoc doc
-
-    mtime2 = File.mtime(target)
-
-    expect(mtime2).to eq mtime1
-  end
-
-  it "should handle two block macros with the same source" do
-    File.write('nomnoml.txt', code)
-
-    doc = <<-eos
-= Hello, Nomnoml!
-Doc Writer <doc@example.com>
-
-== First Section
-
-nomnoml::nomnoml.txt[]
-nomnoml::nomnoml.txt[]
-    eos
-
-    load_asciidoc doc
-    expect(File.exist?('nomnoml.svg')).to be true
-  end
-
-  it "should respect target attribute in block macros" do
-    File.write('nomnoml.txt', code)
-
-    doc = <<-eos
-= Hello, Nomnoml!
-Doc Writer <doc@example.com>
-
-== First Section
-
-nomnoml::nomnoml.txt["foobar"]
-nomnoml::nomnoml.txt["foobaz"]
-    eos
-
-    load_asciidoc doc
-    expect(File.exist?('foobar.svg')).to be true
-    expect(File.exist?('foobaz.svg')).to be true
-    expect(File.exist?('nomnoml.svg')).to be false
-  end
-end
+describe Asciidoctor::Diagram::NomnomlBlockProcessor do
+  include_examples "block", :nomnoml, NOMNOML_CODE, [:svg]
+end

data/spec/pikchr_spec.rb

@@ -0,0 +1,69 @@
+require_relative 'test_helper'
+
+PIKCHR_CODE = <<-eos
+# Change from the original:
+#    * Expand the macro by hand, as Pikchr does not support
+#      macros
+#
+#define ndblock {
+#  box wid boxwid/2 ht boxht/2
+#  down;  box same with .t at bottom of last box;   box same
+#}
+boxht = .2; boxwid = .3; circlerad = .3; dx = 0.05
+down; box; box; box; box ht 3*boxht "." "." "."
+L: box; box; box invis wid 2*boxwid "hashtab:" with .e at 1st box .w
+right
+Start: box wid .5 with .sw at 1st box.ne + (.4,.2) "..."
+N1: box wid .2 "n1";  D1: box wid .3 "d1"
+N3: box wid .4 "n3";  D3: box wid .3 "d3"
+box wid .4 "..."
+N2: box wid .5 "n2";  D2: box wid .2 "d2"
+arrow right from 2nd box
+#ndblock
+  box wid boxwid/2 ht boxht/2
+  down;  box same with .t at bottom of last box;   box same
+spline -> right .2 from 3rd last box then to N1.sw + (dx,0)
+spline -> right .3 from 2nd last box then to D1.sw + (dx,0)
+arrow right from last box
+#ndblock
+  box wid boxwid/2 ht boxht/2
+  down;  box same with .t at bottom of last box;   box same
+spline -> right .2 from 3rd last box to N2.sw-(dx,.2) to N2.sw+(dx,0)
+spline -> right .3 from 2nd last box to D2.sw-(dx,.2) to D2.sw+(dx,0)
+arrow right 2*linewid from L
+#ndblock
+  box wid boxwid/2 ht boxht/2
+  down;  box same with .t at bottom of last box;   box same
+spline -> right .2 from 3rd last box to N3.sw + (dx,0)
+spline -> right .3 from 2nd last box to D3.sw + (dx,0)
+circlerad = .3
+circle invis "ndblock"  at last box.e + (1.2,.2)
+arrow dashed from last circle.w to 5/8<last circle.w,2nd last box> chop
+box invis wid 2*boxwid "ndtable:" with .e at Start.w
+eos
+
+describe Asciidoctor::Diagram::PikchrBlockMacroProcessor, :broken_on_windows do
+  include_examples "block_macro", :pikchr, PIKCHR_CODE, [:svg]
+end
+
+describe Asciidoctor::Diagram::PikchrBlockProcessor, :broken_on_windows do
+  include_examples "block", :pikchr, PIKCHR_CODE, [:svg]
+
+  it "should report syntax errors" do
+    doc = <<-eos
+= Hello, Pikchr!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[pikchr]
+----
+This should raise a syntax error.
+----
+    eos
+
+    expect {
+      load_asciidoc doc
+    }.to raise_error(/error/i)
+  end
+end