asciidoctor-diagram 1.4.0 → 1.5.0

data/lib/asciidoctor-diagram/util/java.rb

@@ -6,7 +6,7 @@ module Asciidoctor
     module Java
       def self.classpath
         @classpath ||= [
-            File.expand_path(File.join('../..', 'asciidoctor-diagram-java-1.3.8.jar'), File.dirname(__FILE__))
+            File.expand_path(File.join('../..', 'asciidoctor-diagram-java-1.3.10.jar'), File.dirname(__FILE__))
         ]
       end
 

data/lib/asciidoctor-diagram/util/platform.rb

@@ -20,6 +20,17 @@ module Asciidoctor
         end
         )
       end
+
+      def self.native_path(path)
+        return path if path.nil?
+
+        case os
+          when :windows
+            path.to_s.gsub('/', '\\')
+          else
+            path.to_s
+        end
+      end
     end
   end
-end
+end

data/lib/asciidoctor-diagram/util/which.rb

@@ -12,24 +12,33 @@ module Asciidoctor
             return exe if File.executable? exe
           }
         end
+
         nil
       end
 
       def which(parent_block, cmd, options = {})
-        attr_names = options[:attr_names] || [cmd]
+        attr_names = options.fetch(:alt_attrs, []) + [cmd]
+        cmd_names = [cmd] + options.fetch(:alt_cmds, [])
 
         cmd_var = '@' + attr_names[0]
 
-        already_defined = instance_variable_defined?(cmd_var)
-
-        if already_defined
+        if instance_variable_defined?(cmd_var)
           cmd_path = instance_variable_get(cmd_var)
         else
-          cmd_path = attr_names.map { |attr_name| parent_block.document.attributes[attr_name] }.find { |attr| !attr.nil? }
-          cmd_path = ::Asciidoctor::Diagram::Which.which(cmd, :path => options[:path]) unless cmd_path && File.executable?(cmd_path)
+          cmd_path = attr_names.map { |attr_name| parent_block.attr(attr_name, nil, true) }.find { |attr| !attr.nil? }
+
+          unless cmd_path && File.executable?(cmd_path)
+            cmd_paths = cmd_names.map do |c|
+              ::Asciidoctor::Diagram::Which.which(c, :path => options[:path])
+            end
+
+            cmd_path = cmd_paths.reject { |c| c.nil? }.first
+          end
+
           instance_variable_set(cmd_var, cmd_path)
+
           if cmd_path.nil? && options.fetch(:raise_on_error, true)
-            raise "Could not find the '#{cmd}' executable in PATH; add it to the PATH or specify its location using the '#{attr_names[0]}' document attribute"
+            raise "Could not find the #{cmd_names.map { |c| "'#{c}'" }.join(', ')} executable in PATH; add it to the PATH or specify its location using the '#{attr_names[0]}' document attribute"
           end
         end
 

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end

data/lib/asciidoctor-diagram/wavedrom.rb

@@ -1,5 +1,4 @@
-require 'asciidoctor/extensions'
-require_relative 'version'
+require_relative 'extensions'
 
 Asciidoctor::Extensions.register do
   require_relative 'wavedrom/extension'

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

@@ -11,28 +11,32 @@ module Asciidoctor
 
       def self.included(mod)
         [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |c, p|
-            wavedrom_cli = which(p, 'wavedrom', :raise_on_error => false)
-            phantomjs = which(p, 'phantomjs', :raise_on_error => false)
+          mod.register_format(f, :image) do |parent, source|
+            wavedrom(parent, source, f)
+          end
+        end
+      end
 
-            if wavedrom_cli && phantomjs
-              CliGenerator.generate_file(wavedrom_cli, f.to_s, c.to_s) do |tool_path, input_path, output_path|
-                [phantomjs, tool_path, '-i', input_path, "-#{f.to_s[0]}", output_path]
-              end
-            else
-              if ::Asciidoctor::Diagram::Platform.os == :macosx
-                wavedrom = which(p, 'WaveDromEditor.app', :attr_names => ['wavedrom'], :path => ['/Applications'])
-                if wavedrom
-                  wavedrom = File.join(wavedrom, 'Contents/MacOS/nwjs')
-                end
-              else
-                wavedrom = which(p, 'WaveDromEditor', :attr_names => ['wavedrom'])
-              end
+      def wavedrom(parent, source, format)
+        wavedrom_cli = which(parent, 'wavedrom', :raise_on_error => false)
+        phantomjs = which(parent, 'phantomjs', :alt_attrs => ['phantomjs_2'], :raise_on_error => false)
 
-              CliGenerator.generate_file(wavedrom, f.to_s, c.to_s) do |tool_path, input_path, output_path|
-                [tool_path, 'source', input_path, f.to_s, output_path]
-              end
+        if wavedrom_cli && !wavedrom_cli.include?('WaveDromEditor') && phantomjs
+          CliGenerator.generate_file(wavedrom_cli, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+            [phantomjs, Platform.native_path(tool_path), '-i', Platform.native_path(input_path), "-#{format.to_s[0]}", Platform.native_path(output_path)]
+          end
+        else
+          if ::Asciidoctor::Diagram::Platform.os == :macosx
+            wavedrom = which(parent, 'WaveDromEditor.app', :alt_attrs => ['wavedrom'], :path => ['/Applications'])
+            if wavedrom
+              wavedrom = File.join(wavedrom, 'Contents/MacOS/nwjs')
             end
+          else
+            wavedrom = which(parent, 'WaveDromEditor', :alt_attrs => ['wavedrom'])
+          end
+
+          CliGenerator.generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+            [tool_path, 'source', Platform.native_path(input_path), format.to_s, Platform.native_path(output_path)]
           end
         end
       end
@@ -46,4 +50,4 @@ module Asciidoctor
       include Wavedrom
     end
   end
-end
+end

data/spec/blockdiag_spec.rb

@@ -20,7 +20,7 @@ Doc Writer <doc@example.com>
 blockdiag::blockdiag.txt[format="png"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -52,7 +52,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -82,7 +82,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -111,7 +111,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
+    expect { load_asciidoc doc }.to raise_error /support.*format/i
   end
 
   it "should not regenerate images when source has not changed" do
@@ -131,7 +131,7 @@ blockdiag::blockdiag.txt
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     b = d.find { |b| b.context == :image }
     expect(b).to_not be_nil
     target = b.attributes['target']
@@ -139,7 +139,7 @@ blockdiag::blockdiag.txt
 
     sleep 1
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
 
     mtime2 = File.mtime(target)
 
@@ -159,7 +159,7 @@ blockdiag::blockdiag.txt[]
 blockdiag::blockdiag.txt[]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('blockdiag.png')).to be true
   end
 
@@ -176,7 +176,7 @@ blockdiag::blockdiag.txt["foobar"]
 blockdiag::blockdiag.txt["foobaz"]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('foobar.png')).to be true
     expect(File.exists?('foobaz.png')).to be true
     expect(File.exists?('blockdiag.png')).to be false

data/spec/ditaa_spec.rb

@@ -25,7 +25,7 @@ Doc Writer <doc@example.com>
 ditaa::ditaa.txt[format="png"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -65,7 +65,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -94,7 +94,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
+    expect { load_asciidoc doc }.to raise_error /support.*format/i
   end
 
   it "should use a default format when none was given" do
@@ -109,7 +109,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -142,7 +142,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -173,14 +173,14 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc.sub('{opts}', 'shadow=false'))
+    d = load_asciidoc(doc.sub('{opts}', 'shadow=false'))
     b = d.find { |b| b.context == :image }
     target = b.attributes['target']
     mtime1 = File.mtime(target)
 
     sleep 1
 
-    d = Asciidoctor.load StringIO.new(doc.sub('{opts}', 'round-corners=true'))
+    d = load_asciidoc(doc.sub('{opts}', 'round-corners=true'))
 
     mtime2 = File.mtime(target)
 

data/spec/graphviz_spec.rb

@@ -24,7 +24,7 @@ Doc Writer <doc@example.com>
 graphviz::graphviz.txt[format="png"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -63,7 +63,7 @@ digraph foo {
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -100,7 +100,7 @@ digraph foo {
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -129,23 +129,23 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
+    expect { load_asciidoc doc }.to raise_error /support.*format/i
   end
 
-  it "should support single line digraphs" do
+  it "should support neato layout engine" do
     doc = <<-eos
 = Hello, graphviz!
 Doc Writer <doc@example.com>
 
 == First Section
 
-[graphviz]
+[graphviz, layout=neato]
 ----
 digraph g { rankdir=LR; Text->Graphviz->Image }
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }

data/spec/meme_spec.rb

@@ -16,7 +16,7 @@ Doc Writer <doc@example.com>
 meme::man.jpg[I don't always // write unit tests, but when I do // they generate memes, format=png, options=noupcase]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -48,7 +48,7 @@ Doc Writer <doc@example.com>
 meme::man.jpg[I don't always // write unit tests, but when I do // they generate memes, format=gif, options=noupcase]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }

data/spec/mermaid_spec.rb

@@ -21,7 +21,7 @@ Doc Writer <doc@example.com>
 mermaid::mermaid.txt[format="png"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -50,7 +50,7 @@ Doc Writer <doc@example.com>
 mermaid::mermaid.txt[format="svg"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -82,7 +82,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -112,7 +112,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -141,7 +141,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
+    expect { load_asciidoc doc }.to raise_error /support.*format/i
   end
 
   it "should not regenerate images when source has not changed" do
@@ -161,7 +161,7 @@ mermaid::mermaid.txt
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     b = d.find { |b| b.context == :image }
     expect(b).to_not be_nil
     target = b.attributes['target']
@@ -169,7 +169,7 @@ mermaid::mermaid.txt
 
     sleep 1
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
 
     mtime2 = File.mtime(target)
 
@@ -189,7 +189,7 @@ mermaid::mermaid.txt[]
 mermaid::mermaid.txt[]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('mermaid.png')).to be true
   end
 
@@ -206,7 +206,7 @@ mermaid::mermaid.txt["foobar"]
 mermaid::mermaid.txt["foobaz"]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('foobar.png')).to be true
     expect(File.exists?('foobaz.png')).to be true
     expect(File.exists?('mermaid.png')).to be false
@@ -244,7 +244,7 @@ mermaid::mermaid.txt["with_config", sequenceConfig="seqconfig.txt"]
 mermaid::mermaid.txt["without_config"]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('with_config.png')).to be true
     expect(File.exists?('without_config.png')).to be true
     expect(File.size('with_config.png')).to_not be File.size('without_config.png')
@@ -269,7 +269,7 @@ mermaid::mermaid.txt["with_width", width="700"]
 mermaid::mermaid.txt["without_width"]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('with_width.png')).to be true
     expect(File.exists?('without_width.png')).to be true
     expect(File.size('with_width.png')).to_not be File.size('without_width.png')

data/spec/plantuml_spec.rb

@@ -20,7 +20,7 @@ Doc Writer <doc@example.com>
 plantuml::plantuml.txt[format="png"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -36,6 +36,72 @@ plantuml::plantuml.txt[format="png"]
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
   end
+
+  it 'should support substitutions' do
+    code = <<-eos
+class {parent-class}
+class {child-class}
+{parent-class} <|-- {child-class}
+    eos
+
+    File.write('plantuml.txt', code)
+
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+:parent-class: ParentClass
+:child-class: ChildClass
+
+== First Section
+
+plantuml::plantuml.txt[format="svg", subs=attributes+]
+    eos
+
+    d = load_asciidoc doc, :attributes => {'backend' => 'html5'}
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    target = b.attributes['target']
+    expect(File.exists?(target)).to be true
+
+    content = File.read(target)
+    expect(content).to include('ParentClass')
+    expect(content).to include('ChildClass')
+  end
+
+  it 'should resolve !include directives with relative paths' do
+    included = <<-eos
+interface List
+List : int size()
+List : void clear()
+    eos
+
+    code = <<-eos
+!include list.iuml
+List <|.. ArrayList
+    eos
+
+    Dir.mkdir('dir')
+    File.write('dir/list.iuml', included)
+    File.write('dir/plantuml.txt', code)
+
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+:parent-class: ParentClass
+:child-class: ChildClass
+
+== First Section
+
+plantuml::dir/plantuml.txt[format="png", subs=attributes+]
+    eos
+
+    load_asciidoc doc, :attributes => {'backend' => 'html5'}
+
+    # No easy way to assert this since PlantUML doesn't produce an error on file not found
+  end
 end
 
 describe Asciidoctor::Diagram::PlantUmlBlockProcessor do
@@ -55,7 +121,7 @@ User --> (Use the application) : Label
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -88,7 +154,7 @@ User --> (Use the application) : Label
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -121,7 +187,7 @@ User --> (Use the application) : Label
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :literal }
@@ -132,7 +198,7 @@ User --> (Use the application) : Label
     expect(b.attributes['target']).to be_nil
   end
 
-  it "should raise an error when when format is set to an invalid value" do
+  it 'should raise an error when when format is set to an invalid value' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -144,10 +210,10 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
+    expect { load_asciidoc doc }.to raise_error /support.*format/i
   end
 
-  it "should use plantuml configuration when specified as a document attribute" do
+  it 'should use plantuml configuration when specified as a document attribute' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -171,7 +237,7 @@ ArrowColor #DEADBE
       f.write config
     end
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     b = d.find { |b| b.context == :image }
 
     target = b.attributes['target']
@@ -182,7 +248,7 @@ ArrowColor #DEADBE
     expect(svg).to match /<path.*fill="#DEADBE"/
   end
 
-  it "should not regenerate images when source has not changed" do
+  it 'should not regenerate images when source has not changed' do
     code = <<-eos
 User -> (Start)
 User --> (Use the application) : Label
@@ -208,21 +274,21 @@ Foo1 -> Foo2 : To boundary
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     b = d.find { |b| b.context == :image }
     target = b.attributes['target']
     mtime1 = File.mtime(target)
 
     sleep 1
 
-    d = Asciidoctor.load StringIO.new(doc)
+    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
+  it 'should handle two block macros with the same source' do
     code = <<-eos
 User -> (Start)
 User --> (Use the application) : Label
@@ -242,11 +308,11 @@ plantuml::plantuml.txt[]
 plantuml::plantuml.txt[]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('plantuml.png')).to be true
   end
 
-  it "should respect target attribute in block macros" do
+  it 'should respect target attribute in block macros' do
     code = <<-eos
 User -> (Start)
 User --> (Use the application) : Label
@@ -266,13 +332,13 @@ plantuml::plantuml.txt["foobar"]
 plantuml::plantuml.txt["foobaz"]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('foobar.png')).to be true
     expect(File.exists?('foobaz.png')).to be true
     expect(File.exists?('plantuml.png')).to be false
   end
 
-  it "should respect target attribute values with relative paths in block macros" do
+  it 'should respect target attribute values with relative paths in block macros' do
     code = <<-eos
 User -> (Start)
 User --> (Use the application) : Label
@@ -292,13 +358,13 @@ plantuml::plantuml.txt["test/foobar"]
 plantuml::plantuml.txt["test2/foobaz"]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('test/foobar.png')).to be true
     expect(File.exists?('test2/foobaz.png')).to be true
     expect(File.exists?('plantuml.png')).to be false
   end
 
-  it "should write files to outdir if set" do
+  it 'should write files to outdir if set' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -313,7 +379,7 @@ Foo1 -> Foo2 : To boundary
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc), {:attributes => {'outdir' => 'foo'}}
+    d = load_asciidoc doc, {:attributes => {'outdir' => 'foo'}}
     b = d.find { |b| b.context == :image }
 
     target = b.attributes['target']
@@ -322,7 +388,7 @@ Foo1 -> Foo2 : To boundary
     expect(File.exists?(File.expand_path(target, 'foo'))).to be true
   end
 
-  it "should write files to imagesoutdir if set" do
+  it 'should write files to imagesoutdir if set' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -337,7 +403,7 @@ Foo1 -> Foo2 : To boundary
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc), {:attributes => {'imagesoutdir' => 'bar', 'outdir' => 'foo'}}
+    d = load_asciidoc doc, {:attributes => {'imagesoutdir' => 'bar', 'outdir' => 'foo'}}
     b = d.find { |b| b.context == :image }
 
     target = b.attributes['target']
@@ -347,7 +413,7 @@ Foo1 -> Foo2 : To boundary
     expect(File.exists?(File.expand_path(target, 'foo'))).to be false
   end
 
-  it "should omit width/height attributes when generating docbook" do
+  it 'should omit width/height attributes when generating docbook' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -360,7 +426,7 @@ User -> (Start)
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5'}
+    d = load_asciidoc doc, :attributes => {'backend' => 'docbook5'}
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -373,7 +439,7 @@ User -> (Start)
     expect(b.attributes['height']).to be_nil
   end
 
-  it "should support salt diagrams using salt block type" do
+  it 'should support salt diagrams using salt block type' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -395,7 +461,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5'}
+    d = load_asciidoc doc, :attributes => {'backend' => 'docbook5'}
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -408,7 +474,7 @@ Doc Writer <doc@example.com>
     expect(b.attributes['height']).to be_nil
   end
 
-  it "should support salt diagrams using plantuml block type" do
+  it 'should support salt diagrams using plantuml block type' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -431,7 +497,7 @@ salt
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5'}
+    d = load_asciidoc doc, :attributes => {'backend' => 'docbook5'}
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -444,7 +510,7 @@ salt
     expect(b.attributes['height']).to be_nil
   end
 
-  it "should support salt diagrams containing tree widgets" do
+  it 'should support salt diagrams containing tree widgets' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -463,7 +529,7 @@ salt
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5'}
+    d = load_asciidoc doc, :attributes => {'backend' => 'docbook5'}
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -476,7 +542,7 @@ salt
     expect(b.attributes['height']).to be_nil
   end
 
-  it "should support scaling diagrams" do
+  it 'should support scaling diagrams' do
     doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -501,17 +567,17 @@ A -> B
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'html5'}
+    d = load_asciidoc doc, :attributes => {'backend' => 'html5'}
     unscaled_image = d.find { |b| b.context == :image }
 
-    d = Asciidoctor.load StringIO.new(scaled_doc), :attributes => {'backend' => 'html5'}
+    d = load_asciidoc scaled_doc, :attributes => {'backend' => 'html5'}
     scaled_image = d.find { |b| b.context == :image }
 
     expect(scaled_image.attributes['width']).to be_within(1).of(unscaled_image.attributes['width'] * 1.5)
     expect(scaled_image.attributes['height']).to be_within(1).of(unscaled_image.attributes['height'] * 1.5)
   end
 
-  it "should handle embedded creole images correctly" do
+  it 'should handle embedded creole images correctly' do
     creole_doc = <<-eos
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
@@ -533,8 +599,64 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    Asciidoctor.load StringIO.new(creole_doc), :attributes => {'backend' => 'html5'}
+    load_asciidoc creole_doc, :attributes => {'backend' => 'html5'}
 
     # No real way to assert this since PlantUML doesn't produce an error on file not found
   end
+
+  it 'should resolve !include directives with relative paths' do
+    included = <<-eos
+interface List
+List : int size()
+List : void clear()
+    eos
+
+    Dir.mkdir('dir')
+    File.write('dir/list.iuml', included)
+
+    creole_doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="png"]
+----
+!include dir/List.iuml
+List <|.. ArrayList
+----
+    eos
+
+    load_asciidoc creole_doc, :attributes => {'backend' => 'html5'}
+
+    # No easy way to assert this since PlantUML doesn't produce an error on file not found
+  end
+
+  it 'should support substitutions' do
+    doc = <<-eos
+= Hello, PlantUML!
+:parent-class: ParentClass
+:child-class: ChildClass
+
+[plantuml,class-inheritence,svg,subs=attributes+]
+....
+class {parent-class}
+class {child-class}
+{parent-class} <|-- {child-class}
+....
+    eos
+
+    d = load_asciidoc doc, :attributes => {'backend' => 'html5'}
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    target = b.attributes['target']
+    expect(File.exists?(target)).to be true
+
+    content = File.read(target)
+    expect(content).to include('ParentClass')
+    expect(content).to include('ChildClass')
+  end
 end