asciidoctor-diagram 1.5.19 → 2.0.0

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

@@ -0,0 +1,86 @@
+require 'set'
+
+require_relative '../diagram_converter'
+require_relative '../diagram_processor'
+require_relative '../util/java'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class DitaaConverter
+      include DiagramConverter
+
+      OPTIONS = {
+          :scale => lambda { |o, v| o << '--scale' << v if v },
+          :tabs => lambda { |o, v| o << '--tabs' << v if v },
+          :background => lambda { |o, v| o << '--background' << v if v },
+          :antialias => lambda { |o, v| o << '--no-antialias' if v == 'false' },
+          :separation => lambda { |o, v| o  << '--no-separation' if v == 'false'},
+          :round_corners => lambda { |o, v| o  << '--round-corners' if v == 'true'},
+          :shadows => lambda { |o, v| o  << '--no-shadows' if v == 'false'},
+          :debug => lambda { |o, v| o  << '--debug' if v == 'true'},
+          :fixed_slope => lambda { |o, v| o  << '--fixed-slope' if v == 'true'},
+          :transparent => lambda { |o, v| o  << '--transparent' if v == 'true'}
+      }
+
+      JARS = ['ditaa-1.3.14.jar', 'ditaamini-0.12.jar'].map do |jar|
+        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
+      end
+      Java.classpath.concat JARS
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+      def collect_options(source, name)
+        options = {}
+        
+        OPTIONS.keys.each do |option|
+          attr_name = option.to_s.tr('_', '-')
+          options[option] = source.attr(attr_name, nil, name) || source.attr(attr_name, nil, 'ditaa-option')
+        end
+        
+        options
+      end
+
+      def convert(source, format, options)
+        Java.load
+
+        flags = []
+
+        options.each do |option, value|
+          OPTIONS[option].call(flags, value)
+        end
+
+        options_string = flags.join(' ')
+
+        case format
+        when :png
+          mime_type = 'image/png'
+        when :svg
+          mime_type = 'image/svg+xml'
+        else
+          raise "Unsupported format: #{format}"
+        end
+
+        headers = {
+            'Accept' => mime_type,
+            'X-Options' => options_string
+        }
+
+        response = Java.send_request(
+            :url => '/ditaa',
+            :body => source.to_s,
+            :headers => headers
+        )
+
+        unless response[:code] == 200
+          raise Java.create_error("Ditaa image generation failed", response)
+        end
+
+        response[:body]
+      end
+    end
+  end
+end

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

@@ -1,79 +1,14 @@
-require 'set'
-
-require_relative '../extensions'
-require_relative '../util/java'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Ditaa
-      OPTIONS = {
-          'scale' => lambda { |o, v| o << '--scale' << v if v },
-          'tabs' => lambda { |o, v| o << '--tabs' << v if v },
-          'background' => lambda { |o, v| o << '--background' << v if v },
-          'antialias' => lambda { |o, v| o << '--no-antialias' if v == 'false' },
-          'separation' => lambda { |o, v| o  << '--no-separation' if v == 'false'},
-          'round-corners' => lambda { |o, v| o  << '--round-corners' if v == 'true'},
-          'shadows' => lambda { |o, v| o  << '--no-shadows' if v == 'false'},
-          'debug' => lambda { |o, v| o  << '--debug' if v == 'true'},
-          'fixed-slope' => lambda { |o, v| o  << '--fixed-slope' if v == 'true'},
-          'transparent' => lambda { |o, v| o  << '--transparent' if v == 'true'}
-      }
-
-      JARS = ['ditaa-1.3.13.jar', 'ditaamini-0.12.jar'].map do |jar|
-        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
-      end
-      Java.classpath.concat JARS
-
-      def self.included(mod)
-        mod.register_format(:png, :image) do |parent, source|
-          ditaa(parent, source, 'image/png')
-        end
-
-        mod.register_format(:svg, :image) do |parent, source|
-          ditaa(parent, source, 'image/svg+xml')
-        end
-      end
-
-      def ditaa(parent, source, mime_type)
-        Java.load
-
-        global_attributes = parent.document.attributes
-
-        options = []
-
-        OPTIONS.keys.each do |key|
-          value = source.attributes.delete(key) || global_attributes["ditaa-option-#{key}"]
-          OPTIONS[key].call(options, value)
-        end
-
-        options_string = options.join(' ')
-
-        headers = {
-            'Accept' => mime_type,
-            'X-Options' => options_string
-        }
-
-        response = Java.send_request(
-            :url => '/ditaa',
-            :body => source.to_s,
-            :headers => headers
-        )
-
-        unless response[:code] == 200
-          raise Java.create_error("Ditaa image generation failed", response)
-        end
-
-        response[:body]
-      end
-    end
-
-    class DitaaBlockProcessor < Extensions::DiagramBlockProcessor
-      include Ditaa
+    class DitaaBlockProcessor < DiagramBlockProcessor
+      use_converter DitaaConverter
     end
 
-    class DitaaBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Ditaa
+    class DitaaBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter DitaaConverter
     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, name)
+        {
+            :width => source.attr('width', nil, name),
+            :height => source.attr('height', nil, name),
+            :transparent => source.attr('transparent', nil, name),
+            :crop => source.attr('crop', nil, name),
+            :font => source.attr('font', nil, name),
+            :fontscale => source.attr('fontscale', nil, name),
+            :background => source.attr('background', nil, name),
+        }
+      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, name)
+        {:layout => source.attr('layout', nil, name)}
+      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