asciidoctor-diagram 1.2.0 → 2.0.0

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

@@ -0,0 +1,175 @@
+require 'socket'
+
+require_relative 'cli'
+require_relative 'platform'
+require_relative 'which'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    module Java
+      class CommandServer
+        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.StdInOutCommandServer'
+
+          @server = IO.popen([java, *args], 'r+')
+        end
+
+        def io
+          @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
+
+      def self.load
+        if defined?(@loaded) && @loaded
+          return
+        end
+
+        instance
+        @loaded = true
+      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)
+          @command_server = server
+          at_exit do
+            server.shutdown
+          end
+        end
+
+        @command_server
+      end
+
+      def self.send_request(req)
+        svr = instance
+        req[:headers] ||= {}
+        # headers = req[:headers] ||= {}
+        # headers['Host'] = "localhost:#{svr.port}"
+        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/util/pdf.rb

@@ -0,0 +1,10 @@
+module Asciidoctor
+  module Diagram
+    # @private
+    module PDF
+      def self.get_image_size(_)
+        nil
+      end
+    end
+  end
+end

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

@@ -0,0 +1,97 @@
+require 'rbconfig'
+require_relative 'cli'
+require_relative 'which'
+
+module Asciidoctor
+  module Diagram
+    module Platform
+      def self.os
+        os_info[:os]
+      end
+
+      def self.os_variant
+        os_info[:os_variant]
+      end
+
+      def self.file_separator
+        os_info[:file_sep]
+      end
+
+      def self.host_os_file_separator
+        os_info[:host_os_file_sep]
+      end
+
+      def self.path_separator
+        os_info[:path_sep]
+      end
+
+      def self.host_os_path_separator
+        os_info[:host_os_path_sep]
+      end
+      
+      def self.os_info
+        @os ||= (
+        host_os = RbConfig::CONFIG['host_os']
+
+        file_sep = '/'
+        host_os_file_sep = nil
+        variant = nil
+        path_sep = ::File::PATH_SEPARATOR
+        host_os_path_sep = nil
+        
+        case host_os
+          when /(msys|mingw|mswin|bccwin|wince|emc)/i
+            os = :windows
+            variant = $1.downcase.to_sym
+            file_sep = '\\'
+          when /(cygwin)/i
+            os = :windows
+            variant = $1.downcase.to_sym
+            host_os_file_sep = '\\'
+            host_os_path_sep = ';'
+          when /darwin|mac os/i
+            os = :macosx
+          when /linux/i
+            os = :linux
+          else
+            os = :unix
+        end
+        {
+            :os => os,
+            :os_variant => variant || os, 
+            :file_sep => file_sep,
+            :host_os_file_sep => host_os_file_sep || file_sep,
+            :path_sep => path_sep,
+            :host_os_path_sep => host_os_path_sep || path_sep
+        }
+        )
+      end
+
+      def self.native_path(path)
+        return path if path.nil?
+
+        sep = file_separator
+        if sep != '/'
+          path.to_s.gsub('/', sep)
+        else
+          path.to_s
+        end
+      end
+
+      def self.host_os_path(path)
+        # special case for cygwin, it requires path translation for java to work
+        if os_variant == :cygwin
+          cygpath = ::Asciidoctor::Diagram::Which.which('cygpath')
+          if cygpath != nil
+            ::Asciidoctor::Diagram::Cli.run(cygpath, '-w', path)[:out]
+          else
+            puts 'cygwin warning: cygpath not found'
+            native_path(path)
+          end
+        else
+          native_path(path)
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ require_relative 'binaryio'
 
 module Asciidoctor
   module Diagram
+    # @private
     module PNG
       PNG_SIGNATURE = [137, 80, 78, 71, 13, 10, 26, 10].pack('CCCCCCCC')
 

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

@@ -2,6 +2,7 @@ require_relative 'binaryio'
 
 module Asciidoctor
   module Diagram
+    # @private
     module SVG
       def self.get_image_size(data)
         if m = START_TAG_REGEX.match(data)
@@ -25,9 +26,9 @@ module Asciidoctor
       private
 
       START_TAG_REGEX = /<svg[^>]*>/
-      WIDTH_REGEX = /width="(?<value>\d+)(?<unit>[a-zA-Z]+)"/
-      HEIGHT_REGEX = /height="(?<value>\d+)(?<unit>[a-zA-Z]+)"/
-      VIEWBOX_REGEX = /viewBox="\d+ \d+ (?<width>\d+) (?<height>\d+)"/
+      WIDTH_REGEX = /width="(?<value>\d+(?:\.\d+)?)(?<unit>[a-zA-Z]+)?"/
+      HEIGHT_REGEX = /height="(?<value>\d+(?:\.\d+)?)(?<unit>[a-zA-Z]+)?"/
+      VIEWBOX_REGEX = /viewBox="\d+(?:\.\d+)? \d+(?:\.\d+)? (?<width>\d+(?:\.\d+)?) (?<height>\d+(?:\.\d+)?)"/
 
       def self.to_px_factor(unit)
         case unit

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

@@ -1,14 +1,20 @@
 module Asciidoctor
   module Diagram
-    def self.which(cmd)
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each { |ext|
-          exe = File.join(path, "#{cmd}#{ext}")
-          return exe if File.executable? exe
-        }
+    module Which
+      # @private
+      def self.which(cmd, options = {})
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+
+        paths = (options[:path] || []) + (ENV['PATH'] ? ENV['PATH'].split(File::PATH_SEPARATOR) : [])
+        paths.each do |path|
+          exts.each { |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable? exe
+          }
+        end
+
+        nil
       end
-      nil
     end
   end
-end
+end

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

@@ -0,0 +1,47 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class VegaConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg, :png]
+      end
+
+
+      def collect_options(source, name)
+        {
+            :vegalite => name.to_s.include?('lite') || source.attr('vegalite')
+        }
+      end
+
+      def convert(source, format, options)
+        base_dir = source.base_dir
+
+        code = source.to_s
+
+        if code.include?('/schema/vega-lite/') || options[:vegalite]
+          vega_code = generate_stdin_stdout(source.find_command("vl2vg"), code)
+        else
+          vega_code = code
+        end
+
+        generate_file(source.find_command("vg2#{format}"), "json", format.to_s, vega_code) do |tool_path, input_path, output_path|
+          args = [tool_path, '--base', Platform.native_path(base_dir)]
+          if format == :svg
+            args << '--header'
+          end
+
+          args << Platform.native_path(input_path)
+          args << Platform.native_path(output_path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative '../diagram_processor'
+require_relative 'converter'
+
+module Asciidoctor
+  module Diagram
+    class VegaBlockProcessor < DiagramBlockProcessor
+      use_converter VegaConverter
+    end
+
+    class VegaBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter VegaConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/vega.rb

@@ -0,0 +1,10 @@
+require 'asciidoctor/extensions'
+require_relative 'vega/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::VegaBlockProcessor, :vega
+  block_macro Asciidoctor::Diagram::VegaBlockMacroProcessor, :vega
+
+  block Asciidoctor::Diagram::VegaBlockProcessor, :vegalite
+  block_macro Asciidoctor::Diagram::VegaBlockMacroProcessor, :vegalite
+end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.2.0"
+    VERSION = "2.0.0"
   end
 end

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

@@ -0,0 +1,50 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class WavedromConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+
+      def convert(source, format, options)
+        wavedrom_cli = source.find_command('wavedrom-cli', :raise_on_error => false)
+        if wavedrom_cli
+          generate_file(wavedrom_cli, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+            [Platform.native_path(tool_path), '--input', Platform.native_path(input_path), "--#{format.to_s}", Platform.native_path(output_path)]
+          end
+        else
+          wavedrom_cli = source.find_command('wavedrom', :raise_on_error => false)
+          phantomjs = source.find_command('phantomjs', :alt_attrs => ['phantomjs_2'], :raise_on_error => false)
+
+          if wavedrom_cli && !wavedrom_cli.include?('WaveDromEditor') && phantomjs
+            generate_file(wavedrom_cli, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+              [phantomjs, Platform.native_path(tool_path), '-i', Platform.native_path(input_path), "-#{format.to_s[0]}", Platform.native_path(output_path)]
+            end
+          else
+            if ::Asciidoctor::Diagram::Platform.os == :macosx
+              wavedrom = source.find_command('WaveDromEditor.app', :alt_cmds => ['wavedrom-editor.app'], :attrs => ['WaveDromEditorApp'], :path => ['/Applications'])
+              if wavedrom
+                wavedrom = File.join(wavedrom, 'Contents/MacOS/nwjs')
+              end
+            else
+              wavedrom = source.find_command('WaveDromEditor')
+            end
+
+            generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+              [tool_path, 'source', Platform.native_path(input_path), format.to_s, Platform.native_path(output_path)]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative '../diagram_processor'
+require_relative 'converter'
+
+module Asciidoctor
+  module Diagram
+    class WavedromBlockProcessor < DiagramBlockProcessor
+      use_converter WavedromConverter
+    end
+
+    class WavedromBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter WavedromConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/wavedrom.rb

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

data/lib/asciidoctor-diagram.rb

@@ -1,5 +1,22 @@
-require 'asciidoctor-diagram/blockdiag'
-require 'asciidoctor-diagram/ditaa'
-require 'asciidoctor-diagram/graphviz'
-require 'asciidoctor-diagram/plantuml'
-require 'asciidoctor-diagram/shaape'
+require_relative 'asciidoctor-diagram/a2s'
+require_relative 'asciidoctor-diagram/blockdiag'
+require_relative 'asciidoctor-diagram/bpmn'
+require_relative 'asciidoctor-diagram/ditaa'
+require_relative 'asciidoctor-diagram/erd'
+require_relative 'asciidoctor-diagram/gnuplot'
+require_relative 'asciidoctor-diagram/graphviz'
+require_relative 'asciidoctor-diagram/lilypond'
+require_relative 'asciidoctor-diagram/meme'
+require_relative 'asciidoctor-diagram/mermaid'
+require_relative 'asciidoctor-diagram/msc'
+require_relative 'asciidoctor-diagram/nomnoml'
+require_relative 'asciidoctor-diagram/plantuml'
+require_relative 'asciidoctor-diagram/salt'
+require_relative 'asciidoctor-diagram/shaape'
+require_relative 'asciidoctor-diagram/smcat'
+require_relative 'asciidoctor-diagram/svgbob'
+require_relative 'asciidoctor-diagram/syntrax'
+require_relative 'asciidoctor-diagram/tikz'
+require_relative 'asciidoctor-diagram/umlet'
+require_relative 'asciidoctor-diagram/vega'
+require_relative 'asciidoctor-diagram/wavedrom'