asciidoctor-diagram 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea06a8ee298a0f1331527d528d1e03bb3e018dda9c0dc69fa52506fb086e6b48
-  data.tar.gz: 26d12a8dd4da3cd38a6007d8e569b05892159c79c9538d99f3958d91be4792a2
+  metadata.gz: 9f5d112b2ce57cb2380687fce2fac5fe15f2f6d2c6198f722edd5aeaa08d6b7d
+  data.tar.gz: 8d45d7df6757adfb72c0c4c4b9ba95bab649fe6a1686418f2a4ffc49fc20facb
 SHA512:
-  metadata.gz: e81762d1af76136b66f1d35fb60aa5ebdcdd2fca3ff9d09cbf59d36485ea82b7d8eab3c4656fb236ebbadd07975b545e1d1ed7e0a205e3d50d28a6377f9f8cc5
-  data.tar.gz: 6e2a003aa9049b72d12b6e5f82dec010029bb6b2e9ccf31c4e66951e6a3beb90694601769c452a2535cef8e891736a7c633aefde39c477647eef3febfcb7427a
+  metadata.gz: 56d0bffc577cd54b56853b02454760767ff5642c935eb57e9909a0aad974ad598897e2d5f312c780471f55318de0789df39e760b917e846ec702ad0ee1640a7f
+  data.tar.gz: 67496690a923714ba8b3757781b674862dc318680797bb118ecc00d834125b42d27770465b57db440b47ce0df3e4eebab8658d7a2aec8e5cf610bef886005655

data/CHANGELOG.adoc

@@ -1,5 +1,12 @@
 = Asciidoctor-diagram Changelog
 
+== 2.2.9
+
+Bugfixes::
+
+* Issue #409: Second attempt at fixing handling of the D2 `sketch` attribute
+* Issue #415: Resolve NoMethodError when using Structurizr blocks
+
 == 2.2.8
 
 Enhancements::

data/lib/asciidoctor-diagram/d2/converter.rb

@@ -33,7 +33,7 @@ module Asciidoctor
           options.each_pair do |key, value|
             flag = "--#{key.to_s.gsub('_', '-')}"
 
-            if key == :sketch && value != 'false'
+            if key == :sketch && !value.nil? && value != 'false'
               args << flag
             elsif key.to_s.start_with?('font') && !value.nil?
               args << Platform.native_path(value)

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -64,6 +64,12 @@ module Asciidoctor
         location = parent.document.reader.cursor_at_mark
 
         normalised_attributes = attributes.inject({}) { |h, (k, v)| h[normalise_attribute_name(k)] = v; h }
+        pos_attr_index = config.fetch(:positional_attrs, []).length + 1
+        until attributes[pos_attr_index].nil?
+          normalised_attributes[attributes[pos_attr_index]] = 'true'
+          pos_attr_index = pos_attr_index + 1
+        end
+
         converter = config[:converter].new
 
         supported_formats = supported_formats(converter)

data/lib/asciidoctor-diagram/diagram_source.rb

@@ -193,6 +193,14 @@ module Asciidoctor
         name = [name] unless name.is_a?(Enumerable)
 
         value = name.lazy.map { |n| @attributes[n] }.reject { |v| v.nil? }.first
+        if value.nil?
+          attr_position = config[:positional_attrs] || 1
+          while value.nil? && !@attributes[attr_position].nil?
+            if @attributes[attr_position] == name
+              value = true
+            end
+          end
+        end
 
         if value.nil? && inherit
           inherited_values = name.lazy.map do |n|

data/lib/asciidoctor-diagram/structurizr/converter.rb

@@ -17,7 +17,7 @@ module Asciidoctor
                            ENV[CLASSPATH_ENV].split(File::PATH_SEPARATOR)
                          elsif ENV.has_key?(CLI_HOME_ENV)
                            lib_dir = File.expand_path('lib', ENV[CLI_HOME_ENV])
-                           Dir.children(lib_dir).select { |c| c.end_with? '.jar' }.map { |c| File.expand_path(c, lib_dir) }
+                           Dir[File.join(lib_dir, '*.jar')]
                          else
                            nil
                          end
@@ -52,7 +52,7 @@ module Asciidoctor
 
         response = Java.send_request(
           :url => '/structurizr',
-          :body => source.to_s,
+          :body => source.code,
           :headers => headers
         )
 

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

@@ -14,7 +14,7 @@ module Asciidoctor
 
       def initialize(name = nil, config = nil)
         super
-        @structurizr = StructurizrConvertBlockMacroProcessor.new(name)
+        @structurizr = StructurizrConvertBlockProcessor.new(name)
         @renderers = Renderers.new(name)
       end
 

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.2.8"
+    VERSION = "2.2.9"
   end
 end

data/spec/a2s_spec.rb

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

data/spec/barcode_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 BARCODES = {
   :bookland => '978-0-306-40615-7',

data/spec/blockdiag_spec.rb

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

data/spec/bpmn_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 BPNM_CODE = <<EOF
 <?xml version="1.0" encoding="UTF-8"?>

data/spec/bytefield_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative 'test_helper_methods'
 
 BYTEFIELD_CODE = <<-eos
 ;; This the source for the sample diagram illustrated in the project Read Me.

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

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'
 

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.9
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -284,10 +284,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 +302,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 +317,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.4.13
+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 +349,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