asciidoctor-diagram 1.5.11 → 1.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5cba39190bfc72114adb239749953ef15fa8f7bfdf2265a49243a848e0577129
-  data.tar.gz: 8393028bf7f8891f130e431ab4581c5332cc7c03b0c56d1eec656605a0d24255
+SHA1:
+  metadata.gz: 5913cbd36fd3b829ac50411bfa45bf67077c8ac2
+  data.tar.gz: fc549589f2920e44418d44befc61ea469dd831bc
 SHA512:
-  metadata.gz: 2dd40ea17f2ae6f3210df55d01cb159f2e9cd0b454a1b7e4a9a176c59e5f264da29a307f9bfbe543b1dfb9d28e4a6d5bb53c7c0e6d53af974e002641964ef87d
-  data.tar.gz: 3e4f4863daceb0ae205280d01479501ce758cadc814cbe53c3ba5bf273699ae5cffc8cb7d6fe231bf73c950ef0de3b199dcac89d86acec60c4f5559a20b10359
+  metadata.gz: 59573e38cc1ab7ea78ac87169857c43b88b29c1430175ae63a64f5828d0ce600d43c5f7684223fa413789db5120a4b33cb4511da24e145249e2db410b8652c58
+  data.tar.gz: fac3eab000034f0d4b5df6e549a4bb678d50dee313abf4ce01b99246461e0530bd5bb043b39b84c6db559628756357e68f8ca8c78b5d226ed2161c2e799b7ba1

data/CHANGELOG.adoc

@@ -1,5 +1,14 @@
 = Asciidoctor-diagram Changelog
 
+== 1.5.12
+
+Bug Fixes::
+
+  * Issue #201: Respect `destination-dir` CLI flag for diagrams embedded in tables
+  * Issue #203: Update Batik to 1.10
+  * Issue #205: Resolve errors when executing CLI commands using certain versions of JRuby.
+  * Update PlantUML to 2018.13
+
 == 1.5.11
 
 Enhancements::

data/lib/asciidoctor-diagram/extensions.rb

@@ -250,7 +250,7 @@ module Asciidoctor
           if images_dir
             base_dir = nil
           else
-            base_dir = parent.attr('outdir') || (document.respond_to?(:options) && document.options[:to_dir])
+            base_dir = parent.attr('outdir') || doc_option(document, :to_dir)
             images_dir = parent.attr('imagesdir')
           end
 
@@ -260,7 +260,7 @@ module Asciidoctor
         def cache_dir(parent)
           document = parent.document
           cache_dir = '.asciidoctor/diagram'
-          base_dir = parent.attr('outdir') || (document.respond_to?(:options) && document.options[:to_dir])
+          base_dir = parent.attr('outdir') || doc_option(document, :to_dir)
           parent.normalize_system_path(cache_dir, base_dir)
         end
 
@@ -273,6 +273,20 @@ module Asciidoctor
           result.force_encoding(Encoding::UTF_8)
           Asciidoctor::Block.new parent, :literal, :source => result, :attributes => literal_attributes
         end
+
+        def doc_option(document, key)
+          if document.respond_to?(:options)
+            value = document.options[key]
+          else
+            value = nil
+          end
+
+          if document.nested? && value.nil?
+            doc_option(docuemnt.parent_document, key)
+          else
+            value
+          end
+        end
       end
 
       # Base class for diagram block processors.
@@ -333,14 +347,14 @@ module Asciidoctor
         end
 
         # Get the value for the specified attribute. First look in the attributes on
-        # this node and return the value of the attribute if found. Otherwise, if
-        # this node is a child of the Document node, look in the attributes of the
-        # Document node and return the value of the attribute if found. Otherwise,
+        # this document and return the value of the attribute if found. Otherwise, if
+        # this document is a child of the Document document, look in the attributes of the
+        # Document document and return the value of the attribute if found. Otherwise,
         # return the default value, which defaults to nil.
         #
         # @param name [String, Symbol] the name of the attribute to lookup
         # @param default_value [Object] the value to return if the attribute is not found
-        # @inherit [Boolean, String] indicates whether to check for the attribute on the AsciiDoctor::Document if not found on this node.
+        # @inherit [Boolean, String] indicates whether to check for the attribute on the AsciiDoctor::Document if not found on this document.
         #                            When a non-nil String is given the an attribute name "#{inherit}-#{name}" is looked for on the document.
         #
         # @return the value of the attribute or the default value if the attribute is not found in the attributes of this node or the document node

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

@@ -10,7 +10,12 @@ module Asciidoctor
 
       private
 
-      JARS = ['plantuml-1.3.13.jar', 'plantuml.jar', 'jlatexmath-minimal-1.0.5.jar', 'batik-all-1.7.jar'].map do |jar|
+      JARS = [
+          'plantuml-1.3.13.jar',
+          'plantuml.jar',
+          'jlatexmath-minimal-1.0.5.jar',
+          'batik-all-1.10.jar'
+      ].map do |jar|
         File.expand_path File.join('../..', jar), File.dirname(__FILE__)
       end
       Java.classpath.concat JARS

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

@@ -1,22 +1,77 @@
-require 'tempfile'
-require 'open3'
-
 module Asciidoctor
   module Diagram
     # @private
     module Cli
-      def self.run(*args)
-        stdout, stderr, status = Open3.capture3(*args)
+      if RUBY_PLATFORM == "java"
+        require_relative 'java'
+
+        def self.run(*args)
+          opts = args.pop if args.last.is_a? Hash
+          in_data = opts && opts[:stdin_data]
+
+          pb = java.lang.ProcessBuilder.new(*args)
+          p = pb.start
+
+          stdout = ""
+          out_reader = start_stream_reader(p.getInputStream, stdout)
+          stderr = ""
+          err_reader = start_stream_reader(p.getErrorStream, stderr)
+
+          if in_data
+            p.getOutputStream.write(in_data.to_java_bytes)
+            p.getOutputStream.close
+          end
+
+          p.waitFor
+
+          out_reader.join
+          err_reader.join
+
+          status = p.exitValue
 
-        if status.exitstatus != 0
-          raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
+          if status != 0
+            raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
+          end
+
+          {
+              :out => stdout,
+              :err => stderr,
+              :status => status
+          }
+        end
+
+        private
+        def self.start_stream_reader(in_stream, out_string)
+          Thread.new {
+            buffer = ::Java::byte[4096].new
+            while (bytes_read = in_stream.read(buffer)) != -1
+              if bytes_read < buffer.length
+                str = String.from_java_bytes(java.util.Arrays.copyOf(buffer, bytes_read))
+              else
+                str = String.from_java_bytes(buffer)
+              end
+              out_string << str
+            end
+          }
         end
+      else
+        require 'open3'
+
+        def self.run(*args)
+          stdout, stderr, status = Open3.capture3(*args)
 
-        {
-            :out => stdout,
-            :err => stderr,
-            :status => status
-        }
+          exit = status.exitstatus
+
+          if exit != 0
+            raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
+          end
+
+          {
+              :out => stdout,
+              :err => stderr,
+              :status => exit
+          }
+        end
       end
     end
   end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.5.11"
+    VERSION = "1.5.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.5.12
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ files:
 - lib/asciidoctor-diagram/version.rb
 - lib/asciidoctor-diagram/wavedrom.rb
 - lib/asciidoctor-diagram/wavedrom/extension.rb
-- lib/batik-all-1.7.jar
+- lib/batik-all-1.10.jar
 - lib/ditaa-1.3.13.jar
 - lib/ditaamini-0.11.jar
 - lib/jlatexmath-minimal-1.0.5.jar
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation