asciidoctor-diagram 1.5.19 → 2.0.0

data/lib/asciidoctor-diagram/nomnoml/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 Nomnoml
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            nomnoml(parent, source, f)
-          end
-        end
-      end
-
-      def nomnoml(parent, source, format)
-        generate_file(which(parent, 'nomnoml'), 'nomnoml', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
-        end
-      end
-    end
-
-    class NomnomlBlockProcessor < Extensions::DiagramBlockProcessor
-      include Nomnoml
+    class NomnomlBlockProcessor < DiagramBlockProcessor
+      use_converter NomnomlConverter
     end
 
-    class NomnomlBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Nomnoml
+    class NomnomlBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter NomnomlConverter
     end
   end
 end

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

@@ -0,0 +1,115 @@
+require_relative '../diagram_converter'
+require 'uri'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class PlantUmlConverter
+      include DiagramConverter
+
+      JARS = [
+          'plantuml-1.3.14.jar',
+          'plantuml.jar',
+          'jlatexmath-minimal-1.0.5.jar',
+          'batik-all-1.10.jar'
+      ].map do |jar|
+        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
+      end
+      Java.classpath.concat JARS
+
+      def supported_formats
+        [:png, :svg, :txt]
+      end
+
+      def collect_options(source, name)
+        {
+            :config => source.attr('plantumlconfig', nil, true) || source.attr('config', nil, name)
+        }
+      end
+
+      def convert(source, format, options)
+        Java.load
+
+        code = preprocess_code(source, self.class.tag)
+
+        case format
+        when :png
+          mime_type = 'image/png'
+        when :svg
+          mime_type = 'image/svg+xml'
+        when :txt
+          mime_type = 'text/plain;charset=utf-8'
+        else
+          raise "Unsupported format: #{format}"
+        end
+
+        headers = {
+            'Accept' => mime_type
+        }
+
+        config_file = options[:config]
+        if config_file
+          headers['X-PlantUML-Config'] = File.expand_path(config_file, source.base_dir)
+        end
+
+        dot = source.find_command('dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
+        if dot
+          headers['X-Graphviz'] = ::Asciidoctor::Diagram::Platform.host_os_path(dot)
+        end
+
+        response = Java.send_request(
+            :url => '/plantuml',
+            :body => code,
+            :headers => headers
+        )
+
+        unless response[:code] == 200
+          raise Java.create_error("PlantUML image generation failed", response)
+        end
+
+        response[:body]
+      end
+
+      def preprocess_code(source, tag)
+        code = source.to_s
+
+        code = "@start#{tag}\n#{code}\n@end#{tag}" unless code.index("@start") && code.index("@end")
+
+        code.gsub!(/(?<=<img:)[^>]+(?=>)/) do |match|
+          resolve_path(match, source, source.attr('imagesdir'))
+        end
+
+        code.gsub!(/(?:(?<=!include\s)|(?<=!includesub\s))\s*[^<][^!\n\r]+/) do |match|
+          resolve_path(match.lstrip, source, source.base_dir)
+        end
+
+        code
+      end
+
+      def resolve_path(path, source, base_dir)
+        if path =~ ::URI::ABS_URI
+          uri = ::URI.parse(path)
+          if uri.scheme == 'file'
+            source.resolve_path(uri.path, base_dir)
+          else
+            path
+          end
+        else
+          source.resolve_path(path, base_dir)
+        end
+      end
+    end
+
+    class UmlConverter < PlantUmlConverter
+      def self.tag
+        'uml'
+      end
+    end
+
+    class SaltConverter < PlantUmlConverter
+      def self.tag
+        'salt'
+      end
+    end
+  end
+end

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

@@ -1,131 +1,22 @@
-require_relative '../extensions'
-require_relative '../util/which'
-require 'uri'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module PlantUml
-      include Which
-
-      private
-
-      JARS = [
-          'plantuml-1.3.13.jar',
-          'plantuml.jar',
-          'jlatexmath-minimal-1.0.5.jar',
-          'batik-all-1.10.jar'
-      ].map do |jar|
-        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
-      end
-      Java.classpath.concat JARS
-
-      def plantuml(parent_block, source, tag, mime_type)
-        Java.load
-
-        inherit_prefix = name
-        code = preprocess_code(parent_block, source, tag)
-
-        headers = {
-            'Accept' => mime_type
-        }
-
-        config_file = source.attr('plantumlconfig', nil, true) || source.attr('config', nil, inherit_prefix)
-        if config_file
-          headers['X-PlantUML-Config'] = File.expand_path(config_file, source.attr('docdir', nil, true))
-        end
-
-        dot = which(parent_block, 'dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
-        if dot
-          headers['X-Graphviz'] = ::Asciidoctor::Diagram::Platform.host_os_path(dot)
-        end
-
-        response = Java.send_request(
-            :url => '/plantuml',
-            :body => code,
-            :headers => headers
-        )
-
-        unless response[:code] == 200
-          raise Java.create_error("PlantUML image generation failed", response)
-        end
-
-        response[:body]
-      end
-
-      def preprocess_code(parent, source, tag)
-        code = source.to_s
-        base_dir = source.base_dir
-
-        code = "@start#{tag}\n#{code}\n@end#{tag}" unless code.index("@start") && code.index("@end")
-
-        code.gsub!(/(?<=<img:)[^>]+(?=>)/) do |match|
-          resolve_path(match, parent, parent.attr('imagesdir'))
-        end
-
-        code.gsub!(/(?:(?<=!include\s)|(?<=!includesub\s))\s*[^<][^!\n\r]+/) do |match|
-          resolve_path(match.lstrip, parent, base_dir)
-        end
-
-        code
-      end
-
-      def resolve_path(path, parent, base_dir)
-        if path =~ ::URI::ABS_URI
-          uri = ::URI.parse(path)
-          if uri.scheme == 'file'
-            parent.normalize_system_path(uri.path, base_dir)
-          else
-            parent.normalize_web_path(path)
-          end
-        else
-          parent.normalize_system_path(path, base_dir)
-        end
-      end
-
-      def self.included(mod)
-        mod.register_format(:png, :image) do |parent_block, source|
-          plantuml(parent_block, source, mod.tag, 'image/png')
-        end
-        mod.register_format(:svg, :image) do |parent_block, source|
-          plantuml(parent_block, source, mod.tag, 'image/svg+xml')
-        end
-        mod.register_format(:txt, :literal) do |parent_block, source|
-          plantuml(parent_block, source, mod.tag, 'text/plain;charset=utf-8')
-        end
-      end
+    class PlantUmlBlockProcessor < DiagramBlockProcessor
+      use_converter UmlConverter
     end
 
-    class PlantUmlBlockProcessor < Extensions::DiagramBlockProcessor
-      def self.tag
-        'uml'
-      end
-
-      include PlantUml
+    class PlantUmlBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter UmlConverter
     end
 
-    class PlantUmlBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      def self.tag
-        'uml'
-      end
-
-      include PlantUml
+    class SaltBlockProcessor < DiagramBlockProcessor
+      use_converter SaltConverter
     end
 
-    class SaltBlockProcessor < Extensions::DiagramBlockProcessor
-      def self.tag
-        'salt'
-      end
-
-      include PlantUml
-    end
-
-    class SaltBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      def self.tag
-        'salt'
-      end
-
-      include PlantUml
+    class SaltBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SaltConverter
     end
   end
 end

data/lib/asciidoctor-diagram/shaape/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 ShaapeConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+
+      def convert(source, format, options)
+        generate_stdin(source.find_command('shaape'), format.to_s, source.to_s) 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/shaape/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 Shaape
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            shaape(parent, source, f)
-          end
-        end
-      end
-
-      def shaape(parent, source, format)
-        generate_stdin(which(parent, 'shaape'), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, '-o', Platform.native_path(output_path), '-t', format.to_s, '-']
-        end
-      end
-    end
-
-    class ShaapeBlockProcessor < Extensions::DiagramBlockProcessor
-      include Shaape
+    class ShaapeBlockProcessor < DiagramBlockProcessor
+      use_converter ShaapeConverter
     end
 
-    class ShaapeBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Shaape
+    class ShaapeBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter ShaapeConverter
     end
   end
 end

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

@@ -0,0 +1,44 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SmcatConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def collect_options(source, name)
+        {
+            :direction => source.attr('direction', nil, name),
+            :engine => source.attr('engine', nil, name)
+        }
+      end
+
+      def convert(source, format, options)
+        direction = options[:direction]
+        engine = options[:engine]
+
+        generate_stdin(source.find_command('smcat'), format.to_s, source.to_s) do |tool_path, output_path|
+          args = [tool_path, '-o', Platform.native_path(output_path), '-T', format.to_s]
+          if direction
+            args << '-d' << direction
+          end
+
+          if engine
+            args << '-E' << engine
+          end
+
+          args << '-'
+          args
+        end
+      end
+    end
+  end
+end

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

@@ -1,50 +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 Smcat
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            smcat(parent, source, f)
-          end
-        end
-      end
-
-      def smcat(parent, source, format)
-        inherit_prefix = name
-        direction = source.attr('direction', nil, inherit_prefix)
-        engine = source.attr('engine', nil, inherit_prefix)
-
-        generate_stdin(which(parent, 'smcat'), format.to_s, source.to_s) do |tool_path, output_path|
-          args = [tool_path, '-o', Platform.native_path(output_path), '-T', format.to_s]
-          if direction
-            args << '-d' << direction
-          end
-
-          if engine
-            args << '-E' << engine
-          end
-
-          args << '-'
-          args
-        end
-      end
-    end
-
-    class SmcatBlockProcessor < Extensions::DiagramBlockProcessor
-      include Smcat
+    class SmcatBlockProcessor < DiagramBlockProcessor
+      use_converter SmcatConverter
     end
 
-    class SmcatBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Smcat
+    class SmcatBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SmcatConverter
     end
   end
 end