asciidoctor-diagram 2.0.2 → 2.1.2

data/spec/dpic_spec.rb

@@ -0,0 +1,19 @@
+require_relative 'test_helper'
+
+DPIC_CODE = <<-eos
+  arrow "$u$" above
+S: circle rad 10/72.27  # 10 pt
+  line right 0.35
+G: box "$G(s)$"
+  arrow "$y$" above
+  line -> down G.ht from last arrow then left last arrow.c.x-S.x then to S.s
+  "$-\;$" below rjust
+eos
+
+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,207 +83,10 @@ play        1--* play_player
 player      1--* play_player
 eos
 
-describe Asciidoctor::Diagram::ErdBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
-  it "should generate PNG images when format is set to 'png'" do
-    File.write('erd.txt', code)
-
-    doc = <<-eos
-= Hello, Erd!
-Doc Writer <doc@example.com>
-
-== First Section
-
-erd::erd.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('erd.txt', code)
-
-    doc = <<-eos
-= Hello, Erd!
-Doc Writer <doc@example.com>
-
-== First Section
-
-erd::erd.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::ErdBlockMacroProcessor, :broken_on_windows do
+  include_examples "block_macro", :erd, ERD_CODE, [:png, :svg]
 end
 
-describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_travis, :broken_on_windows do
-  it "should generate PNG images when format is set to 'png'" do
-    doc = <<-eos
-= Hello, Erd!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[erd, 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, Erd!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[erd, 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, Erd!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[erd, 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('erd.txt', code)
-
-    doc = <<-eos
-= Hello, Erd!
-Doc Writer <doc@example.com>
-
-== First Section
-
-erd::erd.txt
-
-[erd, 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('erd.txt', code)
-
-    doc = <<-eos
-= Hello, Erd!
-Doc Writer <doc@example.com>
-
-== First Section
-
-erd::erd.txt[]
-erd::erd.txt[]
-    eos
-
-    load_asciidoc doc
-    expect(File.exist?('erd.png')).to be true
-  end
-
-  it "should respect target attribute in block macros" do
-    File.write('erd.txt', code)
-
-    doc = <<-eos
-= Hello, Erd!
-Doc Writer <doc@example.com>
-
-== First Section
-
-erd::erd.txt["foobar"]
-erd::erd.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?('erd.png')).to be false
-  end
-end
+describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_windows do
+  include_examples "block", :erd, ERD_CODE, [:png, :svg]
+end

data/spec/gnuplot_spec.rb

@@ -1,269 +1,16 @@
 require_relative 'test_helper'
 
-code = <<-eos
+GNUPLOT_CODE = <<-eos
 plot [0:5][0:20] x**2 title 'O(n^2)'
 eos
 
 describe Asciidoctor::Diagram::GnuplotBlockMacroProcessor do
-  it "should generate PNG images when format is set to 'png'" do
-    File.write('gnuplot.txt', code)
-
-    doc = <<-eos
-= Hello, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-gnuplot::gnuplot.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('gnuplot.txt', code)
-
-    doc = <<-eos
-= Hello, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-gnuplot::gnuplot.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
-
-  it "should generate GIF images when format is set to 'gif'" do
-    File.write('gnuplot.txt', code)
-
-    doc = <<-eos
-= Hello, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-gnuplot::gnuplot.txt[format="gif"]
-    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(/\.gif$/)
-    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 literal blocks when format is set to 'txt'" do
-    doc = <<-eos
-= Hello, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[gnuplot, format="txt"]
-----
-#{code}
-----
-    eos
-
-    d = load_asciidoc doc
-    expect(d).to_not be_nil
-
-    b = d.find { |bl| bl.context == :literal }
-    expect(b).to_not be_nil
-
-    expect(b.content_model).to eq :verbatim
-
-    expect(b.attributes['target']).to be_nil
-  end
-
-
+  include_examples "block_macro", :gnuplot, GNUPLOT_CODE, [:png, :svg, :gif, :txt]
 end
 
 describe Asciidoctor::Diagram::GnuplotBlockProcessor do
-  it "should generate PNG images when format is set to 'png'" do
-    doc = <<-eos
-= Hello, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
+  include_examples "block", :gnuplot, GNUPLOT_CODE, [:png, :svg, :gif, :txt]
 
-[gnuplot, 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, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[gnuplot, 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, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[gnuplot, 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('gnuplot.txt', code)
-
-    doc = <<-eos
-= Hello, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-gnuplot::gnuplot.txt
-
-[gnuplot, 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('gnuplot.txt', code)
-
-    doc = <<-eos
-= Hello, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-gnuplot::gnuplot.txt[]
-gnuplot::gnuplot.txt[]
-    eos
-
-    load_asciidoc doc
-    expect(File.exist?('gnuplot.png')).to be true
-  end
-
-  it "should respect target attribute in block macros" do
-    File.write('gnuplot.txt', code)
-
-    doc = <<-eos
-= Hello, Gnuplot!
-Doc Writer <doc@example.com>
-
-== First Section
-
-gnuplot::gnuplot.txt["foobar"]
-gnuplot::gnuplot.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?('gnuplot.png')).to be false
-  end
   it "should generate images with user defined size" do
     doc = <<-eos
 = Hello, Gnuplot!
@@ -273,7 +20,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png",width="800", height="600"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -303,7 +50,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", crop=false, transparent=false]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -333,7 +80,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", crop=true, transparent=true]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -363,7 +110,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -393,7 +140,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial,11"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -423,7 +170,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial", scale="0.5"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -453,7 +200,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", background="red"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos