asciidoctor-diagram 1.4.0 → 1.5.0

data/lib/asciidoctor-diagram/meme.rb

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

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

@@ -12,87 +12,90 @@ module Asciidoctor
 
       def self.included(mod)
         [:png, :gif].each do |format|
-          mod.register_format(format, :image) do |c, p|
-            convert = which(p, 'convert')
-            identify = which(p, 'identify')
-
-            attrs = c.attributes
-            bg_img = attrs["background"]
-            raise "background attribute is required" unless bg_img
-
-            bg_img = p.normalize_system_path(bg_img, p.document.attr('imagesdir'))
-
-            top_label = attrs["top"]
-            bottom_label = attrs["bottom"]
-            fill_color = attrs.fetch('fillColor', 'white')
-            stroke_color = attrs.fetch('strokeColor', 'black')
-            stroke_width = attrs.fetch('strokeWidth', '2')
-            font = attrs.fetch('font', 'Impact')
-            options = attrs.fetch('options', '').split(',')
-            noupcase = options.include?('noupcase')
-
-            dimensions = CliGenerator.run_cli(identify, '-format', '%w %h', bg_img).match /(?<w>\d+) (?<h>\d+)/
-            bg_width = dimensions['w'].to_i
-            bg_height = dimensions['h'].to_i
-            label_width = bg_width
-            label_height = bg_height / 5
-
-            if top_label
-              top_img = Tempfile.new(['meme', '.png'])
-              CliGenerator.run_cli(
-                  convert,
-                  '-background', 'none',
-                  '-fill', fill_color,
-                  '-stroke', stroke_color,
-                  '-strokewidth', stroke_width,
-                  '-font', font,
-                  '-size', "#{label_width}x#{label_height}",
-                  '-gravity', 'north',
-                  "label:#{prepare_label(top_label, noupcase)}",
-                  top_img.path
-              )
-            else
-              top_img = nil
-            end
-
-            if bottom_label
-              bottom_img = Tempfile.new(['meme', '.png'])
-              CliGenerator.run_cli(
-                  convert,
-                  '-background', 'none',
-                  '-fill', fill_color,
-                  '-stroke', stroke_color,
-                  '-strokewidth', stroke_width,
-                  '-font', font,
-                  '-size', "#{label_width}x#{label_height}",
-                  '-gravity', 'south',
-                  "label:#{prepare_label(bottom_label, noupcase)}",
-                  bottom_img.path
-              )
-            else
-              bottom_img = nil
-            end
-
-            final_img = Tempfile.new(['meme', ".#{format.to_s}"])
-
-            args = [convert, bg_img]
-            if top_img
-              args << top_img.path << '-geometry'<< '+0+0' << '-composite'
-            end
-
-            if bottom_img
-              args << bottom_img.path << '-geometry'<< "+0+#{bg_height - label_height}" << '-composite'
-            end
-
-            args << final_img.path
-
-            CliGenerator.run_cli(*args)
-
-            File.binread(final_img)
+          mod.register_format(format, :image) do |parent, source|
+            meme(parent, source, format)
           end
         end
       end
 
+      def meme(p, c, format)
+        convert = which(p, 'convert')
+        identify = which(p, 'identify')
+
+        bg_img = c.attr('background')
+        raise "background attribute is required" unless bg_img
+
+        bg_img = p.normalize_system_path(bg_img, p.attr('imagesdir'))
+
+        top_label = c.attr('top')
+        bottom_label = c.attr('bottom')
+        fill_color = c.attr('fillColor', 'white')
+        stroke_color = c.attr('strokeColor', 'black')
+        stroke_width = c.attr('strokeWidth', '2')
+        font = c.attr('font', 'Impact')
+        options = c.attr('options', '').split(',')
+        noupcase = options.include?('noupcase')
+
+        dimensions = CliGenerator.run_cli(identify, '-format', '%w %h', bg_img).match /(?<w>\d+) (?<h>\d+)/
+        bg_width = dimensions['w'].to_i
+        bg_height = dimensions['h'].to_i
+        label_width = bg_width
+        label_height = bg_height / 5
+
+        if top_label
+          top_img = Tempfile.new(['meme', '.png'])
+          CliGenerator.run_cli(
+              convert,
+              '-background', 'none',
+              '-fill', fill_color,
+              '-stroke', stroke_color,
+              '-strokewidth', stroke_width,
+              '-font', font,
+              '-size', "#{label_width}x#{label_height}",
+              '-gravity', 'north',
+              "label:#{prepare_label(top_label, noupcase)}",
+              top_img.path
+          )
+        else
+          top_img = nil
+        end
+
+        if bottom_label
+          bottom_img = Tempfile.new(['meme', '.png'])
+          CliGenerator.run_cli(
+              convert,
+              '-background', 'none',
+              '-fill', fill_color,
+              '-stroke', stroke_color,
+              '-strokewidth', stroke_width,
+              '-font', font,
+              '-size', "#{label_width}x#{label_height}",
+              '-gravity', 'south',
+              "label:#{prepare_label(bottom_label, noupcase)}",
+              bottom_img.path
+          )
+        else
+          bottom_img = nil
+        end
+
+        final_img = Tempfile.new(['meme', ".#{format.to_s}"])
+
+        args = [convert, bg_img]
+        if top_img
+          args << top_img.path << '-geometry'<< '+0+0' << '-composite'
+        end
+
+        if bottom_img
+          args << bottom_img.path << '-geometry'<< "+0+#{bg_height - label_height}" << '-composite'
+        end
+
+        args << final_img.path
+
+        CliGenerator.run_cli(*args)
+
+        File.binread(final_img)
+      end
+
       private
       def prepare_label(label, noupcase)
         label = label.upcase unless noupcase
@@ -109,8 +112,8 @@ module Asciidoctor
       def create_source(parent, target, attributes)
         attributes = attributes.dup
         attributes['background'] = target
-        ::Asciidoctor::Diagram::Extensions::FileSource.new(nil, attributes)
+        ::Asciidoctor::Diagram::Extensions::FileSource.new(parent, nil, attributes)
       end
     end
   end
-end
+end

data/lib/asciidoctor-diagram/mermaid.rb

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

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

@@ -1,5 +1,6 @@
 require_relative '../extensions'
 require_relative '../util/cli_generator'
+require_relative '../util/platform'
 require_relative '../util/which'
 
 module Asciidoctor
@@ -10,38 +11,45 @@ module Asciidoctor
 
       def self.included(mod)
         [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |c, p|
-            mermaid = which(p, 'mermaid')
-
-            seq_config = c.attributes['sequenceConfig'] || p.attr('sequenceConfig')
-            if seq_config
-              seq_config = p.normalize_system_path(seq_config, p.document.base_dir)
-            end
+          mod.register_format(f, :image) do |parent, source|
+            mermaid(parent, source, f)
+          end
+        end
+      end
 
-            width = c.attributes['width']
+      def mermaid(parent, source, format)
+        mermaid = which(parent, 'mermaid')
+        @is_mermaid_v6 ||= `#{mermaid} --version`.split('.')[0].to_i >= 6
+        # Mermaid >= 6.0.0 requires PhantomJS 2.1; older version required 1.9
+        phantomjs = which(parent, 'phantomjs', :alt_attrs => [@is_mermaid_v6 ? 'phantomjs_2' : 'phantomjs_19'])
 
-            CliGenerator.generate_file(mermaid, f.to_s, c.to_s) do |tool_path, input_path, output_path|
-              output_dir = File.dirname(output_path)
-              output_file = File.expand_path(File.basename(input_path) + ".#{f.to_s}", output_dir)
+        seq_config = source.attr('sequenceConfig', nil, true)
+        if seq_config
+          seq_config = parent.normalize_system_path(seq_config, source.base_dir)
+        end
 
-              args = [tool_path, "--#{f.to_s}", '-o', output_dir]
+        width = source.attr('width')
 
-              if seq_config
-                args << '--sequenceConfig' << seq_config
-              end
+        CliGenerator.generate_file(mermaid, 'mmd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          output_dir = File.dirname(output_path)
+          output_file = File.expand_path(File.basename(input_path) + ".#{format.to_s}", output_dir)
 
-              if width
-                args << '--width' << width
-              end
+          args = [tool_path, '--phantomPath', Platform.native_path(phantomjs), "--#{format.to_s}", '-o', Platform.native_path(output_dir)]
 
-              args << input_path
+          if seq_config
+            args << '--sequenceConfig' << Platform.native_path(seq_config)
+          end
 
-              {
-                  :args => args,
-                  :out_file => output_file
-              }
-            end
+          if width
+            args << '--width' << width
           end
+
+          args << Platform.native_path(input_path)
+
+          {
+              :args => args,
+              :out_file => output_file
+          }
         end
       end
     end
@@ -54,4 +62,4 @@ module Asciidoctor
       include Mermaid
     end
   end
-end
+end

data/lib/asciidoctor-diagram/plantuml.rb

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

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

@@ -14,21 +14,21 @@ module Asciidoctor
       end
       Java.classpath.concat JARS
 
-      def plantuml(parent, code, tag, mime_type)
+      def plantuml(parent, source, tag, mime_type)
         Java.load
 
-        code = preprocess_code(parent, code, tag)
+        code = preprocess_code(parent, source, tag)
 
         headers = {
             'Accept' => mime_type
         }
 
-        config_file = parent.document.attributes['plantumlconfig']
+        config_file = parent.attr('plantumlconfig', nil, true)
         if config_file
-          headers['X-PlantUML-Config'] = File.expand_path(config_file, parent.document.attributes['docdir'])
+          headers['X-PlantUML-Config'] = File.expand_path(config_file, parent.attr('docdir', nil, true))
         end
 
-        dot = which(parent, 'dot', :attr_names => ['dot', 'graphvizdot'], :raise_on_error => false)
+        dot = which(parent, 'dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
         if dot
           headers['X-Graphviz'] = dot
         end
@@ -46,34 +46,45 @@ module Asciidoctor
         response[:body]
       end
 
-      def preprocess_code(parent, code, tag)
+      def preprocess_code(parent, source, tag)
+        code = source.to_s
+        base_dir = source.base_dir
+
         code = "@start#{tag}\n#{code}\n@end#{tag}" unless code.index "@start#{tag}"
 
         code.gsub!(/(?<=<img:)[^>]+(?=>)/) do |match|
-          if match =~ URI.regexp
-            uri = URI.parse(match)
-            if uri.scheme == 'file'
-              parent.normalize_system_path(uri.path, parent.attr('imagesdir'))
-            else
-              parent.normalize_web_path(match)
-            end
-          else
-            parent.normalize_system_path(match, parent.attr('imagesdir'))
-          end
+          resolve_path(match, parent, parent.attr('imagesdir'))
+        end
+
+        code.gsub!(/(?<=!include )[^!\n\r]+/) do |match|
+          resolve_path(match, parent, base_dir)
         end
 
         code
       end
 
+      def resolve_path(path, parent, base_dir)
+        if path =~ URI.regexp
+          uri = URI.parse(path)
+          if uri.scheme == 'file'
+            parent.normalize_system_path(uri.path, base_dir)
+          else
+            parent.normalize_web_path(path)
+          end
+        else
+          parent.normalize_system_path(path, base_dir)
+        end
+      end
+
       def self.included(mod)
-        mod.register_format(:png, :image) do |c, p|
-          plantuml(p, c.to_s, mod.tag, 'image/png')
+        mod.register_format(:png, :image) do |parent, source|
+          plantuml(parent, source, mod.tag, 'image/png')
         end
-        mod.register_format(:svg, :image) do |c, p|
-          plantuml(p, c.to_s, mod.tag, 'image/svg+xml')
+        mod.register_format(:svg, :image) do |parent, source|
+          plantuml(parent, source, mod.tag, 'image/svg+xml')
         end
-        mod.register_format(:txt, :literal) do |c, p|
-          plantuml(p, c.to_s, mod.tag, 'text/plain;charset=utf-8')
+        mod.register_format(:txt, :literal) do |parent, source|
+          plantuml(parent, source, mod.tag, 'text/plain;charset=utf-8')
         end
       end
     end

data/lib/asciidoctor-diagram/salt.rb

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

data/lib/asciidoctor-diagram/shaape.rb

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

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

@@ -1,5 +1,6 @@
 require_relative '../extensions'
 require_relative '../util/cli_generator'
+require_relative '../util/platform'
 require_relative '../util/which'
 
 module Asciidoctor
@@ -10,13 +11,17 @@ module Asciidoctor
 
       def self.included(mod)
         [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |c, p|
-            CliGenerator.generate_stdin(which(p, 'shaape'), f.to_s, c.to_s) do |tool_path, output_path|
-              [tool_path, '-o', output_path, '-t', f.to_s, '-']
-            end
+          mod.register_format(f, :image) do |parent, source|
+            shaape(parent, source, f)
           end
         end
       end
+
+      def shaape(parent, source, format)
+        CliGenerator.generate_stdin(which(parent, 'shaape'), format.to_s, source.to_s) do |tool_path, output_path|
+          [tool_path, '-o', Platform.native_path(output_path), '-t', format.to_s, '-']
+        end
+      end
     end
 
     class ShaapeBlockProcessor < Extensions::DiagramBlockProcessor
@@ -27,4 +32,4 @@ module Asciidoctor
       include Shaape
     end
   end
-end
+end

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

@@ -20,14 +20,14 @@ module Asciidoctor
         end
       end
 
-      def self.generate_file(tool, format, code)
+      def self.generate_file(tool, input_ext, output_ext, code)
         tool_name = File.basename(tool)
 
-        source_file = Tempfile.new([tool_name, ".#{format}"])
+        source_file = Tempfile.new([tool_name, ".#{input_ext}"])
         begin
           File.write(source_file.path, code)
 
-          target_file = Tempfile.new([tool_name, ".#{format}"])
+          target_file = Tempfile.new([tool_name, ".#{output_ext}"])
           begin
             target_file.close
 
@@ -54,7 +54,9 @@ module Asciidoctor
             raise "Block passed to generate_file should return an Array or a Hash"
         end
 
-        run_cli(*args, open3_opts)
+        output = run_cli(*args, open3_opts)
+
+        raise "#{args[0]} failed: #{output}" unless File.exist?(out_file || target_file.path)
 
         if out_file
           File.rename(out_file, target_file.path)
@@ -70,7 +72,7 @@ module Asciidoctor
           raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
         end
 
-        stdout
+        stdout.empty? ? stderr : stdout
       end
     end
   end