asciidoctor-diagram 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d38f932148312e67e4249a2c171c71da2c796a49
-  data.tar.gz: c50317e4443b383f73be0b3e068364185cba7a97
+  metadata.gz: 65e470f480837be7f630896e91d0c61368b8a2f5
+  data.tar.gz: 0c674e665f3f412f2181cde62163d116efbfc7de
 SHA512:
-  metadata.gz: 9d8544bb90e946c5b20b9e675268e519cf52f9dd89a3b054b4214a9c1b3dff59d6ce9683569616c3ed9d81441dc089179cb559e1569b1c11e4d586f99d457a41
-  data.tar.gz: d26cbf53122d923276a543f49efe434ba8690fbb85ba0e44ced6c52bd4c24779fb110bcef1c3f03c29f5b731dfc15c4a30c06d78516742987815c70a6d6886ab
+  metadata.gz: 487247e3185db46d245f2c7e78c43524ed4da61a200e92a2b9984ecab45bbf6db2eee009cc3b66239941af4bc3142944e97ca0ff4daad189966f31ab5a78b39e
+  data.tar.gz: 92dfed70c63edf7436f4af7f1ec3b6bdb9e797fcfc953d2d74409cb8d70ed071b104e2bfdd9d597c8f004230f800120bc0ce3cc01f0eeb310ab3af14793db048

data/CHANGELOG.adoc

@@ -1,11 +1,27 @@
 = Asciidoctor-diagram Changelog
 
+== Development
+
+== 1.5.5
+
+Enhancements::
+
+  * Update PlantUML to revision 2017.15
+  * Issue #147: Add support for PlantUML SVG output (@puffybsd)
+  * Resolve compatibility issues with Asciidoctor 1.5.6 (@robertpanzer, @mojavelinux)
+
+Bug Fixes::
+
+  * Issue #145: Incremental runs on documents containing meme diagrams would fail
+  * Issue #150: Resolve Ditaa character encoding issues
+  * Avoid error when the `PATH` environment variable is not defined (@BrentDouglas)
+
 == 1.5.4
 
 Enhancements::
 
-  * Add support for UMLet.
-  * Issue #141: Allow blockdiag fontpath to be specified via attributes
+  * Add support for UMLet (@basejumpa)
+  * Issue #141: Allow blockdiag fontpath to be specified via attributes (@bithium)
 
 Bug Fixes::
 
@@ -28,7 +44,7 @@ Bug Fixes::
 
 Enhancements::
 
-  * Apply anti-aliasing to blockdiag generated images
+  * Apply anti-aliasing to blockdiag generated images (@bithium)
   * Issue #118: Add support for Erd.
 
 Bug Fixes::
@@ -54,6 +70,7 @@ Enhancements::
   * Issue #112: Update PlantUML to revision 8043 (19/06/2016)
   * Issue #114: Asciidoctor Diagram now requires Asciidoctor if it hasn't been loaded already.
   * Issue #116: Resolve relative paths in PlantUML !include directives
+  * Add Chinese README translation (@diguage)
 
 == 1.4.0
 
@@ -82,12 +99,13 @@ Bug Fixes::
 
   * Issue #83: Omit stack trace information from error message that gets embedded in the output document
   * Issue #84: Restore support for specifying the location of the `dot` executable using the `graphvizdot` attribute
+  * Avoid deprecation warnings with JRuby 9000 (@robertpanzer)
 
 == 1.3.1
 
 Bug Fixes::
 
-  * Issue #78: Resolve Java launch issues when running in a Cygwin environment
+  * Issue #78: Resolve Java launch issues when running in a Cygwin environment (@chanibal)
 
 == 1.3.0
 
@@ -102,11 +120,13 @@ Enhancements::
   * Remove dependency on RJB to simplify installation (issue #48)
   * Add diagram scaling support using the scale attribute (issue #58)
   * Add Ditaa command line option support using the options attribute (issue #69)
+  * Add extra usage instructions to README (@nearnshaw)
 
 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
+  * Fix caching issue on Travis CI (@j-manu)
 
 == 1.2.0
 
@@ -130,9 +150,9 @@ Bug Fixes::
 
 Enhancements::
 
-  * Use the output directory (outdir attribute) as base directory if it's specified.
+  * Use the output directory (outdir attribute) as base directory if it's specified. (@neher)
   * Do not auto-generate width/height attributes when outputting to a non-HTML backend. This resolves issues with
-    oversized images in docbook output.
+    oversized images in docbook output. (@neher)
 
 == 1.1.4
 

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

@@ -20,7 +20,7 @@ module Asciidoctor
           'transparent' => lambda { |o, v| o  << '--transparent' if v == 'true'}
       }
 
-      JARS = ['ditaamini-0.10.jar'].map do |jar|
+      JARS = ['ditaa-1.3.12.jar', 'ditaamini-0.10.jar'].map do |jar|
         File.expand_path File.join('../..', jar), File.dirname(__FILE__)
       end
       Java.classpath.concat JARS

data/lib/asciidoctor-diagram/extensions.rb

@@ -282,12 +282,19 @@ module Asciidoctor
           subclass.option :pos_attrs, ['target', 'format']
         end
 
+        def apply_target_subs(parent, target)
+          if target
+            parent.sub_attributes(target, :attribute_missing => 'warn')
+          else
+            nil
+          end
+        end
+
         # Creates a FileSource using target as the file name.
         #
         # @return [FileSource] a FileSource
         def create_source(parent, target, attributes)
-          target = parent.sub_attributes(target, :attribute_missing => 'warn') if target
-          FileSource.new(parent, target, attributes)
+          FileSource.new(parent, apply_target_subs(parent, target), attributes)
         end
       end
 
@@ -326,7 +333,7 @@ module Asciidoctor
         # @return [String] the base directory against which relative paths in this diagram should be resolved
         # @abstract
         def base_dir
-          raise NotImplementedError.new
+          attr('docdir', nil, true)
         end
 
         # Alias for code
@@ -402,10 +409,9 @@ module Asciidoctor
         protected
         def resolve_diagram_subs
           if @attributes.key? 'subs'
-            subs = @parent_block.resolve_block_subs @attributes['subs'], nil, 'diagram'
-            subs.empty? ? nil : subs
+            @parent_block.resolve_block_subs @attributes['subs'], nil, 'diagram'
           else
-            nil
+            []
           end
         end
 
@@ -430,10 +436,6 @@ module Asciidoctor
           @reader = reader
         end
 
-        def base_dir
-          attr('docdir', nil, true)
-        end
-
         def code
           @code ||= @parent_block.apply_subs(@reader.lines, resolve_diagram_subs).join("\n")
         end
@@ -447,7 +449,11 @@ module Asciidoctor
         end
 
         def base_dir
-          File.dirname(@file_name)
+          if @file_name
+            File.dirname(@file_name)
+          else
+            super
+          end
         end
 
         def image_name
@@ -461,7 +467,7 @@ module Asciidoctor
         end
 
         def should_process?(image_file, image_metadata)
-          File.mtime(@file_name) > File.mtime(image_file) || super
+          (@file_name && File.mtime(@file_name) > File.mtime(image_file)) || super
         end
 
         def code

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

@@ -107,12 +107,22 @@ module Asciidoctor
     class MemeBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
       include Meme
 
+      class StringReader
+        def initialize(str)
+          @str = str
+        end
+
+        def lines
+          @str.lines.map { |l| l.rstrip }
+        end
+      end
+
       option :pos_attrs, %w(top bottom target format)
 
       def create_source(parent, target, attributes)
         attributes = attributes.dup
-        attributes['background'] = target
-        ::Asciidoctor::Diagram::Extensions::FileSource.new(parent, nil, attributes)
+        attributes['background'] = apply_target_subs(parent, target)
+        ::Asciidoctor::Diagram::Extensions::ReaderSource.new(parent, StringReader.new(''), attributes)
       end
     end
   end

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

@@ -21,9 +21,9 @@ module Asciidoctor
 
       def mermaid(parent_block, source, format)
         mermaid = which(parent_block, 'mermaid')
-        @is_mermaid_v6 ||= ::Asciidoctor::Diagram::Cli.run(mermaid, '--version').split('.')[0].to_i >= 6
+        config['mermaid>=6'] ||= ::Asciidoctor::Diagram::Cli.run(mermaid, '--version').split('.')[0].to_i >= 6
         # Mermaid >= 6.0.0 requires PhantomJS 2.1; older version required 1.9
-        phantomjs = which(parent_block, 'phantomjs', :alt_attrs => [@is_mermaid_v6 ? 'phantomjs_2' : 'phantomjs_19'])
+        phantomjs = which(parent_block, 'phantomjs', :alt_attrs => [config['mermaid>=6'] ? 'phantomjs_2' : 'phantomjs_19'])
 
         css = source.attr('css', nil, 'mermaid')
         if css

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

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

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

@@ -6,7 +6,7 @@ module Asciidoctor
     module Java
       def self.classpath
         @classpath ||= [
-            File.expand_path(File.join('../..', 'asciidoctor-diagram-java-1.3.10.jar'), File.dirname(__FILE__))
+            File.expand_path(File.join('../..', 'server-1.3.12.jar'), File.dirname(__FILE__))
         ]
       end
 

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

@@ -5,7 +5,7 @@ module Asciidoctor
       def self.which(cmd, options = {})
         exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
 
-        paths = (options[:path] || []) + ENV['PATH'].split(File::PATH_SEPARATOR)
+        paths = (options[:path] || []) + (ENV['PATH'] ? ENV['PATH'].split(File::PATH_SEPARATOR) : [])
         paths.each do |path|
           exts.each { |ext|
             exe = File.join(path, "#{cmd}#{ext}")
@@ -20,10 +20,10 @@ module Asciidoctor
         attr_names = options[:attrs] || options.fetch(:alt_attrs, []) + [cmd]
         cmd_names = [cmd] + options.fetch(:alt_cmds, [])
 
-        cmd_var = '@' + attr_names[0]
+        cmd_var = 'cmd-' + attr_names[0]
 
-        if instance_variable_defined?(cmd_var)
-          cmd_path = instance_variable_get(cmd_var)
+        if config.key? cmd_var
+          cmd_path = config[cmd_var]
         else
           cmd_path = attr_names.map { |attr_name| parent_block.attr(attr_name, nil, true) }.find { |attr| !attr.nil? }
 
@@ -35,7 +35,7 @@ module Asciidoctor
             cmd_path = cmd_paths.reject { |c| c.nil? }.first
           end
 
-          instance_variable_set(cmd_var, cmd_path)
+          config[cmd_var] = cmd_path
 
           if cmd_path.nil? && options.fetch(:raise_on_error, true)
             raise "Could not find the #{cmd_names.map { |c| "'#{c}'" }.join(', ')} executable in PATH; add it to the PATH or specify its location using the '#{attr_names[0]}' document attribute"
@@ -46,4 +46,4 @@ module Asciidoctor
       end
     end
   end
-end
+end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.5.4"
+    VERSION = "1.5.5"
   end
 end

data/spec/ditaa_spec.rb

@@ -186,4 +186,33 @@ Doc Writer <doc@example.com>
 
     expect(mtime2).to be > mtime1
   end
+
+  it "should support UTF-8 characters" do
+    doc = <<-eos
+= Test
+
+[ditaa]
+----
+/-----\\
+|\u00AB \u2026 \u00BB|
+\\-----/
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
 end

data/spec/plantuml_spec.rb

@@ -730,4 +730,125 @@ class {child-class}
     expect(content).to include('ParentClass')
     expect(content).to include('ChildClass')
   end
+
+  it "should generate PNG images for jlatexmath blocks when format is set to 'png'" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml,format="png"]
+----
+@startlatex
+e^{i\\pi} + 1 = 0
+@endlatex
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should generate SVG images for jlatexmath blocks when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml,format="svg"]
+----
+@startlatex
+e^{i\\pi} + 1 = 0
+@endlatex
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg$/)
+    expect(File.exist?(target)).to be true
+  end
+
+  it "should generate PNG images for diagrams with latex tags when format is set to 'png'" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml,format="png"]
+----
+:<latex>P(y|\\mathbf{x}) \\mbox{ or } f(\\mathbf{x})+\\epsilon</latex>;
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should generate SVG images for diagrams with latex tags when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml,format="svg"]
+----
+:<latex>P(y|\\mathbf{x}) \\mbox{ or } f(\\mathbf{x})+\\epsilon</latex>;
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg$/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,6 @@ files:
 - examples/features.adoc
 - images/asciidoctor-diagram-classes.png
 - images/asciidoctor-diagram-process.png
-- lib/asciidoctor-diagram-java-1.3.10.jar
 - lib/asciidoctor-diagram.rb
 - lib/asciidoctor-diagram/blockdiag.rb
 - lib/asciidoctor-diagram/blockdiag/extension.rb
@@ -121,8 +120,13 @@ files:
 - lib/asciidoctor-diagram/version.rb
 - lib/asciidoctor-diagram/wavedrom.rb
 - lib/asciidoctor-diagram/wavedrom/extension.rb
+- lib/batik-all-1.7.jar
+- lib/ditaa-1.3.12.jar
 - lib/ditaamini-0.10.jar
+- lib/jlatexmath-minimal-1.0.3.jar
+- lib/plantuml-1.3.12.jar
 - lib/plantuml.jar
+- lib/server-1.3.12.jar
 - spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
 - spec/erd_spec.rb