asciidoctor-diagram 1.2.0.preview.3-java → 1.2.0.preview.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 952619d93cde27f68bf1739980da524a726ffdc5
-  data.tar.gz: 3410e9e1a782f07fd8e9143118f08b6f3b7a9739
+  metadata.gz: 043f19546d87bf380b9033fcaf0484b7b3c3e8c9
+  data.tar.gz: 7177c6504241eeffda1853fa9d829486db7bc96b
 SHA512:
-  metadata.gz: 81352018260910259419b91d3d4858206b4b5cc762f4b3504bd12eb325233d191469fd697a3257c9c6c8420414d9136e0d6090c34c122e29d442bc8b6e6fb7f0
-  data.tar.gz: 37fbe270d7885a05cf16e6301be67ba0a7c5c51e79c74013bef0e13c95978197b575bb0f516d8cd2e006f839a1b422384ee3f0c666af7f5205a56e4361e3737c
+  metadata.gz: d20500b05fc3f0a63da62968038212a2fd1a0fce575cfbd4b779fcac91b75faf8eb505bf672d84d3b9b741109fd77898a7c13732a2712403d8898fe9dcfdd4ca
+  data.tar.gz: db1febbb4e68a028d57662e65f8efd360db70da99dd7e2c5809d0250be96dc0d65cb73873ee5c7a4912d89463c6677ced409a7200168993ebe773a6395e2f595

data/CHANGELOG.adoc

@@ -6,6 +6,27 @@ Enhancements::
 
   * Updated to Asciidoctor 1.5.0
 
+== 1.1.4
+
+Bug Fixes::
+
+  * Under CRuby in combination with certain Java versions a FileNotFoundException could be triggered due to incorrect
+    method selection by RJB
+
+== 1.1.3
+
+Bug Fixes::
+
+  * Image regeneration logic did not always correctly detect cases where images did not need to be updated
+
+== 1.1.2
+
+Bug Fixes::
+
+  * Fix corrupt PNG images on Windows
+  * Fix NoSuchMethodError in block macro processing when target image file already existed
+  * Respect target attribute in block macros
+
 == 1.1.1
 
 Bug Fixes::

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

@@ -14,8 +14,8 @@ module Asciidoctor
         args = ['-e', 'UTF-8']
 
         bytes = code.encode(Encoding::UTF_8).bytes.to_a
-        bis = Java.java.io.ByteArrayInputStream.new(Java.array_to_java_array(bytes, :byte))
-        bos = Java.java.io.ByteArrayOutputStream.new
+        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

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

@@ -25,16 +25,17 @@ module Asciidoctor
         if config_file
           flags += ['-config', File.expand_path(config_file, parent.document.attributes['docdir'])]
         end
-
-        option = Java.net.sourceforge.plantuml.Option.new(Java.array_to_java_array(flags, :string))
-        source_reader = Java.net.sourceforge.plantuml.SourceStringReader.new(
-            Java.net.sourceforge.plantuml.preproc.Defines.new(),
-            code,
-            option.getConfig()
+        
+        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()
         )
 
-        bos = Java.java.io.ByteArrayOutputStream.new
-        ps = Java.java.io.PrintStream.new(bos)
+        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)

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

@@ -31,6 +31,10 @@ module Asciidoctor
         load
         ::Java.send(meth)
       end
+
+      def self.new_object(java_class, signature = nil, *args)
+        java_class.new(*args)
+      end
     end
   end
 end

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

@@ -77,6 +77,14 @@ module Asciidoctor
         @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

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.2.0.preview.3"
+    VERSION = "1.2.0.preview.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.2.0.preview.3
+  version: 1.2.0.preview.4
 platform: java
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler