asciidoctor-diagram 1.5.19 → 2.0.0

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

@@ -1,61 +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 Lilypond
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :pdf].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            lilypond(parent, source, f)
-          end
-        end
-      end
-
-      def lilypond(parent, source, format)
-        code = <<-EOF
-\\paper{
-  oddFooterMarkup=##f
-  oddHeaderMarkup=##f
-  bookTitleMarkup=##f
-  scoreTitleMarkup=##f
-}
-
-        EOF
-        code << source.to_s
-
-        inherit_prefix = name
-        resolution = source.attr('resolution', nil, inherit_prefix)
-
-        generate_stdin(which(parent, '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
-
-    class LilypondBlockProcessor < Extensions::DiagramBlockProcessor
-      include Lilypond
+    class LilypondBlockProcessor < DiagramBlockProcessor
+      use_converter LilypondConverter
     end
 
-    class LilypondBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Lilypond
+    class LilypondBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter LilypondConverter
     end
   end
 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

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

@@ -1,112 +1,10 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/which'
-require 'tempfile'
-require 'open3'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Meme
-      include Which
-
-      def self.included(mod)
-        [:png, :gif].each do |format|
-          mod.register_format(format, :image) do |parent, source|
-            meme(parent, source, format)
-          end
-        end
-      end
-
-      def meme(parent_block, source, format)
-        convert = which(parent_block, 'convert')
-        identify = which(parent_block, 'identify')
-        inherit_prefix = name
-
-        bg_img = source.attr('background', nil, inherit_prefix)
-        raise "background attribute is required" unless bg_img
-
-        bg_img = parent_block.normalize_system_path(bg_img, parent_block.attr('imagesdir'))
-
-        top_label = source.attr('top')
-        bottom_label = source.attr('bottom')
-        fill_color = source.attr('fillColor', 'white', inherit_prefix)
-        stroke_color = source.attr('strokeColor', 'black', inherit_prefix)
-        stroke_width = source.attr('strokeWidth', '2', inherit_prefix)
-        font = source.attr('font', 'Impact', inherit_prefix)
-        options = source.attr('options', '', inherit_prefix).split(',')
-        noupcase = options.include?('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
-
-    class MemeBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Meme
+    class MemeBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter MemeConverter
 
       class StringReader
         def initialize(str)
@@ -123,7 +21,7 @@ module Asciidoctor
       def create_source(parent, target, attributes)
         attributes = attributes.dup
         attributes['background'] = apply_target_subs(parent, target)
-        ::Asciidoctor::Diagram::Extensions::ReaderSource.new(parent, StringReader.new(''), attributes)
+        ::Asciidoctor::Diagram::ReaderSource.new(self, parent, StringReader.new(''), attributes)
       end
     end
   end