asciidoctor-diagram 1.5.18 → 2.0.0

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.11.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

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class GnuplotBlockProcessor < DiagramBlockProcessor
+      use_converter GnuplotConverter
+    end
+
+    class GnuplotBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter GnuplotConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/gnuplot.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'gnuplot/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::GnuplotBlockProcessor, :gnuplot
+  block_macro Asciidoctor::Diagram::GnuplotBlockMacroProcessor, :gnuplot
+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

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

@@ -0,0 +1,127 @@
+require 'base64'
+require 'json'
+require 'sinatra/base'
+require 'zlib'
+
+require_relative '../diagram_source'
+require_relative '../graphviz/converter'
+require_relative '../util/which'
+
+module Asciidoctor
+  module Diagram
+    class Server < Sinatra::Base
+      get '/:type/:format/:source' do
+        type = params['type']
+        accepts = lambda { |t| params['format'].downcase.to_sym == t }
+        raw_source = params['source']
+        decoded_source = Base64.urlsafe_decode64(raw_source)
+        decompressed_source = Zlib::Inflate.inflate(decoded_source)
+        source = decompressed_source
+        render_diagram(type, accepts, source, {})
+      end
+
+      post '/' do
+        params = JSON.parse(request.body.read)
+        type = params['diagram_type']
+        accepts = lambda { |t| params['output_format'].downcase.to_sym == t }
+        source = params['diagram_source']
+        render_diagram(type, accepts, source, {})
+      end
+
+      post '/:type' do
+        type = params['type'].to_sym
+        r = request
+        accepts = lambda { |t| r.accept?(to_mime_type(t)) }
+        source = request.body.read
+        render_diagram(type, accepts, source, {})
+      end
+
+      post '/:type/:format' do
+        type = params['type'].to_sym
+        accepts = lambda { |t| params['format'].downcase.to_sym == t }
+        source = request.body.read
+        render_diagram(type, accepts, source, {})
+      end
+
+      def to_mime_type(type)
+        case type
+        when :pdf
+          'application/pdf'
+        when :png
+          'image/png'
+        when :svg
+          'image/svg'
+        when :txt
+          'text/plain'
+        else
+          nil
+        end
+      end
+
+      def get_converter(type)
+        case type
+        when :graphviz
+          GraphvizConverter.new
+        else
+          nil
+        end
+      end
+
+      def render_diagram(type, accepts, code, 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)
+        diagram = converter.convert(source, format, options)
+
+        content_type to_mime_type(format)
+        diagram
+      end
+    end
+
+    class ServerSource
+      include Asciidoctor::Diagram::DiagramSource
+
+      def initialize(source, attributes)
+        @source = source
+        @attributes = attributes
+      end
+
+      def attr(name, default_value = nil, inherit = nil)
+        @attributes[name] || default_value
+      end
+
+      def base_dir
+        nil
+      end
+
+      def code
+        @source
+      end
+
+      def config
+        {}
+      end
+
+      def find_command(cmd, options = nil)
+        Asciidoctor::Diagram::Which.which(cmd, options)
+      end
+
+      def resolve_path(target, start = nil)
+        target
+      end
+
+      def image_name
+        "image"
+      end
+
+      def should_process?(image_file, image_metadata)
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class LilypondConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :pdf]
+      end
+
+      def collect_options(source, name)
+        {
+            :resolution => source.attr('resolution', nil, name)
+        }
+      end
+
+      def convert(source, format, options)
+        code = <<-EOF
+\\paper{
+  oddFooterMarkup=##f
+  oddHeaderMarkup=##f
+  bookTitleMarkup=##f
+  scoreTitleMarkup=##f
+}
+
+        EOF
+        code << source.to_s
+
+        resolution = options[:resolution]
+
+        generate_stdin(source.find_command('lilypond'), format.to_s, code) do |tool_path, output_path|
+          args = [tool_path, '-daux-files=#f', '-dbackend=eps', '-dno-gs-load-fonts', '-dinclude-eps-fonts', '-o', Platform.native_path(output_path), '-f', format.to_s]
+
+          args << '-dsafe'
+          args << "-dresolution=#{resolution}" if resolution
+          args << "-dpixmap-format=pngalpha" if format == :png
+
+          args << '-'
+
+          {
+              :args => args,
+              :out_file => "#{output_path}.#{format.to_s}"
+          }
+        end        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class LilypondBlockProcessor < DiagramBlockProcessor
+      use_converter LilypondConverter
+    end
+
+    class LilypondBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter LilypondConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/lilypond.rb

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

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

@@ -0,0 +1,122 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require 'tempfile'
+require 'open3'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class MemeConverter
+      include DiagramConverter
+
+
+      def supported_formats
+        [:png, :gif]
+      end
+
+
+      def collect_options(source, name)
+        bg_img = source.attr('background', nil, name)
+        raise "background attribute is required" unless bg_img
+
+        options = source.attr('options', '', name).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),
+            :noupcase => options.include?('noupcase'),
+        }
+      end
+
+      def convert(source, format, options)
+        convert = source.find_command('convert')
+        identify = source.find_command('identify')
+
+        bg_img = options[:bg_img]
+        raise "background attribute is required" unless bg_img
+
+        bg_img = source.resolve_path(bg_img, source.attr('imagesdir'))
+
+        top_label = options[:top]
+        bottom_label = options[:bottom]
+        fill_color = options[:fill_color] || 'white'
+        stroke_color = options[:stroke_color] || 'black'
+        stroke_width = options[:stroke_width] || '2'
+        font = options[:font] || 'Impact'
+        noupcase = options[:noupcase]
+
+        dimensions = Cli.run(identify, '-format', '%w %h', bg_img)[:out].match(/(?<w>\d+) (?<h>\d+)/)
+        bg_width = dimensions['w'].to_i
+        bg_height = dimensions['h'].to_i
+        label_width = bg_width
+        label_height = bg_height / 5
+
+        if top_label
+          top_img = Tempfile.new(['meme', '.png'])
+          Cli.run(
+              convert,
+              '-background', 'none',
+              '-fill', fill_color,
+              '-stroke', stroke_color,
+              '-strokewidth', stroke_width,
+              '-font', font,
+              '-size', "#{label_width}x#{label_height}",
+              '-gravity', 'north',
+              "label:#{prepare_label(top_label, noupcase)}",
+              top_img.path
+          )
+        else
+          top_img = nil
+        end
+
+        if bottom_label
+          bottom_img = Tempfile.new(['meme', '.png'])
+          Cli.run(
+              convert,
+              '-background', 'none',
+              '-fill', fill_color,
+              '-stroke', stroke_color,
+              '-strokewidth', stroke_width,
+              '-font', font,
+              '-size', "#{label_width}x#{label_height}",
+              '-gravity', 'south',
+              "label:#{prepare_label(bottom_label, noupcase)}",
+              bottom_img.path
+          )
+        else
+          bottom_img = nil
+        end
+
+        final_img = Tempfile.new(['meme', ".#{format.to_s}"])
+
+        args = [convert, bg_img]
+        if top_img
+          args << top_img.path << '-geometry' << '+0+0' << '-composite'
+        end
+
+        if bottom_img
+          args << bottom_img.path << '-geometry' << "+0+#{bg_height - label_height}" << '-composite'
+        end
+
+        args << final_img.path
+
+        Cli.run(*args)
+
+        File.binread(final_img)
+      end
+
+      private
+
+      def prepare_label(label, noupcase)
+        label = label.upcase unless noupcase
+        label = label.gsub(' // ', '\n')
+        label
+      end
+    end
+  end
+end