asciidoctor-diagram 1.5.18 → 2.0.4

data/spec/tikz_spec.rb

@@ -99,29 +99,9 @@ code = <<-'eos'
 eos
 
 describe Asciidoctor::Diagram::TikZBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
-  it "should generate PDF images when format is set to 'pdf'" do
-    File.write('tikz.txt', code)
+  include_examples "block_macro", :tikz, code, [:pdf]
+end
 
-    doc = <<-eos
-= Hello, Tikz!
-Doc Writer <doc@example.com>
-
-== First Section
-
-tikz::tikz.txt[format="pdf"]
-    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(/\.pdf/)
-    expect(File.exist?(target)).to be true
-  end
+describe Asciidoctor::Diagram::TikZBlockProcessor, :broken_on_travis, :broken_on_windows do
+  include_examples "block", :tikz, code, [:pdf]
 end

data/spec/umlet_spec.rb

@@ -21,65 +21,9 @@ eos
 
 
 describe Asciidoctor::Diagram::UmletBlockMacroProcessor do
-  it "should generate SVG images when format omitted" do
-    File.write('umlet.uxf', code)
-
-    doc = <<-eos
-= Hello, Umlet!
-Doc Writer <doc@example.com>
-
-== First Section
-
-umlet::umlet.uxf[]
-    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", :umlet, code, [:svg]
 end
 
-
 describe Asciidoctor::Diagram::UmletBlockProcessor do
-  it "should generate SVG images when format is omitted" do
-    doc = <<-eos
-= Hello, Umlet!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[umlet]
-----
-#{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
+  include_examples "block", :umlet, code, [:svg]
 end

data/spec/vega_spec.rb

@@ -118,124 +118,11 @@ vegalite_code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::VegaBlockMacroProcessor, :broken_on_windows do
-  it "should generate vega SVG images when format omitted" do
-    File.write('vega.json', vega_code)
-
-    doc = <<-eos
-= Hello, Vega!
-Doc Writer <doc@example.com>
-
-== First Section
-
-vega::vega.json[]
-    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 vegalite SVG images when format omitted" do
-    File.write('vega.json', vegalite_code)
-
-    doc = <<-eos
-= Hello, Vega!
-Doc Writer <doc@example.com>
-
-== First Section
-
-vegalite::vega.json[]
-    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", :vega, vega_code, [:svg]
+  # include_examples "block_macro", :vegalite, vegalite_code, [:svg]
 end
 
-
 describe Asciidoctor::Diagram::VegaBlockProcessor, :broken_on_windows do
-  it "should generate vega SVG images when format is omitted" do
-    doc = <<-eos
-= Hello, Vega!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[vega]
-----
-#{vega_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 generate vegalite SVG images when format is omitted" do
-    doc = <<-eos
-= Hello, Vega!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[vegalite]
-----
-#{vegalite_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
+  include_examples "block", :vega, vega_code, [:svg]
+  # include_examples "block", :vegalite, vegalite_code, [:svg]
 end

data/spec/wavedrom_spec.rb

@@ -9,206 +9,9 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::WavedromBlockMacroProcessor, :broken_on_windows do
-  it "should generate PNG images when format is set to 'png'" do
-    File.write('wavedrom.txt', code)
-
-    doc = <<-eos
-= Hello, Wavedrom!
-Doc Writer <doc@example.com>
-
-== First Section
-
-wavedrom::wavedrom.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('wavedrom.txt', code)
-
-    doc = <<-eos
-= Hello, Wavedrom!
-Doc Writer <doc@example.com>
-
-== First Section
-
-wavedrom::wavedrom.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", :wavedrom, code, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::WavedromBlockProcessor, :broken_on_windows do
-  it "should generate PNG images when format is set to 'png'" do
-    doc = <<-eos
-= Hello, Wavedrom!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[wavedrom, 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, Wavedrom!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[wavedrom, 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, Wavedrom!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[wavedrom, 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('wavedrom.txt', code)
-
-    doc = <<-eos
-= Hello, Wavedrom!
-Doc Writer <doc@example.com>
-
-== First Section
-
-wavedrom::wavedrom.txt
-
-[wavedrom, 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('wavedrom.txt', code)
-
-    doc = <<-eos
-= Hello, Wavedrom!
-Doc Writer <doc@example.com>
-
-== First Section
-
-wavedrom::wavedrom.txt[]
-wavedrom::wavedrom.txt[]
-    eos
-
-    load_asciidoc doc
-    expect(File.exist?('wavedrom.png')).to be true
-  end
-
-  it "should respect target attribute in block macros" do
-    File.write('wavedrom.txt', code)
-
-    doc = <<-eos
-= Hello, Wavedrom!
-Doc Writer <doc@example.com>
-
-== First Section
-
-wavedrom::wavedrom.txt["foobar"]
-wavedrom::wavedrom.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?('wavedrom.png')).to be false
-  end
+  include_examples "block", :wavedrom, code, [:png, :svg]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.18
+  version: 2.0.4
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.x
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.x
@@ -92,36 +92,79 @@ files:
 - images/asciidoctor-diagram-process.png
 - lib/asciidoctor-diagram.rb
 - lib/asciidoctor-diagram/a2s.rb
+- lib/asciidoctor-diagram/a2s/converter.rb
 - lib/asciidoctor-diagram/a2s/extension.rb
 - lib/asciidoctor-diagram/blockdiag.rb
+- lib/asciidoctor-diagram/blockdiag/converter.rb
 - lib/asciidoctor-diagram/blockdiag/extension.rb
+- lib/asciidoctor-diagram/bpmn.rb
+- lib/asciidoctor-diagram/bpmn/converter.rb
+- lib/asciidoctor-diagram/bpmn/extension.rb
+- lib/asciidoctor-diagram/bytefield.rb
+- lib/asciidoctor-diagram/bytefield/converter.rb
+- lib/asciidoctor-diagram/bytefield/extension.rb
+- lib/asciidoctor-diagram/diagram_converter.rb
+- lib/asciidoctor-diagram/diagram_processor.rb
+- lib/asciidoctor-diagram/diagram_source.rb
 - lib/asciidoctor-diagram/ditaa.rb
+- lib/asciidoctor-diagram/ditaa/converter.rb
 - lib/asciidoctor-diagram/ditaa/extension.rb
+- lib/asciidoctor-diagram/dpic.rb
+- lib/asciidoctor-diagram/dpic/converter.rb
+- lib/asciidoctor-diagram/dpic/extension.rb
 - lib/asciidoctor-diagram/erd.rb
+- lib/asciidoctor-diagram/erd/converter.rb
 - lib/asciidoctor-diagram/erd/extension.rb
-- lib/asciidoctor-diagram/extensions.rb
+- lib/asciidoctor-diagram/gnuplot.rb
+- lib/asciidoctor-diagram/gnuplot/converter.rb
+- lib/asciidoctor-diagram/gnuplot/extension.rb
 - lib/asciidoctor-diagram/graphviz.rb
+- lib/asciidoctor-diagram/graphviz/converter.rb
 - lib/asciidoctor-diagram/graphviz/extension.rb
+- lib/asciidoctor-diagram/http/converter.rb
+- lib/asciidoctor-diagram/http/server.rb
+- lib/asciidoctor-diagram/lilypond.rb
+- lib/asciidoctor-diagram/lilypond/converter.rb
+- lib/asciidoctor-diagram/lilypond/extension.rb
 - lib/asciidoctor-diagram/meme.rb
+- lib/asciidoctor-diagram/meme/converter.rb
 - lib/asciidoctor-diagram/meme/extension.rb
 - lib/asciidoctor-diagram/mermaid.rb
+- lib/asciidoctor-diagram/mermaid/converter.rb
 - lib/asciidoctor-diagram/mermaid/extension.rb
 - lib/asciidoctor-diagram/msc.rb
+- lib/asciidoctor-diagram/msc/converter.rb
 - lib/asciidoctor-diagram/msc/extension.rb
 - lib/asciidoctor-diagram/nomnoml.rb
+- lib/asciidoctor-diagram/nomnoml/converter.rb
 - lib/asciidoctor-diagram/nomnoml/extension.rb
+- lib/asciidoctor-diagram/pikchr.rb
+- lib/asciidoctor-diagram/pikchr/converter.rb
+- lib/asciidoctor-diagram/pikchr/extension.rb
 - lib/asciidoctor-diagram/plantuml.rb
+- lib/asciidoctor-diagram/plantuml/converter.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
 - lib/asciidoctor-diagram/salt.rb
 - lib/asciidoctor-diagram/shaape.rb
+- lib/asciidoctor-diagram/shaape/converter.rb
 - lib/asciidoctor-diagram/shaape/extension.rb
+- lib/asciidoctor-diagram/smcat.rb
+- lib/asciidoctor-diagram/smcat/converter.rb
+- lib/asciidoctor-diagram/smcat/extension.rb
 - lib/asciidoctor-diagram/svgbob.rb
+- lib/asciidoctor-diagram/svgbob/converter.rb
 - lib/asciidoctor-diagram/svgbob/extension.rb
+- lib/asciidoctor-diagram/symbolator.rb
+- lib/asciidoctor-diagram/symbolator/converter.rb
+- lib/asciidoctor-diagram/symbolator/extension.rb
 - lib/asciidoctor-diagram/syntrax.rb
+- lib/asciidoctor-diagram/syntrax/converter.rb
 - lib/asciidoctor-diagram/syntrax/extension.rb
 - lib/asciidoctor-diagram/tikz.rb
+- lib/asciidoctor-diagram/tikz/converter.rb
 - lib/asciidoctor-diagram/tikz/extension.rb
 - lib/asciidoctor-diagram/umlet.rb
+- lib/asciidoctor-diagram/umlet/converter.rb
 - lib/asciidoctor-diagram/umlet/extension.rb
 - lib/asciidoctor-diagram/util/binaryio.rb
 - lib/asciidoctor-diagram/util/cli.rb
@@ -136,30 +179,41 @@ files:
 - lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/util/which.rb
 - lib/asciidoctor-diagram/vega.rb
+- lib/asciidoctor-diagram/vega/converter.rb
 - lib/asciidoctor-diagram/vega/extension.rb
 - lib/asciidoctor-diagram/version.rb
 - lib/asciidoctor-diagram/wavedrom.rb
+- lib/asciidoctor-diagram/wavedrom/converter.rb
 - lib/asciidoctor-diagram/wavedrom/extension.rb
 - lib/batik-all-1.10.jar
-- lib/ditaa-1.3.13.jar
-- lib/ditaamini-0.11.jar
+- lib/ditaa-1.3.15.jar
+- lib/ditaamini-0.12.jar
 - lib/jlatexmath-minimal-1.0.5.jar
-- lib/plantuml-1.3.13.jar
+- lib/plantuml-1.3.15.jar
 - lib/plantuml.jar
-- lib/server-1.3.13.jar
+- lib/server-1.3.15.jar
 - spec/a2s_spec.rb
 - spec/blockdiag_spec.rb
+- spec/bpmn_spec.rb
+- spec/bytefield_spec.rb
 - spec/ditaa_spec.rb
+- spec/dpic_spec.rb
 - spec/erd_spec.rb
+- spec/gnuplot_spec.rb
 - spec/graphviz_spec.rb
+- spec/lilypond_spec.rb
 - spec/man.jpg
 - spec/meme_spec.rb
 - spec/mermaid_spec.rb
 - spec/msc_spec.rb
 - spec/nomnoml_spec.rb
+- spec/pikchr_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
+- spec/shared_examples.rb
+- spec/smcat_spec.rb
 - spec/svgbob_spec.rb
+- spec/symbolator_spec.rb
 - spec/syntrax_spec.rb
 - spec/test_helper.rb
 - spec/tikz_spec.rb
@@ -185,8 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
@@ -194,17 +247,26 @@ summary: An extension for asciidoctor that adds support for UML diagram generati
 test_files:
 - spec/a2s_spec.rb
 - spec/blockdiag_spec.rb
+- spec/bpmn_spec.rb
+- spec/bytefield_spec.rb
 - spec/ditaa_spec.rb
+- spec/dpic_spec.rb
 - spec/erd_spec.rb
+- spec/gnuplot_spec.rb
 - spec/graphviz_spec.rb
+- spec/lilypond_spec.rb
 - spec/man.jpg
 - spec/meme_spec.rb
 - spec/mermaid_spec.rb
 - spec/msc_spec.rb
 - spec/nomnoml_spec.rb
+- spec/pikchr_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
+- spec/shared_examples.rb
+- spec/smcat_spec.rb
 - spec/svgbob_spec.rb
+- spec/symbolator_spec.rb
 - spec/syntrax_spec.rb
 - spec/test_helper.rb
 - spec/tikz_spec.rb