asciidoctor-diagram 1.5.19 → 2.0.5

data/lib/asciidoctor-diagram/dpic.rb

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

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

@@ -0,0 +1,30 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class DpicConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def convert(source, format, options)
+        dpic_path = source.find_command('dpic')
+
+        code = source.to_s
+        code.prepend ".PS\n" unless code.start_with?(".PS\n")
+        code << "\n.PE" unless code.start_with?("\n.PE")
+
+        generate_file_stdout(dpic_path, format.to_s, code) do |tool_path, input_path|
+          [tool_path, "-v", "-z", input_path]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class DpicBlockProcessor < DiagramBlockProcessor
+      use_converter DpicConverter
+    end
+
+    class DpicBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter DpicConverter
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class ErdConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+      def convert(source, format, options)
+        erd_path = source.find_command('erd')
+        dot_path = source.find_command('dot', :alt_attrs => ['graphvizdot'])
+
+        dot_code = generate_stdin(erd_path, format.to_s, source.to_s) do |tool_path, output_path|
+          [tool_path, '-o', Platform.native_path(output_path), '-f', 'dot']
+        end
+
+        generate_stdin(dot_path, format.to_s, dot_code) do |tool_path, output_path|
+          [tool_path, "-o#{Platform.native_path(output_path)}", "-T#{format.to_s}"]
+        end
+      end
+    end
+  end
+end

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

@@ -1,43 +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 Erd
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            erd(parent, source, f)
-          end
-        end
-      end
-
-      def erd(parent, source, format)
-        erd_path = which(parent, 'erd')
-        dot_path = which(parent, 'dot', :alt_attrs => ['graphvizdot'])
-
-        dot_code = generate_stdin(erd_path, format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, '-o', Platform.native_path(output_path), '-f', 'dot']
-        end
-
-        generate_stdin(dot_path, format.to_s, dot_code) do |tool_path, output_path|
-          [tool_path, "-o#{Platform.native_path(output_path)}", "-T#{format.to_s}"]
-        end
-      end
-    end
-
-    class ErdBlockProcessor < Extensions::DiagramBlockProcessor
-      include Erd
+    class ErdBlockProcessor < DiagramBlockProcessor
+      use_converter ErdConverter
     end
 
-    class ErdBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Erd
+    class ErdBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter ErdConverter
     end
   end
 end

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

@@ -0,0 +1,63 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class GnuplotConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg, :gif, :txt, :literal]
+      end
+
+      def collect_options(source)
+        {
+            :width => source.attr('width'),
+            :height => source.attr('height'),
+            :transparent => source.attr('transparent'),
+            :crop => source.attr('crop'),
+            :font => source.attr('font'),
+            :fontscale => source.attr('fontscale'),
+            :background => source.attr('background'),
+        }
+      end
+
+      def convert(source, format, options)
+        if format == :txt || format == :literal
+          terminal = 'dumb'
+        else
+          terminal = format.to_s
+        end
+        code = "set term #{terminal}"
+
+        width = options[:width]
+        height = options[:height]
+        code << " size #{width},#{height}" unless width.nil? or height.nil?
+
+        transparent = options[:transparent]
+        code << (transparent ? " transparent" : " notransparent") unless transparent.nil?
+
+        crop = options[:crop]
+        code << (crop ? " crop" : " nocrop") unless crop.nil?
+
+        font = options[:font]
+        code << %( font "#{font}") unless font.nil?
+
+        font_scale = options[:fontscale]
+        code << " fontscale #{font_scale}" unless font_scale.nil?
+
+        background = options[:background]
+        code << %( background "#{background}") unless background.nil?
+
+        code << "\n"
+        code << source.to_s
+
+        generate_stdin_stdout(source.find_command('gnuplot'), code)
+      end
+    end
+  end
+end

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

@@ -1,70 +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 Gnuplot
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :svg, :gif].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            gnuplot(parent, source, f)
-          end
-        end
-
-        mod.register_format(:txt, :literal) do |parent, source|
-            gnuplot(parent, source, :txt)
-        end          
-      end
-
-      def gnuplot(parent, source, format)
-        inherit_prefix = name        
-        
-        width = source.attr("width", nil, inherit_prefix)
-        height = source.attr("height", nil, inherit_prefix)
-
-        if format == :txt
-          format = 'dumb'
-        end
-
-        code = "set term #{format}"
-        code << " size #{width},#{height}" unless width.nil? or height.nil?
-
-        transparent = source.attr("transparent", nil, inherit_prefix)
-        code << (transparent ? " transparent" : " notransparent") unless transparent.nil?
-
-        crop = source.attr("crop", nil, inherit_prefix)
-        code << (crop ? " crop" : " nocrop") unless crop.nil?
-
-        font = source.attr("font", nil, inherit_prefix)
-        code << %( font "#{font}") unless font.nil?
-
-        font_scale = source.attr("fontscale", nil, inherit_prefix)
-        code << " fontscale #{font_scale}" unless font_scale.nil?
-
-        background = source.attr("background", nil, inherit_prefix)
-        code << %( background "#{background}") unless background.nil?
-  
-        code << "\n"
-        code << source.to_s 
-        generate_stdin_stdout(which(parent, 'gnuplot'), code) do |tool_path|
-          [tool_path]
-        end
- 
-      end
-    end
-
-    class GnuplotBlockProcessor < Extensions::DiagramBlockProcessor
-      include Gnuplot
+    class GnuplotBlockProcessor < DiagramBlockProcessor
+      use_converter GnuplotConverter
     end
 
-    class GnuplotBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Gnuplot
+    class GnuplotBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter GnuplotConverter
     end
   end
 end

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

@@ -0,0 +1,32 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class GraphvizConverter
+      include DiagramConverter
+      include CliGenerator
+
+      def supported_formats
+        [:png, :pdf, :svg]
+      end
+
+      def collect_options(source)
+        {:layout => source.attr('layout')}
+      end
+
+      def convert(source, format, options)
+        generate_stdin(source.find_command('dot', :alt_attrs => ['graphvizdot']), format.to_s, source.to_s) do |tool_path, output_path|
+          args = [tool_path, "-o#{Platform.native_path(output_path)}", "-T#{format.to_s}"]
+
+          layout = options[:layout]
+          args << "-K#{layout}" if layout
+
+          args
+        end
+      end
+    end
+  end
+end

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

@@ -1,43 +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 Graphviz
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :pdf, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            graphviz(parent, source, f)
-          end
-        end
-      end
-
-      def graphviz(parent, source, format)
-        inherit_prefix = name
-
-        generate_stdin(which(parent, 'dot', :alt_attrs => ['graphvizdot']), format.to_s, source.to_s) do |tool_path, output_path|
-          args = [tool_path, "-o#{Platform.native_path(output_path)}", "-T#{format.to_s}"]
-
-          layout = source.attr('layout', nil, inherit_prefix)
-          args << "-K#{layout}" if layout
-
-          args
-        end
-      end
-    end
-
-    class GraphvizBlockProcessor < Extensions::DiagramBlockProcessor
-      include Graphviz
+    class GraphvizBlockProcessor < DiagramBlockProcessor
+      use_converter GraphvizConverter
     end
 
-    class GraphvizBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Graphviz
+    class GraphvizBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter GraphvizConverter
     end
   end
 end

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

@@ -0,0 +1,99 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+require 'base64'
+require 'net/http'
+require 'uri'
+require 'zlib'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class HttpConverter
+      include DiagramConverter
+
+      def initialize(base_uri, type, converter)
+        @base_uri = base_uri
+        @type = type
+        @converter = converter
+      end
+
+      def supported_formats
+        @converter.supported_formats
+      end
+
+      def collect_options(source, name)
+        {
+            :block_name => name
+        }
+      end
+
+      def convert(source, format, options)
+        code = source.code
+
+        uri = URI(@base_uri)
+
+        case @type
+        when :plantuml
+          deflate = Zlib::Deflate.new(Zlib::BEST_COMPRESSION,
+                                      -Zlib::MAX_WBITS,
+                                      Zlib::MAX_MEM_LEVEL,
+                                      Zlib::DEFAULT_STRATEGY)
+
+          compressed = deflate.deflate(code, Zlib::FINISH)
+          deflate.close
+
+          encoded = Base64.urlsafe_encode64(compressed)
+          data = '0A' + encoded
+
+          path = uri.path
+          path << '/' unless path.end_with? '/'
+          path << format.to_s
+          path << '/' << data
+          uri.path = path
+        when :kroki_io
+          compressed = Zlib.deflate(code, Zlib::BEST_COMPRESSION)
+          data = Base64.urlsafe_encode64(compressed)
+
+          path = uri.path
+          path << '/' unless path.end_with? '/'
+          path << options[:block_name].to_s
+          path << '/' << format.to_s
+          path << '/' << data
+          uri.path = path
+        else
+          raise "Unsupported server type: " + @type
+        end
+
+        get_uri(uri)
+      end
+
+      private
+
+      def get_uri(uri, attempt = 1)
+        if attempt >= 10
+          raise "Too many redirects"
+        end
+
+        Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme.downcase == 'https') do |http|
+          response = http.request_get uri.path
+          case response
+            when Net::HTTPSuccess
+              response.body
+            when Net::HTTPRedirection then
+              location = response['Location']
+              new_uri = URI.parse(location)
+              if new_uri.relative?
+                get_uri(uri + location, attempt + 1)
+              else
+                get_uri(new_uri, attempt + 1)
+              end
+            else
+              response.value
+          end
+        end
+      end
+    end
+  end
+end