asciidoctor-diagram 2.0.5 → 2.1.0

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

@@ -10,7 +10,10 @@ module Asciidoctor
           return
         end
 
-        classpath.flatten.each { |j| require j }
+        classpath.flatten.each do |j|
+          raise "Classpath item #{j} does not exist" unless File.exist?(j)
+          require j
+        end
         @loaded = true
       end
 

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

@@ -10,9 +10,14 @@ module Asciidoctor
     module Java
       class CommandServer
         def initialize(java, classpath)
+          classpath.each do |file|
+            raise "Classpath item #{file} does not exist" unless File.exist?(file)
+          end
+
           args = []
           args << '-Djava.awt.headless=true'
           args << '-Djava.net.useSystemProxies=true'
+          args << '-Dfile.encoding=UTF-8'
           args << '-cp'
           args << classpath.flatten.map { |jar| ::Asciidoctor::Diagram::Platform.host_os_path(jar).strip }.join(::Asciidoctor::Diagram::Platform.host_os_path_separator)
           args << 'org.asciidoctor.diagram.StdInOutCommandServer'
@@ -58,7 +63,11 @@ module Asciidoctor
         # headers = req[:headers] ||= {}
         # headers['Host'] = "localhost:#{svr.port}"
         format_request(req, svr.io)
-        parse_response(svr.io)
+        begin
+          parse_response(svr.io)
+        rescue
+          raise "Error processing request #{req}\nEncoding of input is #{req[:body].encoding}"
+        end
       end
     end
   end

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

@@ -2,7 +2,7 @@ module Asciidoctor
   module Diagram
     # @private
     module PDF
-      def self.post_process_image(data)
+      def self.post_process_image(data, optimise)
         [data, nil, nil]
       end
     end

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

@@ -6,7 +6,7 @@ module Asciidoctor
     module PNG
       PNG_SIGNATURE = [137, 80, 78, 71, 13, 10, 26, 10].pack('CCCCCCCC')
 
-      def self.post_process_image(data)
+      def self.post_process_image(data, optimise)
         bio = BinaryIO.new(data)
         png_signature = bio.read_string(8)
         raise "Invalid PNG signature" unless png_signature == PNG_SIGNATURE

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

@@ -1,13 +1,11 @@
 require_relative 'binaryio'
 require 'rexml/document'
-require 'bigdecimal'
-require 'bigdecimal/util'
 
 module Asciidoctor
   module Diagram
     # @private
     module SVG
-      def self.post_process_image(data)
+      def self.post_process_image(data, optimise)
         svg = REXML::Document.new(data)
 
         root = svg.root
@@ -38,14 +36,37 @@ module Asciidoctor
           root.add_attribute('viewBox', "0 0 #{width.to_s} #{height.to_s}")
         end
 
+        indent = 2
+        if optimise
+          remove_comments(svg)
+          indent = -1
+        end
+
         patched_svg = ""
-        svg.write(:output => patched_svg, :indent => 2)
+        svg.write(:output => patched_svg, :indent => indent, :transitive => true)
 
         [patched_svg, width, height]
       end
 
       private
 
+      def self.remove_comments(parent)
+        comments = []
+
+        parent.each do |child|
+          case child
+            when REXML::Comment
+              comments << child
+            when REXML::Parent
+              remove_comments(child)
+          end
+        end
+
+        comments.each do |c|
+          c.remove
+        end
+      end
+
       def self.to_numeric(text)
         if text.include? '.'
           text.to_f

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.0.5"
+    VERSION = "2.1.0"
   end
 end

data/spec/a2s_spec.rb

@@ -20,10 +20,10 @@ code = <<-eos
                                       '---------------------------------------'
 eos
 
-describe Asciidoctor::Diagram::AsciiToSvgBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::AsciiToSvgBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :a2s, code, [:svg]
 end
 
-describe Asciidoctor::Diagram::AsciiToSvgBlockProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::AsciiToSvgBlockProcessor, :broken_on_windows do
   include_examples "block", :svgbob, code, [:svg]
-end
+end

data/spec/blockdiag_spec.rb

@@ -7,10 +7,10 @@ blockdiag {
 }
 eos
 
-describe Asciidoctor::Diagram::BlockDiagBlockMacroProcessor, :broken_on_appveyor do
+describe Asciidoctor::Diagram::BlockDiagBlockMacroProcessor do
   include_examples "block_macro", :blockdiag, code, [:png, :svg, :pdf]
 end
 
-describe Asciidoctor::Diagram::BlockDiagBlockProcessor, :broken_on_appveyor do
+describe Asciidoctor::Diagram::BlockDiagBlockProcessor do
   include_examples "block", :blockdiag, code, [:png, :svg, :pdf]
-end
+end

data/spec/bytefield_spec.rb

@@ -83,10 +83,10 @@ code = <<-eos
 (draw-bottom)
 eos
 
-describe Asciidoctor::Diagram::BytefieldBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::BytefieldBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :bytefield, code, [:svg]
 end
 
-describe Asciidoctor::Diagram::BytefieldBlockProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::BytefieldBlockProcessor, :broken_on_windows do
   include_examples "block", :bytefield, code, [:svg]
-end
+end

data/spec/ditaa_spec.rb

@@ -145,6 +145,6 @@ This should cause a bug.
 
     expect {
       load_asciidoc doc
-    }.to raise_error(/Cannot follow cell/i)
+    }.to raise_error(/Ambiguous input/i)
   end
 end

data/spec/dpic_spec.rb

@@ -10,10 +10,10 @@ G: box "$G(s)$"
   "$-\;$" below rjust
 eos
 
-describe Asciidoctor::Diagram::DpicBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::DpicBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :dpic, code, [:svg]
 end
 
-describe Asciidoctor::Diagram::DpicBlockProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::DpicBlockProcessor, :broken_on_windows do
   include_examples "block", :dpic, code, [:svg]
-end
+end

data/spec/erd_spec.rb

@@ -83,10 +83,10 @@ play        1--* play_player
 player      1--* play_player
 eos
 
-describe Asciidoctor::Diagram::ErdBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
-  include_examples "block_macro", :erd, code, [:svg]
+describe Asciidoctor::Diagram::ErdBlockMacroProcessor, :broken_on_windows do
+  include_examples "block_macro", :erd, code, [:png, :svg]
 end
 
-describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_travis, :broken_on_windows do
-  include_examples "block", :erd, code, [:svg]
-end
+describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_windows do
+  include_examples "block", :erd, code, [:png, :svg]
+end

data/spec/lilypond_spec.rb

@@ -4,10 +4,10 @@ code = <<-eos
 \\relative c' { f d f a d f e d cis a cis e a g f e }
 eos
 
-describe Asciidoctor::Diagram::LilypondBlockMacroProcessor, :broken_on_windows do
+describe Asciidoctor::Diagram::LilypondBlockMacroProcessor do
   include_examples "block_macro", :lilypond, code, [:png]
 end
 
-describe Asciidoctor::Diagram::LilypondBlockProcessor, :broken_on_windows do
+describe Asciidoctor::Diagram::LilypondBlockProcessor do
   include_examples "block", :lilypond, code, [:png]
-end
+end

data/spec/mermaid_spec.rb

@@ -137,6 +137,43 @@ end
 describe Asciidoctor::Diagram::MermaidBlockProcessor do
   include_examples "block", :mermaid, code, [:png, :svg]
 
+  it "should work with kroki.io" do
+    doc = <<-eos
+= Hello, kroki!
+:diagram-server-url: https://kroki.io/
+:diagram-server-type: kroki_io
+Doc Writer <doc@example.com>
+
+== First Section
+
+[mermaid, format=svg]
+----
+graph TD
+  A[ Anyone ] -->|Can help | B( Go to github.com/yuzutech/kroki )
+  B --> C{ How to contribute? }
+  C --> D[ Reporting bugs ]
+  C --> E[ Sharing ideas ]
+  C --> F[ Advocating ]
+----
+    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
+
   it "should report unsupported scaling factors" do
     doc = <<-eos
 = Hello, Mermaid!

