asciidoctor-diagram 2.0.2 → 2.1.2

data/lib/asciidoctor-diagram/diagrams.rb

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

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

@@ -0,0 +1,49 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class DiagramsConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg, :pdf]
+      end
+
+      def convert(source, format, options)
+        python_path = source.find_command('python3', :attrs => ['diagrams-python'], :alt_cmds => ['python'])
+
+        code = source.to_s
+
+        match_data = /Diagram\((.*?)\)/.match(code)
+        raise "Could not find Diagram constructor" unless match_data
+
+        args = match_data[1].strip
+
+        target_file = Tempfile.new('diagrams')
+
+        diagram = 'Diagram('
+        diagram << args
+        diagram << ',' unless args.empty?
+        diagram << "filename=\"#{target_file.path}\""
+        diagram << ",outformat=\"#{format}\""
+        diagram << ')'
+
+        code = match_data.pre_match + diagram + match_data.post_match
+
+        begin
+          target_file.close
+          generate_stdin_file(python_path, code, target_file.path + ".#{format}") do |tool|
+            [tool, '-']
+          end
+        ensure
+          target_file.unlink
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class DiagramsBlockProcessor < DiagramBlockProcessor
+      use_converter DiagramsConverter
+    end
+
+    class DiagramsBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter DiagramsConverter
+    end
+  end
+end

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

@@ -23,27 +23,40 @@ module Asciidoctor
           :transparent => lambda { |o, v| o  << '--transparent' if v == 'true'}
       }
 
-      JARS = ['ditaa-1.3.15.jar', 'ditaamini-0.12.jar'].map do |jar|
-        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
-      end
-      Java.classpath.concat JARS
-
+      CLASSPATH_ENV = 'DIAGRAM_DITAA_CLASSPATH'
+      DITAA_JARS = if ENV.has_key?(CLASSPATH_ENV)
+                        ENV[CLASSPATH_ENV].split(File::PATH_SEPARATOR)
+                      else
+                        begin
+                          require 'asciidoctor-diagram/ditaa/classpath'
+                          ::Asciidoctor::Diagram::DitaaClasspath::JAR_FILES
+                        rescue LoadError
+                          raise "Could not load PlantUML. Eiter require 'asciidoctor-diagram-ditaamini' or specify the location of the PlantUML JAR(s) using the 'DIAGRAM_DITAA_CLASSPATH' environment variable."
+                        end
+                      end
+
+      Java.classpath.concat Dir[File.join(File.dirname(__FILE__), '*.jar')]
+      Java.classpath.concat DITAA_JARS
 
       def supported_formats
         [: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

@@ -11,6 +11,8 @@ module Asciidoctor
   module Diagram
     # @private
     class HttpConverter
+      DEFAULT_MAX_GET_SIZE = 1024
+
       include DiagramConverter
 
       def initialize(base_uri, type, converter)
@@ -23,10 +25,12 @@ module Asciidoctor
         @converter.supported_formats
       end
 
-      def collect_options(source, name)
-        {
-            :block_name => name
-        }
+      def collect_options(source)
+        options = {}
+
+        options[:max_get_size] = source.global_attr('max-get-size', DEFAULT_MAX_GET_SIZE).to_i
+
+        options
       end
 
       def convert(source, format, options)
@@ -47,30 +51,64 @@ module Asciidoctor
           encoded = Base64.urlsafe_encode64(compressed)
           data = '0A' + encoded
 
-          path = uri.path
+          path = uri.path.dup
           path << '/' unless path.end_with? '/'
           path << format.to_s
-          path << '/' << data
         when :kroki_io
           compressed = Zlib.deflate(code, Zlib::BEST_COMPRESSION)
           data = Base64.urlsafe_encode64(compressed)
 
-          path = uri.path
+          path = uri.path.dup
           path << '/' unless path.end_with? '/'
-          path << options[:block_name].to_s
+          path << source.diagram_type.to_s
           path << '/' << format.to_s
-          path << '/' << data
         else
           raise "Unsupported server type: " + @type
         end
 
+        get_path = path.dup << '/' << data
+
+        if get_path.length > options[:max_get_size]
+          uri.path = path
+          get_uri(uri, code, 'text/plain; charset=utf-8')
+        else
+          uri.path = get_path
+          get_uri(uri)
+        end
+      end
+
+      private
+
+      def get_uri(uri, post_data = nil, post_content_type = nil, attempt = 1)
+        if attempt >= 10
+          raise "Too many redirects"
+        end
+
+        if post_data.nil?
+          request = Net::HTTP::Get.new(uri.path)
+        else
+          request = Net::HTTP::Post.new(uri.path)
+          request.body = post_data
+          request.set_content_type(post_content_type) if post_content_type
+        end
+
         Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme.downcase == 'https') do |http|
-          response = http.request_get path
+          response = http.request(request)
           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?
+                resolved_uri = uri + location
+              else
+                resolved_uri = new_uri
+              end
+
+              get_uri(resolved_uri, post_data, post_content_type, attempt + 1)
+            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
 
@@ -99,7 +104,7 @@ module Asciidoctor
         nil
       end
 
-      def code
+      def load_code
         @source
       end
 

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

@@ -9,14 +9,24 @@ module Asciidoctor
       include DiagramConverter
       include CliGenerator
 
+      EXTRA_PATH = []
+
+      if ::Asciidoctor::Diagram::Platform.os == :macosx
+        lilypond_app = ::Asciidoctor::Diagram::Which.which('LilyPond.app', :path => ['/Applications'])
+        if lilypond_app
+          EXTRA_PATH << File.join(lilypond_app, 'Contents/Resources/bin')
+        end
+      end
+
+      EXTRA_PATH.freeze
 
       def supported_formats
         [:png, :pdf]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {
-            :resolution => source.attr('resolution', nil, name)
+            :resolution => source.attr('resolution')
         }
       end
 
@@ -34,7 +44,7 @@ module Asciidoctor
 
         resolution = options[:resolution]
 
-        generate_stdin(source.find_command('lilypond'), format.to_s, code) do |tool_path, output_path|
+        generate_stdin(source.find_command('lilypond', :path => EXTRA_PATH), 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'

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

@@ -15,27 +15,35 @@ 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
 
       def convert(source, format, options)
-        convert = source.find_command('convert')
-        identify = source.find_command('identify')
+        magick = source.find_command('magick', :raise_on_error => false)
+        if magick
+          convert = ->(*args) { Cli.run(magick, 'convert', *args) }
+          identify = ->(*args) { Cli.run(magick, 'identify', *args) }
+        else
+          convert_cmd = source.find_command('convert')
+          convert = ->(*args) { Cli.run(convert_cmd, *args) }
+          identify_cmd = source.find_command('identify')
+          identify = ->(*args) { Cli.run(identify_cmd, *args) }
+        end
 
         bg_img = options[:bg_img]
         raise "background attribute is required" unless bg_img
@@ -50,7 +58,7 @@ module Asciidoctor
         font = options[:font] || 'Impact'
         noupcase = options[:noupcase]
 
-        dimensions = Cli.run(identify, '-format', '%w %h', bg_img)[:out].match(/(?<w>\d+) (?<h>\d+)/)
+        dimensions = identify.call('-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
@@ -58,8 +66,7 @@ module Asciidoctor
 
         if top_label
           top_img = Tempfile.new(['meme', '.png'])
-          Cli.run(
-              convert,
+          convert.call(
               '-background', 'none',
               '-fill', fill_color,
               '-stroke', stroke_color,
@@ -76,8 +83,7 @@ module Asciidoctor
 
         if bottom_label
           bottom_img = Tempfile.new(['meme', '.png'])
-          Cli.run(
-              convert,
+          convert.call(
               '-background', 'none',
               '-fill', fill_color,
               '-stroke', stroke_color,
@@ -94,7 +100,7 @@ module Asciidoctor
 
         final_img = Tempfile.new(['meme', ".#{format.to_s}"])
 
-        args = [convert, bg_img]
+        args = [bg_img]
         if top_img
           args << top_img.path << '-geometry' << '+0+0' << '-composite'
         end
@@ -105,7 +111,7 @@ module Asciidoctor
 
         args << final_img.path
 
-        Cli.run(*args)
+        convert.call(*args)
 
         File.binread(final_img)
       end