asciidoctor-diagram 1.5.18 → 2.0.4

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

@@ -1,59 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative '../diagram_processor'
+require_relative 'converter'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Syntrax
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            syntrax(parent, source, f)
-          end
-        end
-      end
-
-      def syntrax(parent, source, format)
-        inherit_prefix = name
-
-        generate_file(which(parent, 'syntrax'), 'spec', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          args = [tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)]
-
-          title = source.attr('heading', nil, inherit_prefix)
-          if title
-            args << '--title' << title
-          end
-
-          scale = source.attr('scale', nil, inherit_prefix)
-          if scale
-            args << '--scale' << scale
-          end
-
-          transparent = source.attr('transparent', nil, inherit_prefix)
-          if transparent == 'true'
-            args << '--transparent'
-          end
-          style = source.attr('style', nil, inherit_prefix)
-          if style
-            args << '--style' << style
-          end
-
-          args
-        end
-      end
-    end
-
-    class SyntraxBlockProcessor < Extensions::DiagramBlockProcessor
-      include Syntrax
+    class SyntraxBlockProcessor < DiagramBlockProcessor
+      use_converter SyntraxConverter
     end
 
-    class SyntraxBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Syntrax
+    class SyntraxBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SyntraxConverter
     end
   end
 end

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

@@ -0,0 +1,56 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class TikZConverter
+      include DiagramConverter
+      include CliGenerator
+
+      def supported_formats
+        [:pdf, :svg]
+      end
+
+
+      def convert(source, format, options)
+        latexpath = source.find_command('pdflatex')
+
+        if format == :svg
+          svgpath = source.find_command('pdf2svg')
+        else
+          svgpath = nil
+        end
+
+        latex = <<'END'
+\documentclass[border=2bp, tikz]{standalone}
+\usepackage{tikz}
+\begin{document}
+\begingroup
+\tikzset{every picture/.style={scale=1}}
+END
+        latex << source.to_s
+        latex << <<'END'
+\endgroup
+\end{document}
+END
+
+        pdf = generate_file(latexpath, 'tex', 'pdf', latex) do |tool_path, input_path, output_path|
+          {
+              :args => [tool_path, '-shell-escape', '-file-line-error', '-interaction=nonstopmode', '-output-directory', Platform.native_path(File.dirname(output_path)), Platform.native_path(input_path)],
+              :out_file => "#{File.dirname(input_path)}/#{File.basename(input_path, '.*')}.pdf"
+          }
+        end
+
+        if svgpath
+          generate_file(svgpath, 'pdf', 'svg', pdf) do |tool_path, input_path, output_path|
+            [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
+          end
+        else
+          pdf
+        end
+      end
+    end
+  end
+end

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

@@ -1,68 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative '../diagram_processor'
+require_relative 'converter'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module TikZ
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:pdf, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            tikz(parent, source, f)
-          end
-        end
-      end
-
-      def tikz(parent, source, format)
-        latexpath = which(parent, 'pdflatex')
-
-        if format == :svg
-          svgpath = which(parent, 'pdf2svg')
-        else
-          svgpath = nil
-        end
-
-        latex = <<'END'
-\documentclass[border=2bp]{standalone}
-\usepackage{tikz}
-\begin{document}
-\begingroup
-\tikzset{every picture/.style={scale=1}}
-END
-        latex << source.to_s
-        latex << <<'END'
-\endgroup
-\end{document}
-END
-
-        pdf = generate_file(latexpath, 'tex', 'pdf', latex) do |tool_path, input_path, output_path|
-          {
-              :args => [tool_path, '-shell-escape', '-file-line-error', '-interaction=nonstopmode', '-output-directory', Platform.native_path(File.dirname(output_path)), Platform.native_path(input_path)],
-              :out_file => "#{File.dirname(input_path)}/#{File.basename(input_path, '.*')}.pdf"
-          }
-        end
-
-        if svgpath
-          generate_file(svgpath, 'pdf', 'svg', pdf) do |tool_path, input_path, output_path|
-            [tool_path, Platform.native_path(File.dirname(input_path)), Platform.native_path(File.dirname(output_path))]
-          end
-        else
-          pdf
-        end
-      end
-    end
-
-    class TikZBlockProcessor < Extensions::DiagramBlockProcessor
-      include TikZ
+    class TikZBlockProcessor < DiagramBlockProcessor
+      use_converter TikZConverter
     end
 
-    class TikZBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include TikZ
+    class TikZBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter TikZConverter
     end
   end
 end

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

@@ -0,0 +1,24 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class UmletConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg, :png, :pdf, :gif]
+      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)}"]
+        end
+      end
+    end
+  end
+end

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

