asciidoctor-diagram 1.5.18 → 2.0.0

data/spec/plantuml_spec.rb

@@ -314,6 +314,77 @@ User --> (Use the application) : Label
     expect(b.attributes['height']).to_not be_nil
   end
 
+  it "should respect the svg-type attribute when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="svg", svg-type="inline"]
+----
+User -> (Start)
+User --> (Use the application) : Label
+
+:Main Admin: ---> (Use the application) : Another label
+----
+    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['opts']).to eq('inline')
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should respect the diagram-svg-type attribute when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, PlantUML!
+:diagram-svg-type: inline
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="svg"]
+----
+User -> (Start)
+User --> (Use the application) : Label
+
+:Main Admin: ---> (Use the application) : Another label
+----
+    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['opts']).to eq('inline')
+
+    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, PlantUML!
@@ -1074,4 +1145,22 @@ Doc Writer <doc@example.com>
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
   end
+
+  it "should report syntax errors" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml,format="svg"]
+----
+Bob; Alice; foo
+----
+    eos
+
+    expect {
+      load_asciidoc doc
+    }.to raise_error(/syntax error/i)
+  end
 end

data/spec/smcat_spec.rb

@@ -0,0 +1,164 @@
+require_relative 'test_helper'
+
+code = <<-eos
+initial,
+doing: entry/ write unit test
+       do/ write code
+       exit/ ...,
+# smcat recognizes initial
+# and final states by name
+# and renders them appropriately
+final;
+
+initial      => "on backlog" : item adds most value;
+"on backlog" => doing        : working on it;
+doing        => testing      : built & unit tested;
+testing      => "on backlog" : test not ok;
+testing      => final        : test ok;
+eos
+
+describe Asciidoctor::Diagram::SmcatBlockMacroProcessor, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    File.write('smcat.txt', code)
+
+    doc = <<-eos
+= Hello, Smcat!
+Doc Writer <doc@example.com>
+
+== First Section
+
+smcat::smcat.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
+end
+
+describe Asciidoctor::Diagram::SmcatBlockProcessor, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, Smcat!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[smcat, 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, Smcat!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[smcat, 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('smcat.txt', code)
+
+    doc = <<-eos
+= Hello, Smcat!
+Doc Writer <doc@example.com>
+
+== First Section
+
+smcat::smcat.txt
+
+[smcat, 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('smcat.txt', code)
+
+    doc = <<-eos
+= Hello, Smcat!
+Doc Writer <doc@example.com>
+
+== First Section
+
+smcat::smcat.txt[]
+smcat::smcat.txt[]
+    eos
+
+    load_asciidoc doc
+    expect(File.exist?('smcat.svg')).to be true
+  end
+
+  it "should respect target attribute in block macros" do
+    File.write('smcat.txt', code)
+
+    doc = <<-eos
+= Hello, Smcat!
+Doc Writer <doc@example.com>
+
+== First Section
+
+smcat::smcat.txt["foobar"]
+smcat::smcat.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?('smcat.svg')).to be false
+  end
+end

data/spec/test_helper.rb

@@ -10,13 +10,16 @@ require_relative '../lib/asciidoctor-diagram/a2s/extension'
 require_relative '../lib/asciidoctor-diagram/blockdiag/extension'
 require_relative '../lib/asciidoctor-diagram/ditaa/extension'
 require_relative '../lib/asciidoctor-diagram/erd/extension'
+require_relative '../lib/asciidoctor-diagram/gnuplot/extension'
 require_relative '../lib/asciidoctor-diagram/graphviz/extension'
+require_relative '../lib/asciidoctor-diagram/lilypond/extension'
 require_relative '../lib/asciidoctor-diagram/meme/extension'
 require_relative '../lib/asciidoctor-diagram/mermaid/extension'
 require_relative '../lib/asciidoctor-diagram/msc/extension'
 require_relative '../lib/asciidoctor-diagram/nomnoml/extension'
 require_relative '../lib/asciidoctor-diagram/plantuml/extension'
 require_relative '../lib/asciidoctor-diagram/shaape/extension'
+require_relative '../lib/asciidoctor-diagram/smcat/extension'
 require_relative '../lib/asciidoctor-diagram/svgbob/extension'
 require_relative '../lib/asciidoctor-diagram/syntrax/extension'
 require_relative '../lib/asciidoctor-diagram/tikz/extension'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.18
+  version: 2.0.0
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-12-15 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,66 @@ 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/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/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/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/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/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,22 +166,28 @@ 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.14.jar
+- lib/ditaamini-0.12.jar
 - lib/jlatexmath-minimal-1.0.5.jar
-- lib/plantuml-1.3.13.jar
+- lib/plantuml-1.3.14.jar
 - lib/plantuml.jar
-- lib/server-1.3.13.jar
+- lib/server-1.3.14.jar
 - spec/a2s_spec.rb
 - spec/blockdiag_spec.rb
+- spec/bpmn-example.xml
+- spec/bpmn_spec.rb
 - spec/ditaa_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
@@ -159,6 +195,7 @@ files:
 - spec/nomnoml_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
+- spec/smcat_spec.rb
 - spec/svgbob_spec.rb
 - spec/syntrax_spec.rb
 - spec/test_helper.rb
@@ -185,8 +222,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.3
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
@@ -194,9 +230,13 @@ summary: An extension for asciidoctor that adds support for UML diagram generati
 test_files:
 - spec/a2s_spec.rb
 - spec/blockdiag_spec.rb
+- spec/bpmn-example.xml
+- spec/bpmn_spec.rb
 - spec/ditaa_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
@@ -204,6 +244,7 @@ test_files:
 - spec/nomnoml_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
+- spec/smcat_spec.rb
 - spec/svgbob_spec.rb
 - spec/syntrax_spec.rb
 - spec/test_helper.rb