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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9f55fc39f6f8cb962714d683847a914da57605b
-  data.tar.gz: 3410e9e1a782f07fd8e9143118f08b6f3b7a9739
+  metadata.gz: 5c7b56725f992456b1db4a30dd0ae93edd938199
+  data.tar.gz: 2c8873445a87aa168fd05599a6b7b9820754aa10
 SHA512:
-  metadata.gz: 65555754f853801c0380791eb75084674dd3fc9ebd8f59413d422be56867ee6f6c598d3acc39809ea113b6e29a2a265933c5f7dcb4ada80c99518b6d86d4f597
-  data.tar.gz: 37fbe270d7885a05cf16e6301be67ba0a7c5c51e79c74013bef0e13c95978197b575bb0f516d8cd2e006f839a1b422384ee3f0c666af7f5205a56e4361e3737c
+  metadata.gz: b0241f45b59097a383e5a6decf5684da7a23abc0a4b68ef59ea9856ca67f2c9cafc577c0ea3afb15cceee65b284c31245fe496b53eaf1d29aadc8e5f345ec452
+  data.tar.gz: b0e45122847855e14016940dc60aff72cc78f3724a8979d0bd1e175f4b5272b6883dcac331aa061be14d41da8a835c32bab2e7975db983d0e6fe0a1fe92034f7

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: ruby
 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