@@ -1,36 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative '../diagram_processor'
+require_relative 'converter'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Umlet
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg, :png, :pdf, :gif].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            umlet(parent, source, f)
-          end
-        end
-      end
-
-      def umlet(parent, source, format)
-        generate_file(which(parent, '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)}"]
-        end
-      end
-    end
-
-    class UmletBlockProcessor < Extensions::DiagramBlockProcessor
-      include Umlet
+    class UmletBlockProcessor < DiagramBlockProcessor
+      use_converter UmletConverter
     end
 
-    class UmletBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Umlet
+    class UmletBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter UmletConverter
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Asciidoctor
         require_relative 'java'
 
         def self.run(*args)
-          opts = args.pop if args.last.is_a? Hash
+          opts = args.pop.dup if args.last.is_a? Hash
           in_data = opts && opts[:stdin_data]
 
           pb = java.lang.ProcessBuilder.new(*args)
@@ -61,12 +61,23 @@ module Asciidoctor
         require 'open3'
 
         def self.run(*args)
-          stdout, stderr, status = Open3.capture3(*args)
+          if Hash === args.last
+            opts = args.pop.dup
+          else
+            opts = {}
+          end
+
+          # When the first argument is an array, we force capture3 (or better the underlying Kernel#spawn)
+          # to use a non-shell execution variant.
+          cmd = File.basename(args[0])
+          args[0] = [args[0], cmd]
+
+          stdout, stderr, status = Open3.capture3(*args, opts)
 
           exit = status.exitstatus
 
           if exit != 0
-            raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
+            raise "#{cmd} failed: #{stdout.empty? ? stderr : stdout}"
           end
 
           {

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

@@ -1,3 +1,4 @@
+require 'asciidoctor/logging'
 require 'tempfile'
 require_relative 'cli'
 
@@ -5,6 +6,8 @@ module Asciidoctor
   module Diagram
     # @private
     module CliGenerator
+      include Asciidoctor::Logging
+
       def generate_stdin(tool, format, code)
         tool_name = File.basename(tool)
 
@@ -26,7 +29,7 @@ module Asciidoctor
         else
           opts = [tool]
         end
-        generate(opts, :stdout, :stdin_data => code)
+        generate(opts, :stdout, :stdin_data => code, :binmode => true)
       end
 
       def generate_file(tool, input_ext, output_ext, code)
@@ -51,6 +54,20 @@ module Asciidoctor
         end
       end
 
+      def generate_file_stdout(tool, input_ext, code)
+        tool_name = File.basename(tool)
+
+        source_file = Tempfile.new([tool_name, ".#{input_ext}"])
+        begin
+          File.write(source_file.path, code)
+
+          opts = yield tool, source_file.path
+          generate(opts, :stdout)
+        ensure
+          source_file.unlink
+        end
+      end
+
       private
       def generate(opts, target_file, open3_opts = {})
         case opts
@@ -64,6 +81,7 @@ module Asciidoctor
             raise "Block passed to generate_file should return an Array or a Hash"
         end
 
+        logger.debug "Executing #{args} with options #{open3_opts}"
         result = ::Asciidoctor::Diagram::Cli.run(*args, open3_opts)
 
         data = target_file == :stdout ? result[:out] : read_result(target_file, out_file)

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

@@ -7,14 +7,14 @@ module Asciidoctor
       GIF87A_SIGNATURE = 'GIF87a'.force_encoding(Encoding::ASCII_8BIT)
       GIF89A_SIGNATURE = 'GIF89a'.force_encoding(Encoding::ASCII_8BIT)
 
-      def self.get_image_size(data)
+      def self.post_process_image(data)
         bio = BinaryIO.new(data)
         gif_signature = bio.read_string(6)
         raise "Invalid GIF signature" unless gif_signature == GIF87A_SIGNATURE || gif_signature == GIF89A_SIGNATURE
 
         width = bio.read_uint16_le
         height = bio.read_uint16_le
-        [width, height]
+        [data, width, height]
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Asciidoctor
     module Java
       def self.classpath
         @classpath ||= [
-            File.expand_path(File.join('../..', 'server-1.3.13.jar'), File.dirname(__FILE__))
+            File.expand_path(File.join('../..', 'server-1.3.15.jar'), File.dirname(__FILE__))
         ]
       end
 

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

@@ -9,28 +9,25 @@ module Asciidoctor
     # @private
     module Java
       class CommandServer
-        attr_reader :port
-
         def initialize(java, classpath)
           args = []
           args << '-Djava.awt.headless=true'
           args << '-Djava.net.useSystemProxies=true'
           args << '-cp'
           args << classpath.flatten.map { |jar| ::Asciidoctor::Diagram::Platform.host_os_path(jar).strip }.join(::Asciidoctor::Diagram::Platform.host_os_path_separator)
-          args << 'org.asciidoctor.diagram.CommandServer'
+          args << 'org.asciidoctor.diagram.StdInOutCommandServer'
 
-          @server = IO.popen([java, *args])
-          @port = @server.readline.strip.to_i
-          @client = TCPSocket.new 'localhost', port
+          @server = IO.popen([java, *args], 'r+b')
         end
 
         def io
-          @client
+          @server
         end
 
         def shutdown
           # KILL is a bit heavy handed, but TERM does not seem to shut down the JVM on Windows.
           Process.kill('KILL', @server.pid)
+          @server.close
         end
       end
 
@@ -60,8 +57,9 @@ module Asciidoctor
 
       def self.send_request(req)
         svr = instance
-        headers = req[:headers] ||= {}
-        headers['Host'] = "localhost:#{svr.port}"
+        req[:headers] ||= {}
+        # headers = req[:headers] ||= {}
+        # headers['Host'] = "localhost:#{svr.port}"
         format_request(req, svr.io)
         parse_response(svr.io)
       end

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

@@ -2,8 +2,8 @@ module Asciidoctor
   module Diagram
     # @private
     module PDF
-      def self.get_image_size(_)
-        nil
+      def self.post_process_image(data)
+        [data, nil, nil]
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Asciidoctor
     module PNG
       PNG_SIGNATURE = [137, 80, 78, 71, 13, 10, 26, 10].pack('CCCCCCCC')
 
-      def self.get_image_size(data)
+      def self.post_process_image(data)
         bio = BinaryIO.new(data)
         png_signature = bio.read_string(8)
         raise "Invalid PNG signature" unless png_signature == PNG_SIGNATURE
@@ -18,7 +18,7 @@ module Asciidoctor
 
         width = bio.read_uint32_be
         height = bio.read_uint32_be
-        [width, height]
+        [data, width, height]
       end
     end
   end