asciidoctor-diagram 1.5.5 → 1.5.6

data/spec/shaape_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-describe Asciidoctor::Diagram::ShaapeBlockMacroProcessor, :broken_on_osx do
+describe Asciidoctor::Diagram::ShaapeBlockMacroProcessor, :broken_on_osx, :broken_on_appveyor do
   it "should generate PNG images when format is set to 'png'" do
     code = <<-eos
     +--------+    +-------------+
@@ -40,7 +40,7 @@ shaape::shaape.txt[format="png"]
   end
 end
 
-describe Asciidoctor::Diagram::ShaapeBlockProcessor, :broken_on_osx do
+describe Asciidoctor::Diagram::ShaapeBlockProcessor, :broken_on_osx, :broken_on_appveyor do
   it "should generate PNG images when format is set to 'png'" do
     doc = <<-eos
 = Hello, Shaape!

data/spec/svgbob_spec.rb

@@ -0,0 +1,167 @@
+require_relative 'test_helper'
+
+code = <<-eos
+                      .--.            .---.  .---. .---.  .---.    .---.  .---. 
+                      |  |   OS API   '---'  '---' '---'  '---'    '---'  '---' 
+                      v  |              |      |     |      |        |      |   
+             .-. .-. .-. |              v      v     |      v        |      v   
+         .-->'-' '-' '-' |            .------------. | .-----------. |  .-----. 
+         |     \\  |  /   |            | Filesystem | | | Scheduler | |  | MMU | 
+         |      v . v    |            '------------' | '-----------' |  '-----' 
+         '_______/ \\_____|                   |       |      |        |          
+                 \\ /                         v       |      |        v          
+                  |     ____              .----.     |      |    .---------.    
+                  '--> /___/              | IO |<----'      |    | Network |    
+                                          '----'            |    '---------'    
+                                             |              |         |         
+                                             v              v         v         
+                                      .---------------------------------------. 
+                                      |                  HAL                  | 
+                                      '---------------------------------------'
+eos
+
+describe Asciidoctor::Diagram::SvgBobBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    File.write('svgbob.txt', code)
+
+    doc = <<-eos
+= Hello, SvgBob!
+Doc Writer <doc@example.com>
+
+== First Section
+
+svgbob::svgbob.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::SvgBobBlockProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, SvgBob!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[svgbob, 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, SvgBob!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[svgbob, 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('svgbob.txt', code)
+
+    doc = <<-eos
+= Hello, SvgBob!
+Doc Writer <doc@example.com>
+
+== First Section
+
+svgbob::svgbob.txt
+
+[svgbob]
+----
+#{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('svgbob.txt', code)
+
+    doc = <<-eos
+= Hello, SvgBob!
+Doc Writer <doc@example.com>
+
+== First Section
+
+svgbob::svgbob.txt[]
+svgbob::svgbob.txt[]
+    eos
+
+    load_asciidoc doc
+    expect(File.exist?('svgbob.svg')).to be true
+  end
+
+  it "should respect target attribute in block macros" do
+    File.write('svgbob.txt', code)
+
+    doc = <<-eos
+= Hello, SvgBob!
+Doc Writer <doc@example.com>
+
+== First Section
+
+svgbob::svgbob.txt["foobar"]
+svgbob::svgbob.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?('svgbob.svg')).to be false
+  end
+end

data/spec/syntrax_spec.rb

@@ -0,0 +1,228 @@
+require_relative 'test_helper'
+
+describe Asciidoctor::Diagram::SyntraxBlockMacroProcessor, :broken_on_appveyor do
+  it "should generate PNG images when format is set to 'png'" do
+    code = <<-eos
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+    eos
+
+    File.write('syntrax.txt', code)
+
+    doc = <<-eos
+= Hello, Syntrax!
+Doc Writer <doc@example.com>
+
+== First Section
+
+syntrax::syntrax.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
+end
+
+describe Asciidoctor::Diagram::SyntraxBlockProcessor, :broken_on_appveyor do
+  it "should generate PNG images when format is set to 'png'" do
+    doc = <<-eos
+= Hello, Syntrax!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[syntrax, format="png"]
+----
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+----
+    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, Syntrax!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[syntrax, format="svg"]
+----
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+----
+    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, Syntrax!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[syntrax, 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
+    code = <<-eos
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+    eos
+
+    File.write('syntrax.txt', code)
+
+    doc = <<-eos
+= Hello, Syntrax!
+Doc Writer <doc@example.com>
+
+== First Section
+
+syntrax::syntrax.txt
+
+[syntrax, format="png"]
+----
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+----
+    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
+    code = <<-eos
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+    eos
+
+    File.write('syntrax.txt', code)
+
+    doc = <<-eos
+= Hello, Syntrax!
+Doc Writer <doc@example.com>
+
+== First Section
+
+syntrax::syntrax.txt[]
+syntrax::syntrax.txt[]
+    eos
+
+    load_asciidoc doc
+    expect(File.exist?('syntrax.png')).to be true
+  end
+
+  it "should respect target attribute in block macros" do
+    code = <<-eos
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+    eos
+
+    File.write('syntrax.txt', code)
+
+    doc = <<-eos
+= Hello, Syntrax!
+Doc Writer <doc@example.com>
+
+== First Section
+
+syntrax::syntrax.txt["foobar"]
+syntrax::syntrax.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?('syntrax.png')).to be false
+  end
+end

data/spec/test_helper.rb

@@ -12,8 +12,11 @@ require_relative '../lib/asciidoctor-diagram/erd/extension'
 require_relative '../lib/asciidoctor-diagram/graphviz/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/plantuml/extension'
 require_relative '../lib/asciidoctor-diagram/shaape/extension'
+require_relative '../lib/asciidoctor-diagram/svgbob/extension'
+require_relative '../lib/asciidoctor-diagram/syntrax/extension'
 require_relative '../lib/asciidoctor-diagram/umlet/extension'
 require_relative '../lib/asciidoctor-diagram/wavedrom/extension'
 
@@ -83,6 +86,10 @@ RSpec.configure do |c|
     c.filter_run_excluding :broken_on_travis => true
   end
 
+  if ENV['APPVEYOR']
+    c.filter_run_excluding :broken_on_appveyor => true
+  end
+
   TEST_DIR = File.expand_path('testing')
 
   c.before(:suite) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,11 +98,17 @@ files:
 - lib/asciidoctor-diagram/meme/extension.rb
 - lib/asciidoctor-diagram/mermaid.rb
 - lib/asciidoctor-diagram/mermaid/extension.rb
+- lib/asciidoctor-diagram/msc.rb
+- lib/asciidoctor-diagram/msc/extension.rb
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
 - lib/asciidoctor-diagram/salt.rb
 - lib/asciidoctor-diagram/shaape.rb
 - lib/asciidoctor-diagram/shaape/extension.rb
+- lib/asciidoctor-diagram/svgbob.rb
+- lib/asciidoctor-diagram/svgbob/extension.rb
+- lib/asciidoctor-diagram/syntrax.rb
+- lib/asciidoctor-diagram/syntrax/extension.rb
 - lib/asciidoctor-diagram/umlet.rb
 - lib/asciidoctor-diagram/umlet/extension.rb
 - lib/asciidoctor-diagram/util/binaryio.rb
@@ -134,8 +140,11 @@ files:
 - spec/man.jpg
 - spec/meme_spec.rb
 - spec/mermaid_spec.rb
+- spec/msc_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
+- spec/svgbob_spec.rb
+- spec/syntrax_spec.rb
 - spec/test_helper.rb
 - spec/umlet_spec.rb
 - spec/wavedrom_spec.rb
@@ -172,8 +181,11 @@ test_files:
 - spec/man.jpg
 - spec/meme_spec.rb
 - spec/mermaid_spec.rb
+- spec/msc_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
+- spec/svgbob_spec.rb
+- spec/syntrax_spec.rb
 - spec/test_helper.rb
 - spec/umlet_spec.rb
 - spec/wavedrom_spec.rb