asciidoctor-diagram 1.5.19 → 2.0.0

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

@@ -0,0 +1,25 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SvgbobConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+
+      def convert(source, format, options)
+        generate_stdin(source.find_command('svgbob'), format.to_s, source.to_s) do |tool_path, output_path|
+          [tool_path, '-o', Platform.native_path(output_path)]
+        end
+      end
+    end
+  end
+end

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

@@ -1,36 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Svgbob
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            svgbob(parent, source, f)
-          end
-        end
-      end
-
-      def svgbob(parent, source, format)
-        generate_stdin(which(parent, 'svgbob'), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, '-o', Platform.native_path(output_path)]
-        end
-      end
-    end
-
-    class SvgBobBlockProcessor < Extensions::DiagramBlockProcessor
-      include Svgbob
+    class SvgBobBlockProcessor < DiagramBlockProcessor
+      use_converter SvgbobConverter
     end
 
-    class SvgBobBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Svgbob
+    class SvgBobBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SvgbobConverter
     end
   end
 end

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

@@ -0,0 +1,55 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SyntraxConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+      def collect_options(source, name)
+        {
+            :heading => source.attr('heading', nil, name),
+            :scale => source.attr('scale', nil, name),
+            :transparent => source.attr('transparent', nil, name),
+            :style => source.attr('style', nil, name)
+        }
+      end
+
+
+      def convert(source, format, options)
+        generate_file(source.find_command('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 = options[:heading]
+          if title
+            args << '--title' << title
+          end
+
+          scale = options[:scale]
+          if scale
+            args << '--scale' << scale
+          end
+
+          transparent = options[:transparent]
+          if transparent == 'true'
+            args << '--transparent'
+          end
+          style = options[:style]
+          if style
+            args << '--style' << style
+          end
+
+          args
+        end
+      end
+    end
+  end
+end

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, 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
-
-    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/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.14.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+')
         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