data/spec/pikchr_spec.rb

@@ -42,10 +42,28 @@ arrow dashed from last circle.w to 5/8<last circle.w,2nd last box> chop
 box invis wid 2*boxwid "ndtable:" with .e at Start.w
 eos
 
-describe Asciidoctor::Diagram::PikchrBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::PikchrBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :pikchr, code, [:svg]
 end
 
-describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::PikchrBlockProcessor, :broken_on_windows do
   include_examples "block", :pikchr, code, [:svg]
-end
+
+  it "should report syntax errors" do
+    doc = <<-eos
+= Hello, Pikchr!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[pikchr]
+----
+This should raise a syntax error.
+----
+    eos
+
+    expect {
+      load_asciidoc doc
+    }.to raise_error(/error/i)
+  end
+end

data/spec/shaape_spec.rb

@@ -7,10 +7,10 @@ code = <<-eos
              \/
 eos
 
-describe Asciidoctor::Diagram::ShaapeBlockMacroProcessor, :broken_on_osx, :broken_on_appveyor do
+describe Asciidoctor::Diagram::ShaapeBlockMacroProcessor, :broken_on_osx, :broken_on_github, :broken_on_windows do
   include_examples "block_macro", :shaape, code, [:png, :svg]
 end
 
-describe Asciidoctor::Diagram::ShaapeBlockProcessor, :broken_on_osx, :broken_on_appveyor do
+describe Asciidoctor::Diagram::ShaapeBlockProcessor, :broken_on_osx, :broken_on_github, :broken_on_windows do
   include_examples "block", :shaape, code, [:png, :svg]
-end
+end

data/spec/svgbob_spec.rb

@@ -20,10 +20,10 @@ code = <<-eos
                                       '---------------------------------------'
 eos
 
-describe Asciidoctor::Diagram::SvgBobBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::SvgBobBlockMacroProcessor do
   include_examples "block_macro", :svgbob, code, [:svg]
 end
 
-describe Asciidoctor::Diagram::SvgBobBlockProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::SvgBobBlockProcessor do
   include_examples "block", :svgbob, code, [:svg]
-end
+end

data/spec/syntrax_spec.rb

@@ -9,10 +9,10 @@ indentstack(10,
 )
 eos
 
-describe Asciidoctor::Diagram::SyntraxBlockMacroProcessor, :broken_on_appveyor do
+describe Asciidoctor::Diagram::SyntraxBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :syntrax, code, [:png, :svg]
 end
 
-describe Asciidoctor::Diagram::SyntraxBlockProcessor, :broken_on_appveyor do
+describe Asciidoctor::Diagram::SyntraxBlockProcessor, :broken_on_windows do
   include_examples "block", :syntrax, code, [:png, :svg]
-end
+end

data/spec/test_helper.rb

@@ -85,12 +85,8 @@ RSpec.configure do |c|
       c.filter_run_excluding :broken_on_windows => true
   end
 
-  if ENV['TRAVIS']
-    c.filter_run_excluding :broken_on_travis => true
-  end
-
-  if ENV['APPVEYOR']
-    c.filter_run_excluding :broken_on_appveyor => true
+  if ENV['GITHUB_ACTIONS']
+    c.filter_run_excluding :broken_on_github => true
   end
 
   TEST_DIR = File.expand_path('testing')
@@ -112,4 +108,4 @@ RSpec.configure do |c|
       example.run
     end
   end
-end
+end

data/spec/tikz_spec.rb

@@ -98,11 +98,11 @@ code = <<-'eos'
 \end{tikzpicture}
 eos
 
-describe Asciidoctor::Diagram::TikZBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::TikZBlockMacroProcessor, :broken_on_windows do
   include_examples "block_macro", :tikz, code, [:pdf]
 end
 
-describe Asciidoctor::Diagram::TikZBlockProcessor, :broken_on_travis, :broken_on_windows do
+describe Asciidoctor::Diagram::TikZBlockProcessor, :broken_on_windows do
   include_examples "block", :tikz, code, [:pdf]
   
   it "should support the preamble attribute" do
@@ -174,4 +174,4 @@ eos
       target = b.attributes['target']
       expect(target).to_not be_nil
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,48 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.x
+- !ruby/object:Gem::Dependency
+  name: asciidoctor-diagram-ditaamini
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: asciidoctor-diagram-plantuml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2021'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2021'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Asciidoctor diagramming extension
 email:
 - pepijn@vaneeckhoudt.net
@@ -82,14 +124,20 @@ files:
 - CHANGELOG.adoc
 - LICENSE.txt
 - README.adoc
-- README_zh-CN.adoc
 - Rakefile
+- docs/antora.yml
+- docs/modules/ROOT/images/asciidoctor-diagram-classes.png
+- docs/modules/ROOT/images/asciidoctor-diagram-process.png
+- docs/modules/ROOT/pages/index.adoc
+- docs/modules/ROOT/partials/advanced.adoc
+- docs/modules/ROOT/partials/create_diagram.adoc
+- docs/modules/ROOT/partials/generate.adoc
+- docs/modules/ROOT/partials/installation.adoc
+- docs/modules/ROOT/partials/uris.adoc
 - examples/Gemfile
 - examples/README.adoc
 - examples/design.adoc
 - examples/features.adoc
-- images/asciidoctor-diagram-classes.png
-- images/asciidoctor-diagram-process.png
 - lib/asciidoctor-diagram.rb
 - lib/asciidoctor-diagram/a2s.rb
 - lib/asciidoctor-diagram/a2s/converter.rb
@@ -108,6 +156,7 @@ files:
 - lib/asciidoctor-diagram/diagram_source.rb
 - lib/asciidoctor-diagram/ditaa.rb
 - lib/asciidoctor-diagram/ditaa/converter.rb
+- lib/asciidoctor-diagram/ditaa/ditaa-1.3.17.jar
 - lib/asciidoctor-diagram/ditaa/extension.rb
 - lib/asciidoctor-diagram/dpic.rb
 - lib/asciidoctor-diagram/dpic/converter.rb
@@ -144,6 +193,7 @@ files:
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/converter.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
+- lib/asciidoctor-diagram/plantuml/plantuml-1.3.17.jar
 - lib/asciidoctor-diagram/salt.rb
 - lib/asciidoctor-diagram/shaape.rb
 - lib/asciidoctor-diagram/shaape/converter.rb
@@ -176,6 +226,7 @@ files:
 - lib/asciidoctor-diagram/util/pdf.rb
 - lib/asciidoctor-diagram/util/platform.rb
 - lib/asciidoctor-diagram/util/png.rb
+- lib/asciidoctor-diagram/util/server-1.3.17.jar
 - lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/util/which.rb
 - lib/asciidoctor-diagram/vega.rb
@@ -185,13 +236,6 @@ files:
 - lib/asciidoctor-diagram/wavedrom.rb
 - lib/asciidoctor-diagram/wavedrom/converter.rb
 - lib/asciidoctor-diagram/wavedrom/extension.rb
-- lib/batik-all-1.10.jar
-- lib/ditaa-1.3.15.jar
-- lib/ditaamini-0.12.jar
-- lib/jlatexmath-minimal-1.0.5.jar
-- lib/plantuml-1.3.15.jar
-- lib/plantuml.jar
-- lib/server-1.3.15.jar
 - spec/a2s_spec.rb
 - spec/blockdiag_spec.rb
 - spec/bpmn_spec.rb
@@ -239,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation