asciidoctor-diagram 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6929d068c82dc319a53dbcbc30da263e8356923fe2f92e6c4794f166c61b0252
-  data.tar.gz: 15b20dbe24d572cf174114d3e7cfa6146aa8bb7d46403de6c08284f6819d6e15
+  metadata.gz: 682b06be01eb9a3aa29f735c134fe97e813db674f3e7d4a76ae86dcc8241e826
+  data.tar.gz: fdf1252fc4f30c1ec56a64bb1928306f1b73341b81442c233111e1fdf8bbc038
 SHA512:
-  metadata.gz: 04bec237f4f0529bd12324a1794bb0cd863a82ec27b867572e0f14ff93dbbce4e1e553e48f43fe04fbf1c31cf9af6eaab4e5b7933fb6b820988eade9031653d4
-  data.tar.gz: 392c0d5e97b6527bb21019f146732a8028681362c5dc19c8c572b2dc06a2c1f528a06d9d3236e292c8166f9acca3be1892bcb35eb0591a3e1c4a40ce10ff9e06
+  metadata.gz: b0b928e103aef0f5123cd3a3810c210d28c626493bf536ec7e0ed4363e761df0c2fa23ec8a2a5bbb6c4cc748c2a66d13a846e2d5c06a9b38405d8c7ec0148569
+  data.tar.gz: 1387ead776db0d3df332fb585e99be44eb49245f1b32d8be5275034d0de6e9fb89e1085ca485a6336be9e190119e193d6bdebefe44dcfa51eacb277739ee8a91

data/CHANGELOG.adoc

@@ -1,5 +1,19 @@
 = Asciidoctor-diagram Changelog
 
+== 2.0.5
+
+Enhancements::
+
+  * Improve internal target path resolution logic
+  * TikZ diagrams can now add content to the LaTeX preamble by setting the `preamble` block attribute to `true`.
+    The preamble and diagram should be separated by a line consisting of `\~~~~`. (@colbyn)
+  * The `scale` attribute is now passed on to Mermaid. (@gustav-b)
+  * Issue #271: Launch UMLet directly using `java` instead of using the UMLet wrapper scripts or executables
+
+Bug Fixes::
+
+  * Issue #294: Treat the first positional parameter of diagram block macros as the desired output format rather than as the target.
+
 == 2.0.4
 
 Enhancements::

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -144,10 +144,9 @@ module Asciidoctor
 
       def create_image_block(parent, source, format, converter)
         image_name = "#{source.image_name}.#{format}"
-        image_dir = image_output_dir(parent)
-        cache_dir = cache_dir(source, parent)
-        image_file = parent.normalize_system_path image_name, image_dir
-        metadata_file = parent.normalize_system_path "#{image_name}.cache", cache_dir
+
+        image_file = parent.normalize_system_path(image_name, image_output_dir(parent))
+        metadata_file = parent.normalize_system_path("#{image_name}.cache", cache_dir(source, parent))
 
         if File.exist? metadata_file
           metadata = File.open(metadata_file, 'r') {|f| JSON.load(f, nil, :symbolize_names => true, :create_additions => false) }
@@ -185,7 +184,7 @@ module Asciidoctor
         end
 
         scale = image_attributes['scale']
-        if !converter.native_scaling? && scalematch = /(\d+(?:\.\d+))/.match(scale)
+        if !converter.native_scaling? && scalematch = /([0-9]+(?:\.[0-9]+)?)/.match(scale)
           scale_factor = scalematch[1].to_f
         else
           scale_factor = 1.0
@@ -244,11 +243,11 @@ module Asciidoctor
           node.set_attr('target', image_name)
 
           if source.global_attr('autoimagesdir')
-            output_base_dir = output_base_dir(parent)
-            if output_base_dir
-              imagesdir = Pathname.new(image_file).relative_path_from(output_base_dir).dirname.to_s
-              node.set_attr('imagesdir', imagesdir)
-            end
+            image_path = Pathname.new(image_file)
+            output_path = Pathname.new(parent.normalize_system_path(output_dir(parent)))
+
+            imagesdir = image_path.relative_path_from(output_path).dirname.to_s
+            node.set_attr('imagesdir', imagesdir)
           end
         end
 
@@ -265,25 +264,43 @@ module Asciidoctor
         end
       end
 
+      # Returns the image output directory as an absolute path
       def image_output_dir(parent)
-        images_dir = parent.attr('imagesoutdir', nil, true)
+        images_out_dir = parent.attr('imagesoutdir', nil, true)
 
-        if images_dir
-          base_dir = nil
+        if images_out_dir
+          resolve_path(parent, images_out_dir)
         else
-          base_dir = output_base_dir(parent)
           images_dir = parent.attr('imagesdir', nil, true)
+          output_dir = output_dir(parent)
+          resolve_path(parent, images_dir, output_dir)
         end
+      end
 
-        parent.normalize_system_path(images_dir, base_dir)
+      # Returns the cache directory as an absolute path
+      def cache_dir(source, parent)
+        cache_dir = source.global_attr('cachedir')
+        if cache_dir
+          resolve_path(parent, cache_dir)
+        else
+          output_dir = output_dir(parent)
+          resolve_path(parent, '.asciidoctor/diagram', output_dir)
+        end
       end
 
-      def output_base_dir(parent)
-        parent.normalize_system_path(parent.attr('outdir', nil, true) || doc_option(parent.document, :to_dir))
+      # Returns the general output directory for Asciidoctor as an absolute path
+      def output_dir(parent)
+        resolve_path(parent, parent.attr('outdir', nil, true) || doc_option(parent.document, :to_dir))
       end
 
-      def cache_dir(source, parent)
-        source.global_attr('cachedir') || parent.normalize_system_path('.asciidoctor/diagram', output_base_dir(parent))
+      def resolve_path(parent, path, base_dir = nil)
+        if path.nil?
+          # Resolve the base dir itself
+          parent.document.path_resolver.system_path(base_dir)
+        else
+          # Resolve the path with respect to the base dir
+          parent.document.path_resolver.system_path(path, base_dir)
+        end
       end
 
       def create_literal_block(parent, source, format, converter)
@@ -335,7 +352,7 @@ module Asciidoctor
       include DiagramProcessor
 
       def self.inherited(subclass)
-        subclass.name_positional_attributes ['target', 'format']
+        subclass.name_positional_attributes ['format']
       end
 
       def apply_target_subs(parent, target)

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

@@ -15,6 +15,10 @@ module Asciidoctor
         [:png, :svg]
       end
 
+      def native_scaling?
+        true
+      end
+
       def collect_options(source)
         options = {}
 
@@ -23,6 +27,10 @@ module Asciidoctor
         options[:seq_config] = source.attr(['sequenceconfig', 'sequence-config'])
         options[:width] = source.attr('width')
         options[:height] = source.attr('height')
+        options[:scale] = source.attr('scale')
+        if options[:scale]
+          raise "Mermaid only supports integer scale factors: #{options[:scale]}" unless options[:scale] =~ /^[0-9]+$/
+        end
         options[:theme] = source.attr('theme')
         options[:background] = source.attr('background')
         options[:config] = source.attr('config')
@@ -60,6 +68,7 @@ module Asciidoctor
         node = source.find_command('node', :raise_on_error => false)
         if mmdc && node
           opts[:height] = options[:height]
+          opts[:scale] = options[:scale]
           opts[:theme] = options[:theme]
           opts[:background] = options[:background]
           config = options[:config]
@@ -94,6 +103,10 @@ module Asciidoctor
             args << '--height' << options[:height]
           end
 
+          if options[:scale]
+            args << '--scale' << options[:scale]
+          end
+
           if options[:background]
             bg = options[:background]
             bg = "##{bg}" unless bg[0] == '#'

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

@@ -13,6 +13,11 @@ module Asciidoctor
         [:pdf, :svg]
       end
 
+      def collect_options(source)
+        {
+            :preamble => source.attr('preamble') == 'true'
+        }
+      end
 
       def convert(source, format, options)
         latexpath = source.find_command('pdflatex')
@@ -23,14 +28,28 @@ module Asciidoctor
           svgpath = nil
         end
 
+        if options[:preamble]
+          preamble, body = source.to_s.split(/^~~~~$/, 2)
+          unless body
+            body = preamble
+            preamble = ''
+          end
+        else
+          preamble = ''
+          body = source.to_s
+        end
+
         latex = <<'END'
 \documentclass[border=2bp, tikz]{standalone}
 \usepackage{tikz}
+END
+        latex << preamble
+        latex << <<'END'
 \begin{document}
 \begingroup
 \tikzset{every picture/.style={scale=1}}
 END
-        latex << source.to_s
+        latex << body
         latex << <<'END'
 \endgroup
 \end{document}

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

@@ -1,6 +1,7 @@
 require_relative '../diagram_converter'
 require_relative '../util/cli_generator'
 require_relative '../util/platform'
+require_relative '../util/java'
 
 module Asciidoctor
   module Diagram
@@ -15,8 +16,16 @@ module Asciidoctor
       end
 
       def convert(source, format, options)
-        generate_file(source.find_command('umlet'), 'uxf', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          [tool_path, '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"]
+        java = ::Asciidoctor::Diagram::Java.java
+
+        umlet = source.find_command('umlet')
+        ext = File.extname(umlet)
+        if ext == '' || ext != '.jar'
+          umlet = File.expand_path(File.basename(umlet, '.*') + '.jar', File.dirname(umlet))
+        end
+
+        generate_file(java, 'uxf', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          [tool_path, '-jar', Platform.native_path(umlet), '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"]
         end
       end
     end

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

@@ -88,6 +88,119 @@ module Asciidoctor
           raise "#{prefix_msg}: #{response[:reason]}"
         end
       end
+
+      def self.java
+        @java_exe ||= find_java
+        raise "Could not find Java executable" unless @java_exe
+        @java_exe
+      end
+
+      private
+      def self.find_java
+        case ::Asciidoctor::Diagram::Platform.os
+          when :windows
+            path_to(ENV['JAVA_HOME'], 'bin/java.exe') || registry_lookup || ::Asciidoctor::Diagram::Which.which('java')
+          when :macosx
+            path_to(ENV['JAVA_HOME'], 'bin/java') || path_to(::Asciidoctor::Diagram::Cli.run('/usr/libexec/java_home')[:out].strip, 'bin/java') || ::Asciidoctor::Diagram::Which.which('java')
+          else
+            path_to(ENV['JAVA_HOME'], 'bin/java') || ::Asciidoctor::Diagram::Which.which('java')
+        end
+      end
+
+      def self.path_to(java_home, java_binary)
+        exe_path = File.expand_path(java_binary, java_home)
+        if File.executable?(exe_path)
+          exe_path
+        else
+          nil
+        end
+      end
+
+      JDK_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit'
+      JRE_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment'
+
+      def self.registry_lookup
+        registry_current(JRE_KEY) || registry_current(JDK_KEY) || registry_any()
+      end
+
+      def self.registry_current(key)
+        current_version = registry_query(key, 'CurrentVersion')
+        if current_version
+          java_home = registry_query("#{key}\\#{current_version}", 'JavaHome')
+          java_exe(java_home)
+        else
+          nil
+        end
+      end
+
+      def self.registry_any()
+        java_homes = registry_query('HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft', 'JavaHome', :recursive => true).values
+        java_homes.map { |path| java_exe(path) }.find { |exe| !exe.nil? }
+      end
+
+      def self.java_exe(java_home)
+        java = File.expand_path('bin/java.exe', java_home)
+
+        if File.executable?(java)
+          java
+        else
+          nil
+        end
+      end
+
+      def self.registry_query(key, value = nil, opts = {})
+        args = ['reg', 'query']
+        args << key
+        args << '/v' << value unless value.nil?
+        args << '/s' if opts[:recursive]
+
+        begin
+          lines = ::Asciidoctor::Diagram::Cli.run(*args)[:out].lines.reject { |l| l.strip.empty? }.each
+        rescue
+          lines = [].each
+        end
+
+        result = {}
+
+        while true
+          begin
+            begin
+              k = lines.next
+            rescue StopIteration
+              break
+            end
+
+            unless k.start_with? key
+              next
+            end
+
+            v = nil
+            begin
+              v = lines.next.strip if lines.peek.start_with?(' ')
+            rescue StopIteration
+              break
+            end
+
+            if !k.valid_encoding? || (v && !v.valid_encoding?)
+              next
+            end
+
+            if v && (md = /([^\s]+)\s+(REG_[^\s]+)\s+(.+)/.match(v))
+              v_name = md[1]
+              v_value = md[3]
+              result["#{k}\\#{v_name}"] = v_value
+            else
+              result[k] = v
+            end
+          end
+        end
+
+        if value && !opts[:recursive]
+          result.values[0]
+        else
+          result
+        end
+      end
     end
   end
 end

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

@@ -41,11 +41,8 @@ module Asciidoctor
       end
 
       def self.instance
-        @java_exe ||= find_java
-        raise "Could not find Java executable" unless @java_exe
-
         unless defined?(@command_server) && @command_server
-          server = CommandServer.new(@java_exe, classpath)
+          server = CommandServer.new(java, classpath)
           @command_server = server
           at_exit do
             server.shutdown
@@ -63,113 +60,6 @@ module Asciidoctor
         format_request(req, svr.io)
         parse_response(svr.io)
       end
-
-      private
-      def self.find_java
-        case ::Asciidoctor::Diagram::Platform.os
-          when :windows
-            path_to(ENV['JAVA_HOME'], 'bin/java.exe') || registry_lookup || ::Asciidoctor::Diagram::Which.which('java')
-          when :macosx
-            path_to(ENV['JAVA_HOME'], 'bin/java') || path_to(::Asciidoctor::Diagram::Cli.run('/usr/libexec/java_home')[:out].strip, 'bin/java') || ::Asciidoctor::Diagram::Which.which('java')
-          else
-            path_to(ENV['JAVA_HOME'], 'bin/java') || ::Asciidoctor::Diagram::Which.which('java')
-        end
-      end
-
-      def self.path_to(java_home, java_binary)
-        exe_path = File.expand_path(java_binary, java_home)
-        if File.executable?(exe_path)
-          exe_path
-        else
-          nil
-        end
-      end
-
-      JDK_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit'
-      JRE_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment'
-
-      def self.registry_lookup
-        registry_current(JRE_KEY) || registry_current(JDK_KEY) || registry_any()
-      end
-
-      def self.registry_current(key)
-        current_version = registry_query(key, 'CurrentVersion')
-        if current_version
-          java_home = registry_query("#{key}\\#{current_version}", 'JavaHome')
-          java_exe(java_home)
-        else
-          nil
-        end
-      end
-
-      def self.registry_any()
-        java_homes = registry_query('HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft', 'JavaHome', :recursive => true).values
-        java_homes.map { |path| java_exe(path) }.find { |exe| !exe.nil? }
-      end
-
-      def self.java_exe(java_home)
-        java = File.expand_path('bin/java.exe', java_home)
-
-        if File.executable?(java)
-          java
-        else
-          nil
-        end
-      end
-
-      def self.registry_query(key, value = nil, opts = {})
-        args = ['reg', 'query']
-        args << key
-        args << '/v' << value unless value.nil?
-        args << '/s' if opts[:recursive]
-
-        begin
-          lines = ::Asciidoctor::Diagram::Cli.run(*args)[:out].lines.reject { |l| l.strip.empty? }.each
-        rescue
-          lines = [].each
-        end
-
-        result = {}
-
-        while true
-          begin
-            begin
-              k = lines.next
-            rescue StopIteration
-              break
-            end
-
-            unless k.start_with? key
-              next
-            end
-
-            v = nil
-            begin
-              v = lines.next.strip if lines.peek.start_with?(' ')
-            rescue StopIteration
-              break
-            end
-
-            if !k.valid_encoding? || (v && !v.valid_encoding?)
-              next
-            end
-
-            if v && (md = /([^\s]+)\s+(REG_[^\s]+)\s+(.+)/.match(v))
-              v_name = md[1]
-              v_value = md[3]
-              result["#{k}\\#{v_name}"] = v_value
-            else
-              result[k] = v
-            end
-          end
-        end
-
-        if value && !opts[:recursive]
-          result.values[0]
-        else
-          result
-        end
-      end
     end
   end
 end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.0.4"
+    VERSION = "2.0.5"
   end
 end

data/spec/mermaid_spec.rb

@@ -10,10 +10,6 @@ eos
 
 describe Asciidoctor::Diagram::MermaidBlockMacroProcessor do
   include_examples "block_macro", :mermaid, code, [:png, :svg]
-end
-
-describe Asciidoctor::Diagram::MermaidBlockProcessor do
-  include_examples "block", :mermaid, code, [:png, :svg]
 
   it "should respect the sequenceConfig attribute" do
     seq_diag = <<-eos
@@ -43,8 +39,8 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-mermaid::mermaid.txt["with_config", sequenceConfig="seqconfig.txt"]
-mermaid::mermaid.txt["without_config"]
+mermaid::mermaid.txt[target="with_config", sequenceConfig="seqconfig.txt"]
+mermaid::mermaid.txt[target="without_config"]
     eos
 
     load_asciidoc doc
@@ -69,8 +65,8 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-mermaid::mermaid.txt["with_width", width="700"]
-mermaid::mermaid.txt["without_width"]
+mermaid::mermaid.txt[target="with_width", width="700"]
+mermaid::mermaid.txt[target="without_width"]
     eos
 
     load_asciidoc doc
@@ -95,8 +91,8 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-mermaid::mermaid.txt["default", format="svg"]
-mermaid::mermaid.txt["dark", format="svg", theme="dark"]
+mermaid::mermaid.txt[target="default", format="svg"]
+mermaid::mermaid.txt[target="dark", format="svg", theme="dark"]
     eos
 
     load_asciidoc doc
@@ -127,8 +123,8 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-mermaid::mermaid.txt["with_config", puppeteerConfig="pptrconfig.txt"]
-mermaid::mermaid.txt["without_config"]
+mermaid::mermaid.txt[target="with_config", puppeteerConfig="pptrconfig.txt"]
+mermaid::mermaid.txt[target="without_config"]
     eos
 
     load_asciidoc doc
@@ -137,3 +133,25 @@ mermaid::mermaid.txt["without_config"]
     expect(File.size('with_config.png')).to be File.size('without_config.png')
   end
 end
+
+describe Asciidoctor::Diagram::MermaidBlockProcessor do
+  include_examples "block", :mermaid, code, [:png, :svg]
+
+  it "should report unsupported scaling factors" do
+    doc = <<-eos
+= Hello, Mermaid!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[mermaid, scale=1.5]
+----
+sequenceDiagram
+    Alice->>John: Hello John, how are you?
+    John-->>Alice: Great!
+----
+    eos
+
+    expect { load_asciidoc doc }.to raise_error(/support.*scale/i)
+  end
+end

data/spec/shared_examples.rb

@@ -12,7 +12,7 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-#{name}::#{name}.txt[format="#{format}"]
+#{name}::#{name}.txt[#{format}]
         eos
 
         d = load_asciidoc doc
@@ -35,7 +35,7 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-#{name}::#{name}.txt[format="#{format}"]
+#{name}::#{name}.txt[#{format}]
         eos
 
         d = load_asciidoc doc
@@ -165,8 +165,8 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-#{name}::#{name}.txt["foobar"]
-#{name}::#{name}.txt["foobaz"]
+#{name}::#{name}.txt[target="foobar"]
+#{name}::#{name}.txt[target="foobaz"]
     eos
 
     load_asciidoc doc
@@ -184,8 +184,8 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-#{name}::#{name}.txt["test/foobar"]
-#{name}::#{name}.txt["test2/foobaz"]
+#{name}::#{name}.txt[target="test/foobar"]
+#{name}::#{name}.txt[target="test2/foobaz"]
     eos
 
     load_asciidoc doc
@@ -415,6 +415,29 @@ Doc Writer <doc@example.com>
     expect(File.exist?(File.expand_path(target, 'foo'))).to be true
   end
 
+  it 'should write files to to_dir if set in safe mode' do
+    doc = <<-eos
+= Hello, #{name}!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[#{name}]
+----
+#{code}
+----
+    eos
+
+    to_dir = File.expand_path('foo')
+    d = load_asciidoc doc, {:to_dir => to_dir, :safe => :safe}
+    b = d.find { |bl| bl.context == :image }
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(File.exist?(target)).to be false
+    expect(File.exist?(File.expand_path(target, to_dir))).to be true
+  end
+
   it 'should write files to to_dir if set when embedded in table' do
     doc = <<-eos
 = Hello, #{name}!
@@ -466,6 +489,32 @@ Doc Writer <doc@example.com>
     expect(File.exist?(File.expand_path(target, 'foo'))).to be false
   end
 
+  it 'should write files to imagesoutdir if set in safe mode' do
+    doc = <<-eos
+= Hello, #{name}!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[#{name}]
+----
+#{code}
+----
+    eos
+
+    out_dir = File.expand_path('foo')
+    images_out_dir = File.expand_path('bar')
+
+    d = load_asciidoc doc, {:attributes => {'imagesoutdir' => images_out_dir, 'outdir' => out_dir}, :safe => :safe}
+    b = d.find { |bl| bl.context == :image }
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(File.exist?(target)).to be false
+    expect(File.exist?(File.expand_path(target, images_out_dir))).to be true
+    expect(File.exist?(File.expand_path(target, out_dir))).to be false
+  end
+
   it 'should omit width/height attributes when generating docbook' do
     doc = <<-eos
 = Hello, #{name}!
@@ -522,7 +571,7 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-[#{name}]
+[#{name}, target="unscaled"]
 ----
 #{code}
 ----
@@ -534,7 +583,7 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-[#{name}, scale="1.5"]
+[#{name}, scale="2", target="scaled"]
 ----
 #{code}
 ----
@@ -546,7 +595,9 @@ Doc Writer <doc@example.com>
     d = load_asciidoc scaled_doc, :attributes => {'backend' => 'html5'}
     scaled_image = d.find { |bl| bl.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)
+    unless formats[0] == :pdf
+      expect(scaled_image.attributes['width']).to be_within(1).of(unscaled_image.attributes['width'] * 2)
+      expect(scaled_image.attributes['height']).to be_within(1).of(unscaled_image.attributes['height'] * 2)
+    end
   end
 end

data/spec/tikz_spec.rb

@@ -104,4 +104,74 @@ end
 
 describe Asciidoctor::Diagram::TikZBlockProcessor, :broken_on_travis, :broken_on_windows do
   include_examples "block", :tikz, code, [:pdf]
+  
+  it "should support the preamble attribute" do
+      File.write("tikz.txt", code)
+
+      doc = <<'eos'
+= Hello, tikz!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[tikz, preamble="true"]
+----
+\usepackage{tkz-euclide}
+\usepackage{etoolbox}
+\usepackage{MnSymbol}
+\usetikzlibrary{angles,patterns,calc}
+\usepackage[most]{tcolorbox}
+\usepackage{pgfplots}
+\pgfplotsset{compat=1.7}
+~~~~
+\begin{tikzpicture}
+\tikzset{>=stealth}
+% draw axises and labels. We store a single coordinate to have the
+% direction of the x axis
+\draw[->] (-4,0) -- ++(8,0) coordinate (X) node[below] {$x$};
+\draw[->] (0,-4) -- ++(0,8) node[left] {$y$};
+
+\newcommand\CircleRadius{3cm}
+\draw (0,0) circle (\CircleRadius);
+% special method of noting the position of a point
+\coordinate (P) at (-495:\CircleRadius);
+
+\draw[thick]
+(0,0)
+coordinate (O) % store origin
+node[] {} % label
+--
+node[below left, pos=1] {$P(-\frac{\sqrt{2}}{2}, -\frac{\sqrt{2}}{2})$} % some labels
+node[below right, midway] {$r$}
+(P)
+--
+node[midway,left] {$y$}
+(P |- O) coordinate (Px) % projection onto horizontal line through
+                            % O, saved for later
+--
+node[midway, below] {$x$}
+cycle % closed path
+
+% pic trick is from the angles library, requires the three points of
+% the marked angle to be named
+
+pic [] {angle=X--O--P};
+\draw[->,red] (5mm, 0mm) arc (0:-495:5mm) node[midway,xshift=-4mm,yshift=3.5mm] {$-495^\circ$};
+% right angle marker
+\draw ($(Px)+(0.3, 0)$) -- ++(0, -0.3) -- ++(-0.3,0);
+\end{tikzpicture}
+----
+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
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation