asciidoctor-mermaid 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58b562bc72d72c35ead0c58aeac9854f338118dd827c511d8f93145c52f51ce7
-  data.tar.gz: d4804028270f704bf76312b5383b49eb5428dbffed6cacb1568968ab907fabfd
+  metadata.gz: 6275fc0501bbfa03f17c82eb2dd86b750ca881042b2c749e614b1d046e440d33
+  data.tar.gz: 348cd60e6d9f67ff5a2537fcddf70b542e6937f87785def52cefd002baeb4197
 SHA512:
-  metadata.gz: b777dd329e10488527dce93d7e02603850b2bec4ba1504215a22a6401d224c9872ce4c3e1602333ab7a27b989379f1ec55b2e2beb0d47480f9683c690319bf8a
-  data.tar.gz: ee96b36f01f0983e61ebe541c640d881f6ca68edcce4cc3e615f23dbf8ba13580d5dc7dcd86d19372e3ce99cc2a06576d4d77e99d2c30614cc9b8353bd5aa997
+  metadata.gz: c834f88d3e763e66898b88a316516087b001025cefe690aa85a1c4892dd1f6ff23d6c0c6fadd44b47e850bc193aed4a6141dc48c1a1b1aca58aa09d4d277739c
+  data.tar.gz: 57bfc15c788c8d0b0b5de8f36e461c26ef2e862faa7519e80f59dce08917aa9ddad1ec7c556a43d4d179c6d8a909a9e4888b3d1413e913cc902a0155bdacd8e3

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
@@ -22,23 +23,27 @@ class MermaidTreeProcessor < Asciidoctor::Extensions::TreeProcessor
   protected
 
   def convert_block(block)
-    # TODO: Currently I'm unsure how to clean up tmp images after pdf generation completes
-    img = self.render_svg(block.source)
+    image_contents = "data:image/png;base64," + Base64.strict_encode64(self.render_png(block.source))
+
     Asciidoctor::Block.new block.parent,
                            :image,
                            attributes: {
                              'imagesdir' => nil,
-                             'target' => img.path,
+                             'target' => image_contents,
                              'align' => 'center',
                            }
   end
 
-  def render_svg(content)
+  def render_png(content)
     file_name = Digest::MD5.hexdigest(content)
     output_file = Tempfile.new([file_name, '.png'])
     ::Asciidoctor::Mermaid::Cli.run(content, "-o#{output_file.path}")
-    output_file
+
+    # Tempfile will unlink the underlying PDF by the time bundling occurs. Therefore we need to
+    # read back in the data so that we can tell Asciidoctor to use an inline data uri.
+    # TODO: Does this event need to use a tmp file? Can mmdc return the contents directly?
+    File.read(output_file.path)
   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.1'
   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.1
 platform: ruby
 authors:
 - Justin Bennett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler