asciidoctor-diagram 1.3.0.preview.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec30717e348b864e01a962749e47514a55c1106c
-  data.tar.gz: 3d85e72167829121d471faa6f20586cc2eb1eab4
+  metadata.gz: 3a2f204cc0c29acb26136512bd4a8d50b94eb19d
+  data.tar.gz: 0115d195b3546f4ab1a1967a45891769b4d28fb5
 SHA512:
-  metadata.gz: daedbb3ba7ef2bc7517ba7c67052a6ee9e468adf5a5ca710bbc3ca80f3dbdf078748b679696d95f791121e651f920d25bdf039e88ace183fde759f32c18b75ba
-  data.tar.gz: ff54af102f2a7d21eefa591f4db10985826c97f2eff4044bb305a91f2c0cc888f5d965fddea4bba4f75ad96ed03baa2f5bcca8edf6e952d664c5cd8663183cd7
+  metadata.gz: 8bedbbef25acb0ea9d0617b67521f8b92f57a66a730f58b35090e221936cc3ee3a1ff76af260f78f7ccec6e88467188744b048e9997701c46d667e37f2f142f6
+  data.tar.gz: fc0668cb0299126c80f392efccba75c8eda819a835e69b3c27c99fd57c50d1d4b312271bba3cbae7cbebf34a23dbd56a7adfd470a7a48fe8079fb3b4ae210345

data/CHANGELOG.adoc

@@ -8,7 +8,15 @@ Enhancements::
   * Add support for Actdiag diagrams (requires Actdiag to be installed separately)
   * Add support for Seqdiag diagrams (requires Seqdiag to be installed separately)
   * Add support for Nwdiag diagrams (requires Nwdiag to be installed separately)
-  * Updated PlantUML to revision 8004 (23/08/2014)
+  * Updated PlantUML to revision 8021 (14/03/2015)
+  * Remove dependency on RJB to simplify installation
+  * Add diagram scaling support using the scale attribute
+  * Add Ditaa command line option support using the options attribute
+
+Bug Fixes::
+
+  * Issue #49: Resolve issue that made Java 6 installation prompt appear on Mac OS X
+  * Issue #51: Resolved issue where PNG files generated by Graphviz were not processed correctly on Windows
 
 == 1.2.0
 

data/README.adoc

@@ -14,6 +14,12 @@ The extension takes care of running the diagram processor to generate the images
 
 This gem was inspired by the https://code.google.com/p/asciidoc-plantuml/[AsciiDoc PlantUML filter] for AsciiDoc Python.
 
+== Status
+
+image:https://travis-ci.org/asciidoctor/asciidoctor-diagram.svg?branch=master["Linux Build Status", link="https://travis-ci.org/asciidoctor/asciidoctor-diagram"]
+
+image:https://ci.appveyor.com/api/projects/status/4r4gkk5gy3igs6nh/branch/master?svg=true["Windows Build Status", link="https://ci.appveyor.com/project/asciidoctor/asciidoctor-diagram"]
+
 == Installation
 
 Add this line to your application's Gemfile:
@@ -91,6 +97,12 @@ The diagram blocks support the following attributes:
 . `target` (or 2nd position): the basename of the file to generate. If not specified an auto-generated name will be used.
 . `format` (or 3rd position): the output format. PlantUML blocks support `png`, `svg` and `txt`. Graphviz, Shaape and BlockDiag support `png` and `svg`. Ditaa only supports `png`.
 
+Once you have all of this in place and your original AsciiDoc file contains a diagram block, it's time to build it into an HTML file with Asciidoctor Diagram magic! 
+When executing Asciidoctor, you must reference the Adciidoctor Diagram library, otherwise your diagam blocks won't be recognized as such. When executing Asciidoctor from the command line, do it using the -r parameter to reference this external library:
+
+$ asciidoctor -r asciidoctor-diagram doc.adoc
+
+
 == Contributing
 
 . Fork it

data/Rakefile

@@ -1,13 +1,14 @@
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:test)
+test = RSpec::Core::RakeTask.new(:test)
+
+if ENV['APPVEYOR']
+  # Exclude diagram types that require external libraries that are difficult to build on Windows.
+  test.exclude_pattern = 'spec/**/{blockdiag,shaape}_spec.rb'
+end
 
 task :default => :test
 
-['ruby', 'java'].map do |platform|
-  $platform = platform
-  Gem::Specification.reset
-  spec = Gem::Specification.load('asciidoctor-diagram.gemspec')
-  Gem::PackageTask.new(spec) { |task| }
-end
+spec = Gem::Specification.load('asciidoctor-diagram.gemspec')
+Gem::PackageTask.new(spec) { |task| }

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

@@ -1,3 +1,5 @@
+require 'set'
+
 require_relative '../extensions'
 require_relative '../util/java'
 
@@ -5,31 +7,81 @@ module Asciidoctor
   module Diagram
     # @private
     module Ditaa
-      DITAA_JAR_PATH = File.expand_path File.join('../..', 'ditaamini0_9.jar'), File.dirname(__FILE__)
-      Java.classpath << DITAA_JAR_PATH
+      JARS = ['ditaamini-0.10.jar'].map do |jar|
+        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
+      end
+      Java.classpath.concat JARS
 
-      def ditaa(code)
+      def ditaa(code, source)
         Java.load
 
-        args = ['-e', 'UTF-8']
+        response = Java.send_request(
+            :url => '/ditaa',
+            :body => code,
+            :headers => {
+                'X-Options' => source.options
+            }
+        )
+
+        unless response[:code] == 200
+          raise "Ditaa image generation failed: #{response[:reason]} #{response[:body]}"
+        end
+
+        response[:body]
+      end
 
-        bytes = code.encode(Encoding::UTF_8).bytes.to_a
-        bis = Java.new_object(Java.java.io.ByteArrayInputStream, '[B', Java.array_to_java_array(bytes, :byte))
-        bos = Java.new_object(Java.java.io.ByteArrayOutputStream)
-        result_code = Java.org.stathissideris.ascii2image.core.CommandLineConverter.convert(Java.array_to_java_array(args, :string), bis, bos)
-        bis.close
-        bos.close
+      def self.included(mod)
+        mod.register_format(:png, :image) do |c, _, source|
+          ditaa(c.to_s, source)
+        end
+      end
 
-        result = Java.string_from_java_bytes(bos.toByteArray)
+      def create_source(parent, reader, attributes)
+        source = super(parent, reader, attributes)
+        source.extend DitaaSource
 
-        raise "Ditaa image generation failed: #{result}" unless result_code == 0
+        source.init_ditaa_options(parent, attributes)
 
-        result
+        source
       end
 
-      def self.included(mod)
-        mod.register_format(:png, :image) do |c|
-          ditaa(c.to_s)
+      module DitaaSource
+        attr_reader :options
+
+        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'}
+        }
+
+        def init_ditaa_options(parent, attributes)
+          global_attributes = parent.document.attributes
+
+          options = []
+
+          OPTIONS.keys.each do |key|
+            value = attributes.delete(key) || global_attributes["ditaa-option-#{key}"]
+            OPTIONS[key].call(options, value)
+          end
+
+          @options = options.join(' ')
+        end
+
+        def should_process?(image_file, image_metadata)
+          super(image_file, image_metadata) || image_metadata['options'] != @options
+        end
+
+        def create_image_metadata
+          metadata = super
+          metadata['options'] = @options
+          metadata
         end
       end
     end

data/lib/asciidoctor-diagram/extensions.rb

@@ -27,6 +27,8 @@ module Asciidoctor
         #     File.read(source.to_s)
         #   end
         def register_format(format, type, &block)
+          raise "Unsupported output type: #{type}" unless type == :image || type == :literal
+
           unless @default_format
             @default_format = format
           end
@@ -35,7 +37,7 @@ module Asciidoctor
               :type => type,
               :generator => block
           }
-        end
+       end
 
         # Returns the registered formats
         #
@@ -82,9 +84,9 @@ module Asciidoctor
         # @param attributes [Hash] the attributes of the block or block macro
         # @return [Asciidoctor::AbstractBlock] a new block that replaces the original block or block macro
         def process(parent, reader_or_target, attributes)
-          source = create_source(parent, reader_or_target, attributes)
+          source = create_source(parent, reader_or_target, attributes.dup)
 
-          format = attributes.delete('format') || self.class.default_format
+          format = source.attributes.delete('format') || self.class.default_format
           format = format.to_sym if format.respond_to?(:to_sym)
 
           raise "Format undefined" unless format
@@ -93,13 +95,19 @@ module Asciidoctor
 
           raise "#{self.class.name} does not support output format #{format}" unless generator_info
 
-          case generator_info[:type]
-            when :image
-              create_image_block(parent, source, attributes, format, generator_info)
-            when :literal
-              create_literal_block(parent, source, attributes, generator_info)
-            else
-              raise "Unsupported output format: #{format}"
+          begin
+            case generator_info[:type]
+              when :literal
+                create_literal_block(parent, source, generator_info)
+              else
+                create_image_block(parent, source, format, generator_info)
+            end
+          rescue => e
+            text = "Failed to generate image: #{e.message}"
+            warn %(asciidoctor-diagram: ERROR: #{text})
+            text << "\n"
+            text << source.code
+            Asciidoctor::Block.new parent, :listing, :source => text, :attributes => attributes
           end
         end
 
@@ -121,10 +129,9 @@ module Asciidoctor
         end
 
         private
-        def create_image_block(parent, source, attributes, format, generator_info)
+        def create_image_block(parent, source, format, generator_info)
           image_name = "#{source.image_name}.#{format}"
-          outdir = parent.document.attr('imagesoutdir') || parent.document.attr('outdir')
-          image_dir = parent.normalize_system_path parent.document.attr 'imagesdir', outdir
+          image_dir = image_output_dir(parent)
           image_file = parent.normalize_system_path image_name, image_dir
           metadata_file = parent.normalize_system_path "#{image_name}.cache", image_dir
 
@@ -134,10 +141,12 @@ module Asciidoctor
             metadata = {}
           end
 
+          image_attributes = source.attributes
+
           if !File.exists?(image_file) || source.should_process?(image_file, metadata)
             params = IMAGE_PARAMS[format]
 
-            result = instance_exec(source, parent, &generator_info[:generator])
+            result = instance_exec(source, parent, source, &generator_info[:generator])
 
             result.force_encoding(params[:encoding])
 
@@ -149,16 +158,29 @@ module Asciidoctor
             File.open(metadata_file, 'w') { |f| JSON.dump(metadata, f) }
           end
 
-          image_attributes = attributes.dup
           image_attributes['target'] = image_name
+
+          scale = image_attributes['scale']
+          if scalematch = /(\d+(?:\.\d+))/.match(scale)
+            scale_factor = scalematch[1].to_f
+          else
+            scale_factor = 1.0
+          end
+
           if /html/i =~ parent.document.attributes['backend']
-            image_attributes['width'] ||= metadata['width'] if metadata['width']
-            image_attributes['height'] ||= metadata['height'] if metadata['height']
+            image_attributes.delete('scale')
+            if metadata['width'] && !image_attributes['width']
+              image_attributes['width'] = (metadata['width'] * scale_factor).to_i
+            end
+            if metadata['height'] && !image_attributes['height']
+              image_attributes['height'] = (metadata['height'] * scale_factor).to_i
+            end
           end
-          image_attributes['alt'] ||= if title_text = attributes['title']
+
+          image_attributes['alt'] ||= if title_text = image_attributes['title']
                                         title_text
-                                      elsif target = attributes['target']
-                                        (File.basename target, (File.extname target) || '').tr '_-', ' '
+                                      elsif target = image_attributes['target']
+                                        (File.basename(target, File.extname(target)) || '').tr '_-', ' '
                                       else
                                         'Diagram'
                                       end
@@ -166,8 +188,33 @@ module Asciidoctor
           Asciidoctor::Block.new parent, :image, :content_model => :empty, :attributes => image_attributes
         end
 
-        def create_literal_block(parent, source, attributes, generator_info)
-          literal_attributes = attributes.dup
+        def scale(size, factor)
+          if match = /(\d+)(.*)/.match(size)
+            value = match[1].to_i
+            unit = match[2]
+            (value * factor).to_i.to_s + unit
+          else
+            size
+          end
+        end
+
+        def image_output_dir(parent)
+          document = parent.document
+
+          images_dir = document.attr('imagesoutdir')
+
+          if images_dir
+            base_dir = nil
+          else
+            base_dir = document.attr('outdir') || (document.respond_to?(:options) && document.options[:to_dir])
+            images_dir = document.attr('imagesdir')
+          end
+
+          parent.normalize_system_path(images_dir, base_dir)
+        end
+
+        def create_literal_block(parent, source, generator_info)
+          literal_attributes = source.attributes
           literal_attributes.delete('target')
 
           result = instance_exec(source, parent, &generator_info[:generator])
@@ -207,7 +254,7 @@ module Asciidoctor
         #
         # @return [FileSource] a FileSource
         def create_source(parent, target, attributes)
-          FileSource.new(File.expand_path(target, parent.document.attributes['docdir']), attributes)
+          FileSource.new(File.expand_path(target, parent.document.base_dir), attributes)
         end
       end
 
@@ -256,6 +303,8 @@ module Asciidoctor
       class BasicSource
         include DiagramSource
 
+        attr_reader :attributes
+
         def initialize(attributes)
           @attributes = attributes
         end
@@ -317,7 +366,9 @@ module Asciidoctor
         end
 
         def code
-          @code ||= File.read(@file_name)
+          lines = File.readlines(@file_name)
+          lines = ::Asciidoctor::Helpers.normalize_lines(lines)
+          @code ||= lines.join("\n")
         end
       end
     end

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

@@ -6,70 +6,80 @@ module Asciidoctor
     module PlantUml
       private
 
-      PLANTUML_JAR_PATH = File.expand_path File.join('../..', 'plantuml.jar'), File.dirname(__FILE__)
-      Java.classpath << PLANTUML_JAR_PATH
-
-      def plantuml(parent, code, tag, *flags)
-        unless @graphvizdot
-          @graphvizdot = parent.document.attributes['dot']
-          @graphvizdot = ::Asciidoctor::Diagram.which('dot') unless @graphvizdot && File.executable?(@graphvizdot)
-          raise "Could not find the Graphviz 'dot' executable in PATH; add it to the PATH or specify its location using the 'dot' document attribute" unless @graphvizdot
-        end
+      JARS = ['plantuml.jar'].map do |jar|
+        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
+      end
+      Java.classpath.concat JARS
 
+      def plantuml(parent, code, tag, mime_type)
         Java.load
 
         code = "@start#{tag}\n#{code}\n@end#{tag}" unless code.index "@start#{tag}"
 
-        flags += ['-charset', 'UTF-8', '-failonerror', '-graphvizdot', @graphvizdot]
+        headers = {
+            'Accept' => mime_type
+        }
 
         config_file = parent.document.attributes['plantumlconfig']
         if config_file
-          flags += ['-config', File.expand_path(config_file, parent.document.attributes['docdir'])]
+          headers['X-PlantUML-Config'] = File.expand_path(config_file, parent.document.attributes['docdir'])
         end
 
-        option = Java.new_object( Java.net.sourceforge.plantuml.Option, '[Ljava.lang.String;', Java.array_to_java_array(flags, :string) )
-        source_reader = Java.new_object( Java.net.sourceforge.plantuml.SourceStringReader,
-                                         'Lnet.sourceforge.plantuml.preproc.Defines;Ljava.lang.String;Ljava.util.List;',
-                                         Java.new_object( Java.net.sourceforge.plantuml.preproc.Defines ),
-                                         code,
-                                         option.getConfig()
+        response = Java.send_request(
+            :url => '/plantuml',
+            :body => code,
+            :headers => headers
         )
 
-        bos = Java.new_object( Java.java.io.ByteArrayOutputStream )
-        ps = Java.new_object( Java.java.io.PrintStream, 'Ljava.io.OutputStream;', bos )
-        source_reader.generateImage(ps, 0, option.getFileFormatOption())
-        ps.close
-        Java.string_from_java_bytes(bos.toByteArray)
-      end
-
-      def config_args(parent)
-        config_args = []
-        config = parent.document.attributes['plantumlconfig']
-        if config
-          config_args += ['-config', File.expand_path(config, parent.document.attributes['docdir'])]
+        unless response[:code] == 200
+          raise "PlantUML image generation failed: #{response[:reason]} #{response[:body]}"
         end
 
-        config_args
+        response[:body]
       end
 
       def self.included(mod)
         mod.register_format(:png, :image) do |c, p|
-          plantuml(p, c.to_s, 'uml', *config_args(p))
+          plantuml(p, c.to_s, mod.tag, 'image/png')
         end
         mod.register_format(:svg, :image) do |c, p|
-          plantuml(p, c.to_s, 'uml', '-tsvg', *config_args(p))
+          plantuml(p, c.to_s, mod.tag, 'image/svg+xml')
         end
         mod.register_format(:txt, :literal) do |c, p|
-          plantuml(p, c.to_s, 'uml', '-tutxt', *config_args(p))
+          plantuml(p, c.to_s, mod.tag, 'text/plain;charset=utf-8')
         end
       end
     end
 
     class PlantUmlBlockProcessor < Extensions::DiagramBlockProcessor
+      def self.tag
+        'uml'
+      end
+
       include PlantUml
     end
 
     class PlantUmlBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
+      def self.tag
+        'uml'
+      end
+
+      include PlantUml
+    end
+
+    class SaltBlockProcessor < Extensions::DiagramBlockProcessor
+      def self.tag
+        'salt'
+      end
+
+      include PlantUml
+    end
+
+    class SaltBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
+      def self.tag
+        'salt'
+      end
+
       include PlantUml
     end
   end

data/lib/asciidoctor-diagram/salt.rb

@@ -0,0 +1,9 @@
+require 'asciidoctor/extensions'
+require_relative 'version'
+
+Asciidoctor::Extensions.register do
+  require_relative 'plantuml/extension'
+
+  block Asciidoctor::Diagram::SaltBlockProcessor, :salt
+  block_macro Asciidoctor::Diagram::SaltBlockMacroProcessor, :salt
+end

data/lib/asciidoctor-diagram/util/cli_generator.rb

@@ -31,7 +31,7 @@ module Asciidoctor
 
           raise "#{tool} image generation failed" unless result_code == 0
 
-          File.read(target_file.path)
+          File.binread(target_file.path)
         ensure
           target_file.unlink
         end

data/lib/asciidoctor-diagram/util/java.rb

@@ -1,5 +1,81 @@
+module Asciidoctor
+  module Diagram
+    # @private
+    module Java
+      def self.classpath
+        @classpath ||= [
+            File.expand_path(File.join('../..', 'asciidoctor-diagram-java-1.3.4.jar'), File.dirname(__FILE__))
+        ]
+      end
+
+      CRLF = "\r\n".encode(Encoding::US_ASCII)
+
+      def self.format_request(req, io)
+        io.set_encoding Encoding::US_ASCII
+        io.write "POST #{req[:url]} HTTP/1.1"
+        io.write CRLF
+
+        headers = req[:headers]
+        if headers
+          headers.each_pair do |key, value|
+            io.write "#{key}: #{value}"
+            io.write CRLF
+          end
+        end
+
+        if req[:body]
+          unless headers && headers['Content-Length']
+            io.write 'Content-Length: '
+            io.write req[:body].bytesize.to_s
+            io.write CRLF
+          end
+
+          unless headers && headers['Content-Type']
+            io.write 'Content-Type: text/plain; charset='
+            io.write req[:body].encoding.name
+            io.write CRLF
+          end
+        end
+
+        io.write CRLF
+
+        io.set_encoding Encoding::BINARY
+        io.write req[:body]
+      end
+
+      STATUS_LINE = Regexp.new("HTTP/1.1 (\\d+) (.*)\r\n".encode(Encoding::US_ASCII))
+
+      def self.parse_response(io)
+        resp = {}
+
+        io.set_encoding Encoding::US_ASCII
+        status_line = io.readline(CRLF)
+        status_line_parts = STATUS_LINE.match status_line
+        resp[:code] = status_line_parts[1].to_i
+        resp[:reason] = status_line_parts[2]
+
+        headers = {}
+        until (header = io.readline(CRLF).strip).empty?
+          key, value = header.split ':', 2
+          headers[key] = value.strip
+        end
+
+        resp[:headers] = headers
+
+        content_length = headers['Content-Length']
+        if content_length
+          io.set_encoding Encoding::BINARY
+          resp[:body] = io.read(content_length.to_i)
+        end
+
+        resp
+      end
+    end
+  end
+end
+
 if RUBY_PLATFORM == "java"
   require_relative 'java_jruby'
 else
-  require_relative 'java_rjb'
+  require_relative 'java_socket'
 end

data/lib/asciidoctor-diagram/util/java_jruby.rb

@@ -1,40 +1,33 @@
 require 'java'
+require 'stringio'
 
 module Asciidoctor
   module Diagram
     # @private
     module Java
-      def self.classpath
-        @classpath ||= []
-      end
-
       def self.load
         if @loaded
           return
         end
 
-        classpath.each { |j| require j }
+        classpath.flatten.each { |j| require j }
         @loaded = true
       end
 
-      def self.array_to_java_array(array, type)
-        array.to_java(type)
-      end
+      def self.send_request(req)
+        cp = ::Java.org.asciidoctor.diagram.CommandProcessor.new()
 
-      def self.string_from_java_bytes(bytes)
-        String.from_java_bytes(bytes)
-      end
+        req_io = StringIO.new
+        format_request(req, req_io)
+        req_io.close
 
-      def self.method_missing(meth, *args, &block)
-        raise "No arguments expected" unless args.empty?
-        raise "No block expected" if block
+        response = cp.processRequest(req_io.string.to_java_bytes)
 
-        load
-        ::Java.send(meth)
-      end
+        resp_io = StringIO.new(String.from_java_bytes(response))
+        resp = parse_response(resp_io)
+        resp_io.close
 
-      def self.new_object(java_class, signature = nil, *args)
-        java_class.new(*args)
+        resp
       end
     end
   end

data/lib/asciidoctor-diagram/util/java_socket.rb

@@ -0,0 +1,107 @@
+require 'socket'
+
+require_relative 'which'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    module Java
+      class CommandServer
+        attr_reader :port
+
+        def initialize(java, classpath)
+          args = []
+          args << '-Djava.awt.headless=true'
+          args << '-cp'
+          args << classpath.flatten.join(File::PATH_SEPARATOR)
+          args << 'org.asciidoctor.diagram.CommandServer'
+
+          @server = IO.popen([java, *args])
+          @port = @server.readline.strip.to_i
+          @client = TCPSocket.new 'localhost', port
+        end
+
+        def io
+          @client
+        end
+
+        def shutdown
+          # KILL is a bit heavy handed, but TERM does not seem to shut down the JVM on Windows.
+          Process.kill('KILL', @server.pid)
+        end
+      end
+
+      def self.load
+        if @loaded
+          return
+        end
+
+        instance
+        @loaded = true
+      end
+
+      def self.instance
+        @java_exe ||= find_java
+        raise "Could not find Java executable" unless @java_exe
+
+        unless @command_server
+          server = CommandServer.new(@java_exe, classpath)
+          @command_server = server
+          at_exit do
+            server.shutdown
+          end
+        end
+
+        @command_server
+      end
+
+      def self.send_request(req)
+        svr = instance
+        headers = req[:headers] ||= {}
+        headers['Host'] = "localhost:#{svr.port}"
+        format_request(req, svr.io)
+        parse_response(svr.io)
+      end
+
+      private
+      def self.find_java
+        if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+          # Windows
+          path_to(ENV['JAVA_HOME'], 'bin/java.exe') || registry_lookup || ::Asciidoctor::Diagram.which('java')
+        elsif /darwin/ =~ RUBY_PLATFORM
+          # Mac
+          path_to(ENV['JAVA_HOME'], 'bin/java') || path_to(`/usr/libexec/java_home`.strip, 'bin/java') || ::Asciidoctor::Diagram.which('java')
+        else
+          # Other unix-like system
+          path_to(ENV['JAVA_HOME'], 'bin/java') || ::Asciidoctor::Diagram.which('java')
+        end
+      end
+
+      def self.path_to(java_home, java_binary)
+        exe_path = File.expand_path(java_binary, java_home)
+        if File.executable?(exe_path)
+          exe_path
+        else
+          nil
+        end
+      end
+
+      def self.registry_lookup
+        key_re = /^HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\.*\\([0-9\.]+)/
+        value_re = /\s*JavaHome\s*REG_SZ\s*(.*)/
+        result = `reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft" /s /v JavaHome`.lines.map { |l| l.strip }
+        vms = result.each_slice(3).map do |_, key, value|
+          key_match = key_re.match(key)
+          value_match = value_re.match(value)
+          if key_match && value_match
+            [key_match[1].split('.').map { |v| v.to_i }, value_match[1]]
+          else
+            nil
+          end
+        end.reject { |v| v.nil? }.sort_by { |v| v[0] }
+        java_exes = vms.map { |version, path| File.expand_path('bin/java.exe', path) }.select { |exe| File.executable?(exe) }
+        java_exes && java_exes[0]
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.3.0.preview.1"
+    VERSION = "1.3.0"
   end
 end

data/lib/asciidoctor-diagram.rb

@@ -2,4 +2,5 @@ require 'asciidoctor-diagram/blockdiag'
 require 'asciidoctor-diagram/ditaa'
 require 'asciidoctor-diagram/graphviz'
 require 'asciidoctor-diagram/plantuml'
+require 'asciidoctor-diagram/salt'
 require 'asciidoctor-diagram/shaape'

data/spec/ditaa_spec.rb

@@ -118,4 +118,72 @@ Doc Writer <doc@example.com>
     expect(target).to match /\.png$/
     expect(File.exists?(target)).to be true
   end
+
+  it "should support ditaa options as attributes" do
+    doc = <<-eos
+:ditaa-option-antialias: false
+:ditaa-option-round-corners: true
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[ditaa, shadows=false, separation=false, round-corners=false, scale=2.3]
+----
++--------+   +-------+    +-------+
+|        | --+ ditaa +--> |       |
+|  Text  |   +-------+    |diagram|
+|Document|   |!magic!|    |       |
+|     {d}|   |       |    |       |
++---+----+   +-------+    +-------+
+    :                         ^
+    |       Lots of work      |
+    +-------------------------+
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc)
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+    target = b.attributes['target']
+    expect(target).to match /\.png$/
+    expect(File.exists?(target)).to be true
+  end
+
+  it "should regenerate images when options change" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[ditaa, {opts}]
+----
++--------+   +-------+    +-------+
+|        | --+ ditaa +--> |       |
+|  Text  |   +-------+    |diagram|
+|Document|   |!magic!|    |       |
+|     {d}|   |       |    |       |
++---+----+   +-------+    +-------+
+    :                         ^
+    |       Lots of work      |
+    +-------------------------+
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc.sub('{opts}', 'shadow=false'))
+    b = d.find { |b| b.context == :image }
+    target = b.attributes['target']
+    mtime1 = File.mtime(target)
+
+    sleep 1
+
+    d = Asciidoctor.load StringIO.new(doc.sub('{opts}', 'round-corners=true'))
+
+    mtime2 = File.mtime(target)
+
+    expect(mtime2).to be > mtime1
+  end
 end

data/spec/plantuml_spec.rb

@@ -297,6 +297,31 @@ Foo1 -> Foo2 : To boundary
     expect(File.exists?(File.expand_path(target, 'foo'))).to be true
   end
 
+  it "should write files to imagesoutdir if set" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="svg"]
+----
+actor Foo1
+boundary Foo2
+Foo1 -> Foo2 : To boundary
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc), {:attributes => {'imagesoutdir' => 'bar', 'outdir' => 'foo'}}
+    b = d.find { |b| b.context == :image }
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(File.exists?(target)).to be false
+    expect(File.exists?(File.expand_path(target, 'bar'))).to be true
+    expect(File.exists?(File.expand_path(target, 'foo'))).to be false
+  end
+
   it "should omit width/height attributes when generating docbook" do
     doc = <<-eos
 = Hello, PlantUML!
@@ -310,7 +335,7 @@ User -> (Start)
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5' }
+    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5'}
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -322,4 +347,142 @@ User -> (Start)
     expect(b.attributes['width']).to be_nil
     expect(b.attributes['height']).to be_nil
   end
+
+  it "should support salt diagrams using salt block type" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[salt, format="png"]
+----
+{
+  Just plain text
+  [This is my button]
+  ()  Unchecked radio
+  (X) Checked radio
+  []  Unchecked box
+  [X] Checked box
+  "Enter text here   "
+  ^This is a droplist^
+}
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5'}
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    target = b.attributes['target']
+    expect(File.exists?(target)).to be true
+
+    expect(b.attributes['width']).to be_nil
+    expect(b.attributes['height']).to be_nil
+  end
+
+  it "should support salt diagrams using plantuml block type" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="png"]
+----
+salt
+{
+  Just plain text
+  [This is my button]
+  ()  Unchecked radio
+  (X) Checked radio
+  []  Unchecked box
+  [X] Checked box
+  "Enter text here   "
+  ^This is a droplist^
+}
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5'}
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    target = b.attributes['target']
+    expect(File.exists?(target)).to be true
+
+    expect(b.attributes['width']).to be_nil
+    expect(b.attributes['height']).to be_nil
+  end
+
+  it "should support salt diagrams containing tree widgets" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="png"]
+----
+salt
+{
+{T
++A
+++a
+}
+}
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5'}
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    target = b.attributes['target']
+    expect(File.exists?(target)).to be true
+
+    expect(b.attributes['width']).to be_nil
+    expect(b.attributes['height']).to be_nil
+  end
+
+  it "should support scaling diagrams" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="png"]
+----
+A -> B
+----
+    eos
+
+    scaled_doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format="png", scale="1.5"]
+----
+A -> B
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'html5'}
+    unscaled_image = d.find { |b| b.context == :image }
+
+    d = Asciidoctor.load StringIO.new(scaled_doc), :attributes => {'backend' => 'html5'}
+    scaled_image = d.find { |b| b.context == :image }
+
+    expect(scaled_image.attributes['width']).to be_within(1).of(unscaled_image.attributes['width'] * 1.5)
+    expect(scaled_image.attributes['height']).to be_within(1).of(unscaled_image.attributes['height'] * 1.5)
+  end
 end

data/spec/test_helper.rb

@@ -30,7 +30,7 @@ module Asciidoctor
 end
 
 RSpec.configure do |c|
-  TEST_DIR = 'testing'
+  TEST_DIR = File.expand_path('testing')
 
   c.before(:suite) do
     FileUtils.rm_r TEST_DIR if Dir.exists? TEST_DIR
@@ -45,12 +45,8 @@ RSpec.configure do |c|
     test_dir = File.expand_path(metadata[:description].gsub(/[^\w]+/, '_'), group_dir)
     Dir.mkdir(test_dir)
 
-    old_wd = Dir.pwd
-    Dir.chdir test_dir
-    begin
+    Dir.chdir(test_dir) do
       example.run
-    ensure
-      Dir.chdir old_wd
     end
   end
 end

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.3.0.preview.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: rjb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.8
 description: Asciidoctor diagramming extension
 email:
 - pepijn@vaneeckhoudt.net
@@ -95,6 +81,7 @@ files:
 - examples/README.adoc
 - examples/design.adoc
 - examples/features.adoc
+- lib/asciidoctor-diagram-java-1.3.4.jar
 - lib/asciidoctor-diagram.rb
 - lib/asciidoctor-diagram/blockdiag.rb
 - lib/asciidoctor-diagram/blockdiag/extension.rb
@@ -105,18 +92,19 @@ files:
 - lib/asciidoctor-diagram/graphviz/extension.rb
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
+- lib/asciidoctor-diagram/salt.rb
 - lib/asciidoctor-diagram/shaape.rb
 - lib/asciidoctor-diagram/shaape/extension.rb
 - lib/asciidoctor-diagram/util/binaryio.rb
 - lib/asciidoctor-diagram/util/cli_generator.rb
 - lib/asciidoctor-diagram/util/java.rb
 - lib/asciidoctor-diagram/util/java_jruby.rb
-- lib/asciidoctor-diagram/util/java_rjb.rb
+- lib/asciidoctor-diagram/util/java_socket.rb
 - lib/asciidoctor-diagram/util/png.rb
 - lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/util/which.rb
 - lib/asciidoctor-diagram/version.rb
-- lib/ditaamini0_9.jar
+- lib/ditaamini-0.10.jar
 - lib/plantuml.jar
 - spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
@@ -134,17 +122,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation

data/lib/asciidoctor-diagram/util/java_rjb.rb

@@ -1,91 +0,0 @@
-require 'rjb'
-
-module Asciidoctor
-  module Diagram
-    # @private
-    module Java
-      INITAWT_JAR_PATH = File.expand_path File.join('..', 'initawt.jar'), File.dirname(__FILE__)
-
-      module Package
-        def method_missing(meth, *args, &block)
-          raise "No arguments expected" unless args.empty?
-          raise "No block expected" if block
-
-          name = meth.to_s
-          @proxies ||= {}
-          @proxies[name] ||= create_java_proxy(name)
-        end
-
-        private
-
-        def create_java_proxy(name)
-          qualified_name = @name ? "#{@name}.#{name}" : name
-          if name =~ /^[[:upper:]]/
-            Package.create_class(qualified_name)
-          else
-            Package.create_package(qualified_name)
-          end
-        end
-
-        def self.create_class(name)
-          ::Rjb.import(name)
-        end
-
-        def self.create_package(name)
-          package = Module.new
-          package.extend Package
-          package.instance_variable_set :@name, name
-          package.instance_variable_set :@parent, name
-          package
-        end
-      end
-
-      def self.classpath
-        @classpath ||= []
-      end
-
-      def self.load
-        if @loaded
-          return
-        end
-
-        Rjb::load(classpath.join(File::PATH_SEPARATOR))
-
-        # On OS X using AWT from JNI is extremely deadlock prone. Enabling AWT headless mode resolves this issue. We're
-        # never actually going to display an AWT GUI, so this should be fairly safe.
-        Rjb::import('java.lang.System').setProperty 'java.awt.headless', 'true'
-
-        @loaded = true
-      end
-
-      def self.array_to_java_array(array, type)
-        # Rjb does not require an explicit conversion of a Ruby Array containing Ruby Strings to a Ruby Array containing
-        # Java Strings. It handles this implicitly when calling Java methods.
-        array
-      end
-
-      def self.string_from_java_bytes(bytes)
-        # Rjb implictly converts Java byte arrays to Ruby Strings so nothing needs to be done here
-        bytes
-      end
-
-      def self.method_missing(meth, *args, &block)
-        raise "No arguments expected" unless args.empty?
-        raise "No block expected" if block
-
-        load
-
-        @root_package ||= Package.send(:create_package, nil)
-        @root_package.send(meth, *args)
-      end
-
-      def self.new_object(java_class, signature = nil, *args)
-        if signature
-          java_class.new_with_sig(signature, *args)
-        else
-          java_class.new(*args)
-        end
-      end
-    end
-  end
-end