asciidoctor-diagram 1.1.3-java → 1.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0f69b3d47bad0cef1b5b515d030c2bdd41ef13d
-  data.tar.gz: 84fab6e64ec3fc13e1638ab44c4104a20b369eb9
+  metadata.gz: 7551a9491db4c9dab76b1da491e9541f2ca8a7fe
+  data.tar.gz: 2923f841a55ed9ca7f1cc965a0dcc1299a951ff0
 SHA512:
-  metadata.gz: 5c7f3dea8bb76b394345bec0354ad49b1fc0d94be25ac1ce38b02528076c96f14dc2b1eac7860916153dd41c269db57c7cd4c38ef52ff6479ef4ea3d0a583d8d
-  data.tar.gz: c1ecba019813053288283abf6f529c6f0ca6eca836536445983e18028d1ce9fb09d9b6317725d8fb4f3f3c8b27041142287162a2a96091505dd5851362b407a9
+  metadata.gz: 0946b8cd28a26ee64dd31b298f67729d8b98f15b6f2cde2b2ebe05e6019bef6da46a306989d7d381bfefb5d786cd7931af875fe090b22de98003d3737bebb57a
+  data.tar.gz: 9ac14361407421bc48155c5f79a581480a54616c235e02ffb0b85cfc97db3507c9c283c6e9f9407e96067b6c933603def1b5a60f2a27f93a86bf7a8c0b387de2

data/CHANGELOG.adoc

@@ -1,5 +1,26 @@
 = Asciidoctor-diagram Changelog
 
+== 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

@@ -21,15 +21,16 @@ module Asciidoctor
 
         flags += ['-charset', 'UTF-8', '-failonerror', '-graphvizdot', @graphvizdot]
 
-        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.1.3"
+    VERSION = "1.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.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