asciidoctor-diagram 2.0.2 → 2.0.4

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

@@ -33,17 +33,21 @@ module Asciidoctor
         [:png, :svg]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         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')
+          options[option] = source.attr(attr_name) || source.attr(attr_name, nil, 'ditaa-option')
         end
         
         options
       end
 
+      def native_scaling?
+        true
+      end
+
       def convert(source, format, options)
         Java.load
 

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/gnuplot/converter.rb

@@ -14,15 +14,15 @@ module Asciidoctor
         [:png, :svg, :gif, :txt, :literal]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {
-            :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),
+            :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
 

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

@@ -13,8 +13,8 @@ module Asciidoctor
         [:png, :pdf, :svg]
       end
 
-      def collect_options(source, name)
-        {:layout => source.attr('layout', nil, name)}
+      def collect_options(source)
+        {:layout => source.attr('layout')}
       end
 
       def convert(source, format, options)

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

@@ -51,6 +51,7 @@ module Asciidoctor
           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)
@@ -60,17 +61,36 @@ module Asciidoctor
           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 path
+          response = http.request_get uri.path
           case response
-          when Net::HTTPSuccess
-            response.body
-          else
-            response.value
+            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

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

@@ -67,15 +67,15 @@ module Asciidoctor
         end
       end
 
-      def render_diagram(type, accepts, code, attributes)
+      def render_diagram(type, accepts, source, attributes)
         converter = get_converter(type.downcase.to_sym)
         return [500, "Unsupported diagram type #{type}"] unless converter
 
         format = converter.supported_formats.find {|f| accepts.call(f)}
         return [500, "Could not determine supported output format"] unless format
 
-        source = ServerSource.new(code, attributes)
-        options = converter.collect_options(source, type.downcase)
+        source = ServerSource.new(type.downcase, source, attributes)
+        options = converter.collect_options(source)
         diagram = converter.convert(source, format, options)
 
         content_type to_mime_type(format)
@@ -86,12 +86,17 @@ module Asciidoctor
     class ServerSource
       include Asciidoctor::Diagram::DiagramSource
 
-      def initialize(source, attributes)
+      def initialize(name, source, attributes)
+        @name = name
         @source = source
         @attributes = attributes
       end
 
-      def attr(name, default_value = nil, inherit = nil)
+      def diagram_type
+        @name
+      end
+
+      def attr(name, default_value = nil, inherit = diagram_type)
         @attributes[name] || default_value
       end
 

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

@@ -14,9 +14,9 @@ module Asciidoctor
         [:png, :pdf]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {
-            :resolution => source.attr('resolution', nil, name)
+            :resolution => source.attr('resolution')
         }
       end
 

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

@@ -15,20 +15,20 @@ module Asciidoctor
       end
 
 
-      def collect_options(source, name)
-        bg_img = source.attr('background', nil, name)
+      def collect_options(source)
+        bg_img = source.attr('background')
         raise "background attribute is required" unless bg_img
 
-        options = source.attr('options', '', name).split(',')
+        options = source.attr('options', '').split(',')
 
         {
             :bg_img => bg_img,
             :top_label => source.attr('top'),
             :bottom_label => source.attr('bottom'),
-            :fill_color => source.attr('fillcolor', nil, name) || source.attr('fill-color', nil, name),
-            :stroke_color => source.attr('strokecolor', nil, name) || source.attr('stroke-color', nil, name),
-            :stroke_width => source.attr('strokewidth', nil, name) || source.attr('stroke-width', nil, name),
-            :font => source.attr('font', 'Impact', name),
+            :fill_color => source.attr(['fillcolor', 'fill-color']),
+            :stroke_color => source.attr(['strokecolor', 'stroke-color']),
+            :stroke_width => source.attr(['strokewidth', 'stroke-width']),
+            :font => source.attr('font', 'Impact'),
             :noupcase => options.include?('noupcase'),
         }
       end

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

@@ -15,18 +15,18 @@ module Asciidoctor
         [:png, :svg]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         options = {}
 
-        options[:css] = source.attr('css', nil, name)
-        options[:gantt_config] = source.attr('ganttconfig', nil, name) || source.attr('gantt-config', nil, name)
-        options[:seq_config] = source.attr('sequenceconfig', nil, name) || source.attr('sequence-config', nil, name)
-        options[:width] = source.attr('width', nil, name)
-        options[:height] = source.attr('height', nil, name)
-        options[:theme] = source.attr('theme', nil, name)
-        options[:background] = source.attr('background', nil, name)
-        options[:config] = source.attr('config', nil, name)
-        options[:puppeteer_config] = source.attr('puppeteerconfig', nil, name) || source.attr('puppeteer-config', nil, name)
+        options[:css] = source.attr('css')
+        options[:gantt_config] = source.attr(['ganttconfig', 'gantt-config'])
+        options[:seq_config] = source.attr(['sequenceconfig', 'sequence-config'])
+        options[:width] = source.attr('width')
+        options[:height] = source.attr('height')
+        options[:theme] = source.attr('theme')
+        options[:background] = source.attr('background')
+        options[:config] = source.attr('config')
+        options[:puppeteer_config] = source.attr(['puppeteerconfig', 'puppeteer-config'])
 
         options
       end
@@ -57,7 +57,8 @@ module Asciidoctor
         opts[:width] = options[:width]
 
         mmdc = source.find_command('mmdc', :raise_on_error => false)
-        if mmdc
+        node = source.find_command('node', :raise_on_error => false)
+        if mmdc && node
           opts[:height] = options[:height]
           opts[:theme] = options[:theme]
           opts[:background] = options[:background]
@@ -65,7 +66,7 @@ module Asciidoctor
           if config
             opts[:config] = source.resolve_path(config)
           end
-          run_mmdc(mmdc, source, format, opts)
+          run_mmdc(node, mmdc, source, format, opts)
         else
           mermaid = source.find_command('mermaid')
           run_mermaid(mermaid, source, format, opts)
@@ -73,9 +74,9 @@ module Asciidoctor
       end
 
       private
-      def run_mmdc(mmdc, source, format, options = {})
-        generate_file(mmdc, 'mmd', 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)]
+      def run_mmdc(node, mmdc, source, format, options = {})
+        generate_file(node, 'mmd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          args = [tool_path, '--unhandled-rejections=strict', mmdc, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)]
 
           if options[:css]
             args << '--cssFile' << Platform.native_path(options[:css])

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

@@ -14,8 +14,8 @@ module Asciidoctor
         [:png, :svg]
       end
 
-      def collect_options(source, name)
-        {:font => source.attr('font', nil, name)}
+      def collect_options(source)
+        {:font => source.attr('font')}
       end
 
       def convert(source, format, options)

data/lib/asciidoctor-diagram/pikchr.rb

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

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

@@ -0,0 +1,26 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class PikchrConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def convert(source, format, options)
+        pikchr_path = source.find_command('pikchr')
+
+        generate_file_stdout(pikchr_path, format.to_s, source.to_s) do |tool_path, input_path|
+          [tool_path, "--svg-only", input_path]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class PikchrBlockProcessor < DiagramBlockProcessor
+      use_converter PikchrConverter
+    end
+
+    class PikchrBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter PikchrConverter
+    end
+  end
+end

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

@@ -21,9 +21,9 @@ module Asciidoctor
         [:png, :svg, :txt, :atxt, :utxt]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {
-            :config => source.attr('plantumlconfig', nil, true) || source.attr('config', nil, name)
+            :config => source.attr('plantumlconfig', nil, true) || source.attr('config')
         }
       end
 
@@ -78,7 +78,7 @@ module Asciidoctor
         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'))
+          resolve_path(match, source, source.attr('imagesdir', nil, false))
         end
 
         code.gsub!(/(?:(?<=!include\s)|(?<=!includesub\s))\s*[^<][^!\n\r]+/) do |match|

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

@@ -14,10 +14,10 @@ module Asciidoctor
         [:svg]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {
-            :direction => source.attr('direction', nil, name),
-            :engine => source.attr('engine', nil, name)
+            :direction => source.attr('direction'),
+            :engine => source.attr('engine')
         }
       end
 

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

@@ -21,12 +21,12 @@ module Asciidoctor
           :scale => lambda { |o, v| o << '--scale' << v if v }
       }
 
-      def collect_options(source, name)
+      def collect_options(source)
         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, 'svgbob-option')
+          options[option] = source.attr(attr_name) || source.attr(attr_name, nil, 'svgbob-option')
         end
 
         options

data/lib/asciidoctor-diagram/symbolator.rb

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

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

@@ -0,0 +1,23 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SymbolatorConverter
+      include DiagramConverter
+      include CliGenerator
+
+      def supported_formats
+        [:png, :pdf, :svg]
+      end
+
+      def convert(source, format, options)
+        generate_stdin(source.find_command('symbolator'), format.to_s, source.to_s) do |tool_path, output_path|
+          [tool_path, "-i-", "-o#{Platform.native_path(output_path)}", "-f#{format.to_s}"]
+        end
+      end
+    end
+  end
+end