asciidoctor-diagram 1.2.0 → 2.0.0

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

@@ -0,0 +1,14 @@
+require_relative '../diagram_processor'
+require_relative 'converter'
+
+module Asciidoctor
+  module Diagram
+    class SyntraxBlockProcessor < DiagramBlockProcessor
+      use_converter SyntraxConverter
+    end
+
+    class SyntraxBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SyntraxConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/syntrax.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'syntrax/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::SyntraxBlockProcessor, :syntrax
+  block_macro Asciidoctor::Diagram::SyntraxBlockMacroProcessor, :syntrax
+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

@@ -0,0 +1,14 @@
+require_relative '../diagram_processor'
+require_relative 'converter'
+
+module Asciidoctor
+  module Diagram
+    class TikZBlockProcessor < DiagramBlockProcessor
+      use_converter TikZConverter
+    end
+
+    class TikZBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter TikZConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/tikz.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'tikz/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::TikZBlockProcessor, :tikz
+  block_macro Asciidoctor::Diagram::TikZBlockMacroProcessor, :tikz
+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

@@ -0,0 +1,14 @@
+require_relative '../diagram_processor'
+require_relative 'converter'
+
+module Asciidoctor
+  module Diagram
+    class UmletBlockProcessor < DiagramBlockProcessor
+      use_converter UmletConverter
+    end
+
+    class UmletBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter UmletConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/umlet.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'umlet/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::UmletBlockProcessor, :umlet
+  block_macro Asciidoctor::Diagram::UmletBlockMacroProcessor, :umlet
+end

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

@@ -1,17 +1,37 @@
 module Asciidoctor
   module Diagram
+    # Helper class to read binary values from a String
+    # @private
     class BinaryIO
       def initialize(string)
         @data = string
         @offset = 0
       end
 
+      def read_uint16_be
+        uint16 = @data[@offset,2].unpack('n')[0]
+        @offset += 2
+        uint16
+      end
+
+      def read_uint16_le
+        uint16 = @data[@offset,2].unpack('v')[0]
+        @offset += 2
+        uint16
+      end
+
       def read_uint32_be
         uint32 = @data[@offset,4].unpack('N')[0]
         @offset += 4
         uint32
       end
 
+      def read_uint32_le
+        uint32 = @data[@offset,4].unpack('V')[0]
+        @offset += 4
+        uint32
+      end
+
       def read_string(length, encoding = Encoding::ASCII_8BIT)
         str = @data[@offset,length]
         @offset += length

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

@@ -0,0 +1,81 @@
+module Asciidoctor
+  module Diagram
+    # @private
+    module Cli
+      if RUBY_PLATFORM == "java"
+        # Workaround for https://github.com/jruby/jruby/issues/5565
+        #   Kernel.spawn (and as a consequence Open3.capture3 which uses it)
+        #   is not reliable on all versions of JRuby.
+        require_relative 'java'
+
+        def self.run(*args)
+          opts = args.pop if args.last.is_a? Hash
+          in_data = opts && opts[:stdin_data]
+
+          pb = java.lang.ProcessBuilder.new(*args)
+          p = pb.start
+
+          stdout = ""
+          out_reader = start_stream_reader(p.getInputStream, stdout)
+          stderr = ""
+          err_reader = start_stream_reader(p.getErrorStream, stderr)
+
+          if in_data
+            p.getOutputStream.write(in_data.to_java_bytes)
+            p.getOutputStream.close
+          end
+
+          p.waitFor
+
+          out_reader.join
+          err_reader.join
+
+          status = p.exitValue
+
+          if status != 0
+            raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
+          end
+
+          {
+              :out => stdout,
+              :err => stderr,
+              :status => status
+          }
+        end
+
+        private
+        def self.start_stream_reader(in_stream, out_string)
+          Thread.new {
+            buffer = ::Java::byte[4096].new
+            while (bytes_read = in_stream.read(buffer)) != -1
+              if bytes_read < buffer.length
+                str = String.from_java_bytes(java.util.Arrays.copyOf(buffer, bytes_read))
+              else
+                str = String.from_java_bytes(buffer)
+              end
+              out_string << str
+            end
+          }
+        end
+      else
+        require 'open3'
+
+        def self.run(*args)
+          stdout, stderr, status = Open3.capture3(*args)
+
+          exit = status.exitstatus
+
+          if exit != 0
+            raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
+          end
+
+          {
+              :out => stdout,
+              :err => stderr,
+              :status => exit
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -1,38 +1,89 @@
 require 'tempfile'
-
-require_relative '../util/java'
-require_relative '../util/which'
+require_relative 'cli'
 
 module Asciidoctor
   module Diagram
+    # @private
     module CliGenerator
-      def self.generate(tool, parent, code)
-        tool_var = '@' + tool
-
-        tool_path = instance_variable_get(tool_var)
-        unless tool_path
-          tool_path = parent.document.attributes[tool]
-          tool_path = ::Asciidoctor::Diagram.which(tool) unless tool_path && File.executable?(tool_path)
-          raise "Could not find the '#{tool}' executable in PATH; add it to the PATH or specify its location using the 'shaape' document attribute" unless tool_path
-          instance_variable_set(tool_var, tool_path)
-        end
+      def generate_stdin(tool, format, code)
+        tool_name = File.basename(tool)
 
-        target_file = Tempfile.new(tool)
+        target_file = Tempfile.new([tool_name, ".#{format}"])
         begin
           target_file.close
 
-          args = yield tool_path, target_file.path
+          opts = yield tool, target_file.path
 
-          IO.popen(args, "w") do |io|
-            io.write code
-          end
-          result_code = $?
+          generate(opts, target_file.path, :stdin_data => code)
+        ensure
+          target_file.unlink
+        end
+      end
 
-          raise "#{tool} image generation failed" unless result_code == 0
+      def generate_stdin_stdout(tool, code)
+        if block_given?
+          opts = yield tool
+        else
+          opts = [tool]
+        end
+        generate(opts, :stdout, :stdin_data => code)
+      end
+
+      def generate_file(tool, input_ext, output_ext, code)
+        tool_name = File.basename(tool)
+
+        source_file = Tempfile.new([tool_name, ".#{input_ext}"])
+        begin
+          File.write(source_file.path, code)
 
-          File.read(target_file.path)
+          target_file = Tempfile.new([tool_name, ".#{output_ext}"])
+          begin
+            target_file.close
+
+            opts = yield tool, source_file.path, target_file.path
+
+            generate(opts, target_file.path)
+          ensure
+            target_file.unlink
+          end
         ensure
-          target_file.unlink
+          source_file.unlink
+        end
+      end
+
+      private
+      def generate(opts, target_file, open3_opts = {})
+        case opts
+          when Array
+            args = opts
+            out_file = nil
+          when Hash
+            args = opts[:args]
+            out_file = opts[:out_file]
+          else
+            raise "Block passed to generate_file should return an Array or a Hash"
+        end
+
+        result = ::Asciidoctor::Diagram::Cli.run(*args, open3_opts)
+
+        data = target_file == :stdout ? result[:out] : read_result(target_file, out_file)
+
+        if data.empty?
+          raise "#{args[0]} failed: #{result[:out].empty? ? result[:err] : result[:out]}"
+        end
+
+        data
+      end
+
+      def read_result(target_file, out_file = nil)
+        if File.exist?(out_file || target_file)
+          if out_file
+            File.rename(out_file, target_file)
+          end
+
+          File.binread(target_file)
+        else
+          ''
         end
       end
     end

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

@@ -0,0 +1,21 @@
+require_relative 'binaryio'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    module GIF
+      GIF87A_SIGNATURE = 'GIF87a'.force_encoding(Encoding::ASCII_8BIT)
+      GIF89A_SIGNATURE = 'GIF89a'.force_encoding(Encoding::ASCII_8BIT)
+
+      def self.get_image_size(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]
+      end
+    end
+  end
+end

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

@@ -1,5 +1,99 @@
+require 'json'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    module Java
+      def self.classpath
+        @classpath ||= [
+            File.expand_path(File.join('../..', 'server-1.3.14.jar'), File.dirname(__FILE__))
+        ]
+      end
+
+      CRLF = "\r\n".encode(Encoding::US_ASCII)
+
+      def self.format_request(req, io)
+        io.set_encoding Encoding::US_ASCII
+        io.write "POST #{req[:url]} HTTP/1.1"
+        io.write CRLF
+
+        headers = req[:headers]
+        if headers
+          headers.each_pair do |key, value|
+            io.write "#{key}: #{value}"
+            io.write CRLF
+          end
+        end
+
+        if req[:body]
+          unless headers && headers['Content-Length']
+            io.write 'Content-Length: '
+            io.write req[:body].bytesize.to_s
+            io.write CRLF
+          end
+
+          unless headers && headers['Content-Type']
+            io.write 'Content-Type: text/plain; charset='
+            io.write req[:body].encoding.name
+            io.write CRLF
+          end
+        end
+
+        io.write CRLF
+
+        io.set_encoding Encoding::BINARY
+        io.write req[:body]
+      end
+
+      STATUS_LINE = Regexp.new("HTTP/1.1 (\\d+) (.*)\r\n".encode(Encoding::US_ASCII))
+
+      def self.parse_response(io)
+        resp = {}
+
+        io.set_encoding Encoding::US_ASCII
+        status_line = io.readline(CRLF)
+        status_line_parts = STATUS_LINE.match status_line
+        resp[:code] = status_line_parts[1].to_i
+        resp[:reason] = status_line_parts[2]
+
+        headers = {}
+        until (header = io.readline(CRLF).strip).empty?
+          key, value = header.split ':', 2
+          headers[key] = value.strip
+        end
+
+        resp[:headers] = headers
+
+        content_length = headers['Content-Length']
+        if content_length
+          io.set_encoding Encoding::BINARY
+          resp[:body] = io.read(content_length.to_i)
+        end
+
+        resp
+      end
+
+      def self.create_error(prefix_msg, response)
+        content_type = response[:headers]['Content-Type'] || 'text/plain'
+        if content_type.start_with? 'application/json'
+          json = JSON.parse(response[:body].force_encoding(Encoding::UTF_8))
+          ruby_bt = Kernel.caller(2)
+          java_bt = json['stk'].map { |java_line| "#{java_line[0]}:#{java_line[3]}: in '#{java_line[2]}'" }
+          error = RuntimeError.new("#{prefix_msg}: #{json['msg']}")
+          error.set_backtrace java_bt + ruby_bt
+          raise error
+        elsif content_type.start_with? 'text/plain'
+          raise "#{prefix_msg}: #{response[:reason]} #{response[:body].force_encoding(Encoding::UTF_8)}"
+        else
+          raise "#{prefix_msg}: #{response[:reason]}"
+        end
+      end
+    end
+  end
+end
+
 if RUBY_PLATFORM == "java"
   require_relative 'java_jruby'
 else
-  require_relative 'java_rjb'
+  require_relative 'java_socket'
 end

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

@@ -1,39 +1,33 @@
 require 'java'
+require 'stringio'
 
 module Asciidoctor
   module Diagram
+    # @private
     module Java
-      def self.classpath
-        @classpath ||= []
-      end
-
       def self.load
-        if @loaded
+        if defined?(@loaded) && @loaded
           return
         end
 
-        classpath.each { |j| require j }
+        classpath.flatten.each { |j| require j }
         @loaded = true
       end
 
-      def self.array_to_java_array(array, type)
-        array.to_java(type)
-      end
+      def self.send_request(req)
+        cp = ::Java.org.asciidoctor.diagram.CommandProcessor.new()
 
-      def self.string_from_java_bytes(bytes)
-        String.from_java_bytes(bytes)
-      end
+        req_io = StringIO.new
+        format_request(req, req_io)
+        req_io.close
 
-      def self.method_missing(meth, *args, &block)
-        raise "No arguments expected" unless args.empty?
-        raise "No block expected" if block
+        response = cp.processRequest(req_io.string.to_java_bytes)
 
-        load
-        ::Java.send(meth)
-      end
+        resp_io = StringIO.new(String.from_java_bytes(response))
+        resp = parse_response(resp_io)
+        resp_io.close
 
-      def self.new_object(java_class, signature = nil, *args)
-        java_class.new(*args)
+        resp
       end
     end
   end