asciidoctor-mermaid 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58b562bc72d72c35ead0c58aeac9854f338118dd827c511d8f93145c52f51ce7
-  data.tar.gz: d4804028270f704bf76312b5383b49eb5428dbffed6cacb1568968ab907fabfd
+  metadata.gz: 577319efee650e33d1db7ee0a56917ae8b6107fdfaeee67ea9018a857c189529
+  data.tar.gz: 5c2df794560ef01598f5dd475310e894a9f68bd60b4b0a20d4acaf870536180c
 SHA512:
-  metadata.gz: b777dd329e10488527dce93d7e02603850b2bec4ba1504215a22a6401d224c9872ce4c3e1602333ab7a27b989379f1ec55b2e2beb0d47480f9683c690319bf8a
-  data.tar.gz: ee96b36f01f0983e61ebe541c640d881f6ca68edcce4cc3e615f23dbf8ba13580d5dc7dcd86d19372e3ce99cc2a06576d4d77e99d2c30614cc9b8353bd5aa997
+  metadata.gz: 3996fb7d9d1c3a15a0013489763154ee68881a05a5f1e67d3f0a9d31310899ed717f201e33edd835154022edad3be3b5592b8db0fc70b1fa6514f78641eb8cab
+  data.tar.gz: 12a5dc56e46770bb26b41fb2b800fc5314d05b67b7d7a42ad62c41a4dedf7ac232ee930c0b298eb07b8001ad43cec17d651338549631c70ae264d795082677de

data/lib/asciidoctor-mermaid/extension.rb

@@ -6,9 +6,10 @@ require_relative 'cli'
 class MermaidTreeProcessor < Asciidoctor::Extensions::TreeProcessor
   def process(document)
     document.blocks.map! do |block|
-      if !block.blocks.empty?
+      if block.respond_to?(:blocks) && !block.blocks.empty?
         process(block)
-      elsif block.attributes['style'] === 'source' &&
+      elsif block.respond_to?(:attributes) &&
+           block.attributes['style'] === 'source' &&
            block.attributes['language'] === 'mermaid'
         self.convert_block(block)
       else

data/lib/asciidoctor-mermaid/pdf.rb

@@ -4,12 +4,13 @@ require 'digest/md5'
 require 'tempfile'
 require_relative 'cli'
 
-class MermaidTreeProcessor < Asciidoctor::Extensions::TreeProcessor
+class MermaidPDFTreeProcessor < Asciidoctor::Extensions::TreeProcessor
   def process(document)
     document.blocks.map! do |block|
-      if !block.blocks.empty?
+      if block.respond_to?(:blocks) && !block.blocks.empty?
         process(block)
-      elsif block.attributes['style'] === 'source' &&
+      elsif block.respond_to?(:attributes) &&
+           block.attributes['style'] === 'source' &&
            block.attributes['language'] === 'mermaid'
         self.convert_block(block)
       else
@@ -41,4 +42,4 @@ class MermaidTreeProcessor < Asciidoctor::Extensions::TreeProcessor
   end
 end
 
-Asciidoctor::Extensions.register { treeprocessor MermaidTreeProcessor }
+Asciidoctor::Extensions.register { treeprocessor MermaidPDFTreeProcessor }

data/lib/asciidoctor-mermaid/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Mermaid
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/spec/extension_spec.rb

@@ -1,4 +1,5 @@
 require 'asciidoctor'
+require 'asciidoctor-mermaid'
 
 mermaid_doc = <<-eos
 lorem ipsum 
@@ -9,14 +10,37 @@ flowchart LR
 ```
 eos
 
+array_handling = <<-eos
+[glossary]
+== Glossary
+
+- [[g-foo, FOO]]
+FOO::
+
+This is the first entry
+
+- [[g-bar, BAR]]
+BAR::
+
+This is the second entry
+eos
+
 describe 'extension' do
   before do
     Asciidoctor::Extensions.unregister_all
-    require 'asciidoctor-mermaid'
+    Asciidoctor::Extensions.register { treeprocessor MermaidTreeProcessor }
   end
+
   it 'renders a basic mermaid diagram' do
     doc = Asciidoctor.convert mermaid_doc
     expect(doc).to include('id="mermaid-')
     expect(doc).to include('flowchart node text')
   end
+
+  # On v0.3.0 this should fail with NoMethodError: undefined method `blocks' for #<Array...>
+  it 'renders a document containing arrays' do
+    doc = Asciidoctor.convert array_handling
+    expect(doc).to include('FOO')
+    expect(doc).to include('BAR')
+  end
 end

data/spec/pdf_extension_spec.rb

@@ -1,4 +1,5 @@
 require 'asciidoctor'
+require 'asciidoctor-mermaid/pdf'
 
 mermaid_doc = <<-eos
 lorem ipsum 
@@ -9,14 +10,37 @@ flowchart LR
 ```
 eos
 
+array_handling = <<-eos
+[glossary]
+== Glossary
+
+- [[g-foo, FOO]]
+FOO::
+
+This is the first entry
+
+- [[g-bar, BAR]]
+BAR::
+
+This is the second entry
+eos
+
 describe 'pdf extension' do
   before do
     Asciidoctor::Extensions.unregister_all
-    require 'asciidoctor-mermaid/pdf'
+    Asciidoctor::Extensions.register { treeprocessor MermaidPDFTreeProcessor }
   end
+
   it 'renders a basic mermaid diagram' do
     doc = Asciidoctor.convert mermaid_doc
     expect(doc).to include('class="imageblock text-center"')
     expect(doc).to include('<img src=')
   end
+
+  # On v0.3.0 this should fail with NoMethodError: undefined method `blocks' for #<Array...>
+  it 'renders a document containing arrays' do
+    doc = Asciidoctor.convert array_handling
+    expect(doc).to include('FOO')
+    expect(doc).to include('BAR')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-mermaid
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Bennett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler