asciidoctor-diagram 2.2.8 → 2.2.10

data/spec/d2_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 D2_CODE = <<-eos
 # Actors
@@ -35,6 +35,31 @@ end
 describe Asciidoctor::Diagram::D2BlockProcessor, :broken_on_windows do
   include_examples "block", :d2, D2_CODE, [:svg]
 
+  it "should not use sketch mode by default" do
+    doc = <<-eos
+= Hello, d2!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[d2]
+----
+#{D2_CODE}
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+    target = b.attributes['target']
+    expect(target).to match(/\.svg$/)
+    expect(File.exist?(target)).to be true
+    svg = File.read(target, :encoding => Encoding::UTF_8)
+    expect(svg).to_not match(/class='.*?sketch-overlay-B5.*?'/)
+  end
+
   it "should support sketch mode" do
     doc = <<-eos
 = Hello, D2!
@@ -42,7 +67,7 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-[d2, sketch=true]
+[d2, foobar, svg, sketch]
 ----
 #{D2_CODE}
 ----
@@ -56,5 +81,7 @@ Doc Writer <doc@example.com>
     target = b.attributes['target']
     expect(target).to match(/\.svg$/)
     expect(File.exist?(target)).to be true
+    svg = File.read(target, :encoding => Encoding::UTF_8)
+    expect(svg).to match(/class='.*?sketch-overlay-B5.*?'/)
   end
 end

data/spec/dbml_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 DBML_CODE = <<-eos
 Table users {

data/spec/diagrams_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 DIAGRAMS_CODE = <<-eos
 from diagrams import Diagram

data/spec/ditaa_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 DITAA_CODE = <<-eos
 +--------+   +-------+    +-------+

data/spec/dpic_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 DPIC_CODE = <<-eos
   arrow "$u$" above

data/spec/erd_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 ERD_CODE = <<-eos
 title {label: "nfldb Entity-Relationship diagram (condensed)", size: "20"}

data/spec/gnuplot_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 GNUPLOT_CODE = <<-eos
 plot [0:5][0:20] x**2 title 'O(n^2)'

data/spec/graphviz_py_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 GRAPHVIZ_PY_CODE = <<-eos
 graph python_graph {

data/spec/graphviz_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 DOT_CODE = <<-eos
 digraph foo {

data/spec/lilypond_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 LILYPOND_CODE = <<-eos
 \\relative c' { f d f a d f e d cis a cis e a g f e }

data/spec/meme_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 describe Asciidoctor::Diagram::MemeBlockMacroProcessor do
   it "should generate PNG images when format is set to 'png'" do

data/spec/mermaid_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 MERMAID_CODE = <<-eos
 graph LR
@@ -141,43 +141,6 @@ end
 describe Asciidoctor::Diagram::MermaidBlockProcessor do
   include_examples "block", :mermaid, 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/msc_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 MSC_CODE = <<-eos
 # MSC for some fictional process

data/spec/nomnoml_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 NOMNOML_CODE = <<-eos
 [Pirate

data/spec/pikchr_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 PIKCHR_CODE = <<-eos
 # Change from the original:

data/spec/plantuml_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 PLANTUML_CODE = <<-eos
 User -> (Start)

data/spec/shaape_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 SHAAPE_CODE = <<-eos
         +-->

data/spec/shared_examples.rb

@@ -1,4 +1,5 @@
-require_relative 'test_helper'
+require 'rspec'
+require_relative 'test_helper_methods'
 
 RSpec.shared_examples "block_macro" do |name, code, formats|
   formats.each do |format|
@@ -497,6 +498,7 @@ Doc Writer <doc@example.com>
 
 [#{name}, format="foobar"]
 ----
+#{code}
 ----
     eos
 

data/spec/smcat_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 SMCAT_CODE = <<-eos
 initial,

data/spec/structurizr_spec.rb

@@ -0,0 +1,41 @@
+require_relative 'test_helper_methods'
+
+STRUCTURIZR_CODE = <<-eos
+workspace {
+
+    model {
+        user = person "User"
+        softwareSystem = softwareSystem "Software System" {
+            webapp = container "Web Application" {
+                user -> this "Uses"
+            }
+            container "Database" {
+                webapp -> this "Reads from and writes to"
+            }
+        }
+    }
+
+    views {
+        systemContext softwareSystem {
+            include *
+            autolayout lr
+        }
+
+        container softwareSystem {
+            include *
+            autolayout lr
+        }
+
+        theme default
+    }
+
+}
+eos
+
+describe Asciidoctor::Diagram::StructurizrBlockMacroProcessor, :broken_on_windows, :broken_on_github do
+  include_examples "block_macro", :structurizr, STRUCTURIZR_CODE, [:png, :png]
+end
+
+describe Asciidoctor::Diagram::StructurizrBlockProcessor, :broken_on_windows, :broken_on_github do
+  include_examples "block", :structurizr, STRUCTURIZR_CODE, [:png, :png]
+end

data/spec/svgbob_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 SVGBOB_CODE = <<-eos
                       .--.            .---.  .---. .---.  .---.    .---.  .---. 

data/spec/symbolator_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 SYMBOLATOR_CODE = <<-eos
 library ieee;

data/spec/syntrax_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 SYNTRAX_CODE = <<-eos
 indentstack(10,

data/spec/{test_helper.rb → test_helper_methods.rb}

@@ -1,3 +1,5 @@
+require 'rspec'
+
 require 'asciidoctor'
 require 'asciidoctor/cli/invoker'
 
@@ -45,6 +47,8 @@ end
 module Asciidoctor
   module Diagram
     module TestHelpers
+      include ::Asciidoctor::Logging
+
       def load_asciidoc(source, options = {})
         options = options.dup
         options[:trace] = true
@@ -69,7 +73,8 @@ module Asciidoctor
           options[:attributes]['diagram-on-error'] = 'abort'
         end
 
-        ::Asciidoctor.load(StringIO.new(source), options.merge({:trace => true}))
+        logger.level = ::Logger::Severity::DEBUG
+        ::Asciidoctor.load(StringIO.new(source), options.merge({:trace => true, :verbose => 2}))
       end
     end
   end

data/spec/tikz_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 TIKZ_CODE = <<-'eos'
 \begin{tikzpicture}[font=\LARGE] 

data/spec/umlet_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 CODE = <<-eos
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

data/spec/vega_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 VEGA_CODE = <<-eos
 {

data/spec/wavedrom_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 WAVEDROM_CODE = <<-eos
 { signal : [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.10
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,13 +126,58 @@ files:
 - README.adoc
 - Rakefile
 - docs/antora.yml
+- docs/modules/ROOT/images/a2s.svg
+- docs/modules/ROOT/images/actdiag.png
 - docs/modules/ROOT/images/asciidoctor-diagram-classes.png
 - docs/modules/ROOT/images/asciidoctor-diagram-process.png
+- docs/modules/ROOT/images/barcode.png
+- docs/modules/ROOT/images/barcode2.png
+- docs/modules/ROOT/images/blockdiag.png
+- docs/modules/ROOT/images/d2.png
+- docs/modules/ROOT/images/lilypond.png
+- docs/modules/ROOT/images/penrose.png
+- docs/modules/ROOT/nav.adoc
+- docs/modules/ROOT/pages/blocks.adoc
+- docs/modules/ROOT/pages/diagram_types/a2s.adoc
+- docs/modules/ROOT/pages/diagram_types/actdiag.adoc
+- docs/modules/ROOT/pages/diagram_types/barcode.adoc
+- docs/modules/ROOT/pages/diagram_types/blockdiag.adoc
+- docs/modules/ROOT/pages/diagram_types/bpmn.adoc
+- docs/modules/ROOT/pages/diagram_types/bytefield.adoc
+- docs/modules/ROOT/pages/diagram_types/d2.adoc
+- docs/modules/ROOT/pages/diagram_types/dbml.adoc
+- docs/modules/ROOT/pages/diagram_types/diagrams.adoc
+- docs/modules/ROOT/pages/diagram_types/ditaa.adoc
+- docs/modules/ROOT/pages/diagram_types/dpic.adoc
+- docs/modules/ROOT/pages/diagram_types/erd.adoc
+- docs/modules/ROOT/pages/diagram_types/gnuplot.adoc
+- docs/modules/ROOT/pages/diagram_types/graphviz.adoc
+- docs/modules/ROOT/pages/diagram_types/lilypond.adoc
+- docs/modules/ROOT/pages/diagram_types/meme.adoc
+- docs/modules/ROOT/pages/diagram_types/mermaid.adoc
+- docs/modules/ROOT/pages/diagram_types/msc.adoc
+- docs/modules/ROOT/pages/diagram_types/nomnoml.adoc
+- docs/modules/ROOT/pages/diagram_types/nwdiag.adoc
+- docs/modules/ROOT/pages/diagram_types/penrose.adoc
+- docs/modules/ROOT/pages/diagram_types/pikchr.adoc
+- docs/modules/ROOT/pages/diagram_types/plantuml.adoc
+- docs/modules/ROOT/pages/diagram_types/seqdiag.adoc
+- docs/modules/ROOT/pages/diagram_types/shaape.adoc
+- docs/modules/ROOT/pages/diagram_types/smcat.adoc
+- docs/modules/ROOT/pages/diagram_types/structurizr.adoc
+- docs/modules/ROOT/pages/diagram_types/svgbob.adoc
+- docs/modules/ROOT/pages/diagram_types/symbolator.adoc
+- docs/modules/ROOT/pages/diagram_types/syntrax.adoc
+- docs/modules/ROOT/pages/diagram_types/tikz.adoc
+- docs/modules/ROOT/pages/diagram_types/umlet.adoc
+- docs/modules/ROOT/pages/diagram_types/vega.adoc
+- docs/modules/ROOT/pages/diagram_types/wavedrom.adoc
+- docs/modules/ROOT/pages/enabling.adoc
+- docs/modules/ROOT/pages/generate.adoc
 - 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/pages/installation.adoc
+- docs/modules/ROOT/pages/output.adoc
+- docs/modules/ROOT/partials/shared-attrs.adoc
 - docs/modules/ROOT/partials/uris.adoc
 - examples/Gemfile
 - examples/README.adoc
@@ -204,6 +249,9 @@ files:
 - lib/asciidoctor-diagram/nomnoml.rb
 - lib/asciidoctor-diagram/nomnoml/converter.rb
 - lib/asciidoctor-diagram/nomnoml/extension.rb
+- lib/asciidoctor-diagram/penrose.rb
+- lib/asciidoctor-diagram/penrose/converter.rb
+- lib/asciidoctor-diagram/penrose/extension.rb
 - lib/asciidoctor-diagram/pikchr.rb
 - lib/asciidoctor-diagram/pikchr/converter.rb
 - lib/asciidoctor-diagram/pikchr/extension.rb
@@ -222,7 +270,7 @@ files:
 - lib/asciidoctor-diagram/structurizr/converter.rb
 - lib/asciidoctor-diagram/structurizr/extension.rb
 - lib/asciidoctor-diagram/structurizr/renderers.rb
-- lib/asciidoctor-diagram/structurizr/structurizr-2.0.1.jar
+- lib/asciidoctor-diagram/structurizr/structurizr-2.0.3.jar
 - lib/asciidoctor-diagram/svgbob.rb
 - lib/asciidoctor-diagram/svgbob/converter.rb
 - lib/asciidoctor-diagram/svgbob/extension.rb
@@ -284,10 +332,11 @@ files:
 - spec/shaape_spec.rb
 - spec/shared_examples.rb
 - spec/smcat_spec.rb
+- spec/structurizr_spec.rb
 - spec/svgbob_spec.rb
 - spec/symbolator_spec.rb
 - spec/syntrax_spec.rb
-- spec/test_helper.rb
+- spec/test_helper_methods.rb
 - spec/tikz_spec.rb
 - spec/umlet_spec.rb
 - spec/vega_spec.rb
@@ -301,7 +350,7 @@ metadata:
   documentation_uri: https://docs.asciidoctor.org/diagram-extension/latest/
   homepage_uri: https://github.com/asciidoctor/asciidoctor-diagram
   source_code_uri: https://github.com/asciidoctor/asciidoctor-diagram.git
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -316,8 +365,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A family of Asciidoctor extensions that generate images from a broad range
   of embedded plain text diagram descriptions, including PlantUML, ditaa, Kroki, and
@@ -348,10 +397,11 @@ test_files:
 - spec/shaape_spec.rb
 - spec/shared_examples.rb
 - spec/smcat_spec.rb
+- spec/structurizr_spec.rb
 - spec/svgbob_spec.rb
 - spec/symbolator_spec.rb
 - spec/syntrax_spec.rb
-- spec/test_helper.rb
+- spec/test_helper_methods.rb
 - spec/tikz_spec.rb
 - spec/umlet_spec.rb
 - spec/vega_spec.rb