asciidoctor-diagram 2.1.2 → 2.2.2

data/lib/asciidoctor-diagram/svgbob/converter.rb

@@ -44,7 +44,7 @@ module Asciidoctor
           OPTIONS[option].call(flags, value)
         end
         
-        generate_stdin(source.find_command('svgbob'), format.to_s, source.to_s) do |tool_path, output_path|
+        generate_stdin(source.find_command('svgbob', :alt_cmds => ['svgbob_cli']), format.to_s, source.to_s) do |tool_path, output_path|
           ([tool_path, '-o', Platform.native_path(output_path)] + flags)
         end
       end

data/lib/asciidoctor-diagram/svgbob/extension.rb

@@ -10,5 +10,9 @@ module Asciidoctor
     class SvgBobBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter SvgbobConverter
     end
+
+    class SvgBobInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter SvgbobConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/svgbob.rb

@@ -4,4 +4,5 @@ require_relative 'svgbob/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::SvgBobBlockProcessor, :svgbob
   block_macro Asciidoctor::Diagram::SvgBobBlockMacroProcessor, :svgbob
+  inline_macro Asciidoctor::Diagram::SvgBobInlineMacroProcessor, :svgbob
 end

data/lib/asciidoctor-diagram/symbolator/extension.rb

@@ -10,5 +10,9 @@ module Asciidoctor
     class SymbolatorBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter SymbolatorConverter
     end
+
+    class SymbolatorInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter SymbolatorConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/symbolator.rb

@@ -4,4 +4,5 @@ require_relative 'symbolator/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::SymbolatorBlockProcessor, :symbolator
   block_macro Asciidoctor::Diagram::SymbolatorBlockMacroProcessor, :symbolator
+  inline_macro Asciidoctor::Diagram::SymbolatorInlineMacroProcessor, :symbolator
 end

data/lib/asciidoctor-diagram/syntrax/converter.rb

@@ -19,7 +19,7 @@ module Asciidoctor
             :heading => source.attr('heading'),
             :scale => source.attr('scale'),
             :transparent => source.attr('transparent'),
-            :style => source.attr('style-file')
+            :style => source.attr('style-file') || source.attr("#{source.diagram_type}-style", nil, true)
         }
       end
 

data/lib/asciidoctor-diagram/syntrax/extension.rb

@@ -10,5 +10,9 @@ module Asciidoctor
     class SyntraxBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter SyntraxConverter
     end
+
+    class SyntraxInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter SyntraxConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/syntrax.rb

@@ -4,4 +4,5 @@ require_relative 'syntrax/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::SyntraxBlockProcessor, :syntrax
   block_macro Asciidoctor::Diagram::SyntraxBlockMacroProcessor, :syntrax
+  inline_macro Asciidoctor::Diagram::SyntraxInlineMacroProcessor, :syntrax
 end

data/lib/asciidoctor-diagram/tikz/extension.rb

@@ -10,5 +10,9 @@ module Asciidoctor
     class TikZBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter TikZConverter
     end
+
+    class TikZInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter TikZConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/tikz.rb

@@ -4,4 +4,5 @@ require_relative 'tikz/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::TikZBlockProcessor, :tikz
   block_macro Asciidoctor::Diagram::TikZBlockMacroProcessor, :tikz
+  inline_macro Asciidoctor::Diagram::TikZInlineMacroProcessor, :tikz
 end

data/lib/asciidoctor-diagram/umlet/extension.rb

@@ -10,5 +10,9 @@ module Asciidoctor
     class UmletBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter UmletConverter
     end
+
+    class UmletInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter UmletConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/umlet.rb

@@ -4,4 +4,5 @@ require_relative 'umlet/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::UmletBlockProcessor, :umlet
   block_macro Asciidoctor::Diagram::UmletBlockMacroProcessor, :umlet
+  inline_macro Asciidoctor::Diagram::UmletInlineMacroProcessor, :umlet
 end

data/lib/asciidoctor-diagram/vega/extension.rb

@@ -10,5 +10,9 @@ module Asciidoctor
     class VegaBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter VegaConverter
     end
+
+    class VegaInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter VegaConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/vega.rb

@@ -4,7 +4,9 @@ require_relative 'vega/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::VegaBlockProcessor, :vega
   block_macro Asciidoctor::Diagram::VegaBlockMacroProcessor, :vega
+  inline_macro Asciidoctor::Diagram::VegaInlineMacroProcessor, :vega
 
   block Asciidoctor::Diagram::VegaBlockProcessor, :vegalite
   block_macro Asciidoctor::Diagram::VegaBlockMacroProcessor, :vegalite
+  inline_macro Asciidoctor::Diagram::VegaInlineMacroProcessor, :vegalite
 end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.1.2"
+    VERSION = "2.2.2"
   end
 end

data/lib/asciidoctor-diagram/wavedrom/extension.rb

@@ -10,5 +10,9 @@ module Asciidoctor
     class WavedromBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter WavedromConverter
     end
+
+    class WavedromInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter WavedromConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/wavedrom.rb

@@ -4,4 +4,5 @@ require_relative 'wavedrom/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::WavedromBlockProcessor, :wavedrom
   block_macro Asciidoctor::Diagram::WavedromBlockMacroProcessor, :wavedrom
+  inline_macro Asciidoctor::Diagram::WavedromInlineMacroProcessor, :wavedrom
 end

data/lib/asciidoctor-diagram.rb

@@ -1,4 +1,5 @@
 require_relative 'asciidoctor-diagram/a2s'
+require_relative 'asciidoctor-diagram/barcode'
 require_relative 'asciidoctor-diagram/blockdiag'
 require_relative 'asciidoctor-diagram/bpmn'
 require_relative 'asciidoctor-diagram/bytefield'
@@ -8,6 +9,7 @@ require_relative 'asciidoctor-diagram/dpic'
 require_relative 'asciidoctor-diagram/erd'
 require_relative 'asciidoctor-diagram/gnuplot'
 require_relative 'asciidoctor-diagram/graphviz'
+require_relative 'asciidoctor-diagram/graphviz_py'
 require_relative 'asciidoctor-diagram/lilypond'
 require_relative 'asciidoctor-diagram/meme'
 require_relative 'asciidoctor-diagram/mermaid'

data/spec/a2s_spec.rb

@@ -20,6 +20,10 @@ A2S_CODE = <<-eos
                                       '---------------------------------------'
 eos
 
+describe Asciidoctor::Diagram::AsciiToSvgInlineMacroProcessor do
+  include_examples "inline_macro", :a2s, A2S_CODE, [:svg]
+end
+
 describe Asciidoctor::Diagram::AsciiToSvgBlockMacroProcessor do
   include_examples "block_macro", :a2s, A2S_CODE, [:svg]
 end

data/spec/barcode_spec.rb

@@ -0,0 +1,176 @@
+require_relative 'test_helper'
+
+BARCODES = {
+  :bookland => '978-0-306-40615-7',
+  :codabar => 'A123456A',
+  :code25 => '123456',
+  :code25iata => '123456',
+  :code25interleaved => '123456',
+  :code39 => '123456',
+  :code93 => '123456',
+  :code128 => '123456',
+  :code128a => '123456',
+  :code128b => '123456',
+  :code128c => '123456',
+  :ean8 => '0170725',
+  :ean13 => '070071967072',
+  :gs1_128 => '(FNC1)(SP)00(SP)12345678(SP)0000000001',
+  :qrcode => 'http://github.com/',
+  :upca => '12360105707',
+}
+
+describe Asciidoctor::Diagram::BarcodeBlockProcessor do
+  BARCODES.each_pair do |type, code|
+    it "should support #{type}" do
+      doc = <<-eos
+= Hello, barby!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[#{type},test,png,xdim=1,margin=10,height=100,foreground=darkgray,background=azure]
+----
+#{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
+  end
+
+  it "should support complex QR codes" do
+    doc = <<-eos
+= Hello, barby!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[qrcode]
+----
+BEGIN:VCARD
+VERSION:3.0
+N:Doe;John;;;
+FN:John Doe
+ORG:Example.com Inc.;
+TITLE:Imaginary test person
+EMAIL;type=INTERNET;type=WORK;type=pref:johnDoe@example.org
+TEL;type=WORK;type=pref:+1 617 555 1212
+TEL;type=WORK:+1 (617) 555-1234
+TEL;type=CELL:+1 781 555 1212
+TEL;type=HOME:+1 202 555 1212
+item1.ADR;type=WORK:;;2 Enterprise Avenue;Worktown;NY;01111;USA
+item1.X-ABADR:us
+item2.ADR;type=HOME;type=pref:;;3 Acacia Avenue;Hoemtown;MA;02222;USA
+item2.X-ABADR:us
+NOTE:John Doe has a long and varied history\, being documented on more police files that anyone else. Reports of his death are alas numerous.
+item3.URL;type=pref:http\://www.example/com/doe
+item3.X-ABLabel:_$!<HomePage>!$_
+item4.URL:http\://www.example.com/Joe/foaf.df
+item4.X-ABLabel:FOAF
+item5.X-ABRELATEDNAMES;type=pref:Jane Doe
+item5.X-ABLabel:_$!<Friend>!$_
+CATEGORIES:Work,Test group
+X-ABUID:5AD380FD-B2DE-4261-BA99-DE1D1DB52FBE\:ABPerson
+END:VCARD
+----
+    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
+end
+
+describe Asciidoctor::Diagram::BarcodeBlockMacroProcessor do
+  BARCODES.each_pair do |type, code|
+    it "should support #{type}" do
+      doc = <<-eos
+= Hello, barby!
+Doc Writer <doc@example.com>
+
+== First Section
+
+#{type}::#{code}[xdim=1,margin=10,height=100,foreground=darkgray,background=azure]
+      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
+  end
+end
+
+describe Asciidoctor::Diagram::BarcodeInlineMacroProcessor do
+  BARCODES.each_pair do |type, code|
+    it "should support #{type}" do
+      doc = <<-eos
+= Hello, barby!
+Doc Writer <doc@example.com>
+
+== First Section
+
+#{type}:#{code}[xdim=1,margin=10,height=100,foreground=darkgray,background=azure]
+      eos
+
+      d = load_asciidoc doc
+      expect(d).to_not be_nil
+
+      b = d.find { |bl| bl.context == :paragraph }
+      expect(b).to_not be_nil
+
+      output = b.convert
+      img_match = /<img[^>]*>/.match(output)
+      expect(img_match).to_not be_nil
+      img = img_match.to_s
+
+      src_match = /src="([^"]*)"/.match(img)
+      expect(src_match).to_not be_nil
+      src = src_match[1]
+
+      expect(src).to_not be_nil
+      expect(src).to match(/\.png$/)
+      expect(File.exist?(src)).to be true
+
+      expect(/width="([^"]*)"/.match(img)).to_not be_nil
+      expect(/height="([^"]*)"/.match(img)).to_not be_nil
+    end
+  end
+end

data/spec/blockdiag_spec.rb

@@ -7,6 +7,10 @@ blockdiag {
 }
 eos
 
+describe Asciidoctor::Diagram::BlockDiagInlineMacroProcessor do
+  include_examples "inline_macro", :blockdiag, BLOCKDIAG_CODE, [:png, :svg, :pdf]
+end
+
 describe Asciidoctor::Diagram::BlockDiagBlockMacroProcessor do
   include_examples "block_macro", :blockdiag, BLOCKDIAG_CODE, [:png, :svg, :pdf]
 end

data/spec/bpmn_spec.rb

@@ -47,6 +47,10 @@ BPNM_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, BPNM_CODE, [:png, :svg, :pdf]
 end

data/spec/bytefield_spec.rb

@@ -83,6 +83,10 @@ BYTEFIELD_CODE = <<-eos
 (draw-bottom)
 eos
 
+describe Asciidoctor::Diagram::BytefieldInlineMacroProcessor do
+  include_examples "inline_macro", :bytefield, BYTEFIELD_CODE, [:svg]
+end
+
 describe Asciidoctor::Diagram::BytefieldBlockMacroProcessor do
   include_examples "block_macro", :bytefield, BYTEFIELD_CODE, [:svg]
 end

data/spec/diagrams_spec.rb

@@ -14,6 +14,10 @@ with Diagram("Grouped Workers", show=False, direction="TB"):
                   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

data/spec/ditaa_spec.rb

@@ -12,6 +12,10 @@ DITAA_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, DITAA_CODE, [:png, :svg]
 end

data/spec/dpic_spec.rb

@@ -10,6 +10,10 @@ G: box "$G(s)$"
   "$-\;$" below rjust
 eos
 
+describe Asciidoctor::Diagram::DpicInlineMacroProcessor, :broken_on_windows do
+  include_examples "inline_macro", :dpic, DPIC_CODE, [:svg]
+end
+
 describe Asciidoctor::Diagram::DpicBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :dpic, DPIC_CODE, [:svg]
 end

data/spec/erd_spec.rb

@@ -83,6 +83,10 @@ play        1--* play_player
 player      1--* play_player
 eos
 
+describe Asciidoctor::Diagram::ErdInlineMacroProcessor, :broken_on_windows do
+  include_examples "inline_macro", :erd, ERD_CODE, [:png, :svg]
+end
+
 describe Asciidoctor::Diagram::ErdBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :erd, ERD_CODE, [:png, :svg]
 end

data/spec/gnuplot_spec.rb

@@ -4,6 +4,10 @@ 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, GNUPLOT_CODE, [:png, :svg, :gif, :txt]
 end

data/spec/graphviz_py_spec.rb

@@ -0,0 +1,33 @@
+require_relative 'test_helper'
+
+GRAPHVIZ_PY_CODE = <<-eos
+graph python_graph {
+{{
+import math
+
+value = 0.5
+sin = math.sin(value)
+cos = math.cos(value)
+}}
+
+A [label="{{= value }}"];
+B [label="{{= sin }}"];
+C [label="{{= cos }}"];
+
+A -- B [headlabel="sin"];
+A -- C [headlabel="cos"];
+
+}
+eos
+
+describe Asciidoctor::Diagram::GraphvizPyInlineMacroProcessor, :broken_on_github do
+  include_examples "inline_macro", :graphviz_py, GRAPHVIZ_PY_CODE, [:png, :svg]
+end
+
+describe Asciidoctor::Diagram::GraphvizPyBlockMacroProcessor, :broken_on_github do
+  include_examples "block_macro", :graphviz_py, GRAPHVIZ_PY_CODE, [:png, :svg]
+end
+
+describe Asciidoctor::Diagram::GraphvizPyBlockProcessor, :broken_on_github do
+  include_examples "block", :graphviz_py, GRAPHVIZ_PY_CODE, [:png, :svg]
+end

data/spec/graphviz_spec.rb

@@ -11,6 +11,10 @@ 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, DOT_CODE, [:png, :svg]
 end

data/spec/lilypond_spec.rb

@@ -4,10 +4,14 @@ 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 do
+describe Asciidoctor::Diagram::LilypondInlineMacroProcessor, :broken_on_windows do
+  include_examples "inline_macro", :lilypond, LILYPOND_CODE, [:png]
+end
+
+describe Asciidoctor::Diagram::LilypondBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :lilypond, LILYPOND_CODE, [:png]
 end
 
-describe Asciidoctor::Diagram::LilypondBlockProcessor do
+describe Asciidoctor::Diagram::LilypondBlockProcessor, :broken_on_windows do
   include_examples "block", :lilypond, LILYPOND_CODE, [:png]
 end

data/spec/mermaid_spec.rb

@@ -8,6 +8,10 @@ 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, MERMAID_CODE, [:png, :svg]
 

data/spec/msc_spec.rb

@@ -24,10 +24,14 @@ msc {
 }
 eos
 
-describe Asciidoctor::Diagram::MscBlockMacroProcessor do
+describe Asciidoctor::Diagram::MscInlineMacroProcessor, :broken_on_windows do
+  include_examples "inline_macro", :msc, MSC_CODE, [:png, :svg]
+end
+
+describe Asciidoctor::Diagram::MscBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :msc, MSC_CODE, [:png, :svg]
 end
 
-describe Asciidoctor::Diagram::MscBlockProcessor do
+describe Asciidoctor::Diagram::MscBlockProcessor, :broken_on_windows do
   include_examples "block", :msc, MSC_CODE, [:png, :svg]
 end

data/spec/nomnoml_spec.rb

@@ -23,6 +23,10 @@ NOMNOML_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, NOMNOML_CODE, [:svg]
 end

data/spec/pikchr_spec.rb

@@ -42,6 +42,10 @@ 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::PikchrInlineMacroProcessor, :broken_on_windows do
+  include_examples "inline_macro", :pikchr, PIKCHR_CODE, [:svg]
+end
+
 describe Asciidoctor::Diagram::PikchrBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :pikchr, PIKCHR_CODE, [:svg]
 end