asciidoctor-diagram 1.5.13 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ffc1f6fe55704de14ad37b6d54292decde729e9b
-  data.tar.gz: e8e81c21b5918ba8337ff5340382cbe9a311ca37
+SHA256:
+  metadata.gz: 5962614a723e062d532b327981f996fc78935fc0e0e54845c75b3e574ed60625
+  data.tar.gz: a7418066cac52fe651021800321d41be68bf63e27979be5891af58c2f56325ba
 SHA512:
-  metadata.gz: a2426b51df51fa6d625c4a2c2345f3157b0c8eac5cd5683d52680f2908326a2aa385483bdda8780321af7ee96276ae1dcdfb087ca3ed8859aaa7b47df9630389
-  data.tar.gz: 772a8642bda51b9abfba2044fa9d27d5296e5e13dd6d8e4ed7b9298dc4ee93f53e7eb18c94c04e295a407736e97b89465dcccfeaf8428d8884201150f1d414ef
+  metadata.gz: 7f10827a1a1c917bb5f19de7dab893ada70ad7e946b155a6172a3300ad740a538343a7327c95d9fb4ef3001eebb389c66f30fdef02cbca71c31c1f61f4c718e7
+  data.tar.gz: a7d1e19e061cfeac793fde2ba33a8b47a54dd9f15957472f223705e1093c01bf42384a38653b1611d08c4f872c3c9fc9caf498c4e995966e29ecbf949374a26b

data/CHANGELOG.adoc

@@ -1,5 +1,12 @@
 = Asciidoctor-diagram Changelog
 
+== 1.5.14
+
+Enhancements::
+  * Add support for Nomnoml (@Mogztter)
+  * Use system HTTP(S) proxies in java subprocess (@hakandilek)
+  * Issue #214: Improve extension loading performance
+
 == 1.5.13
 
 Bug Fixes::

data/README.adoc

@@ -26,6 +26,7 @@ ifndef::env-site[:status:]
 :uri-java: http://java.sun.com
 :uri-mermaid: https://github.com/mermaidjs/mermaid.cli
 :uri-mscgen: http://www.mcternan.me.uk/mscgen/
+:uri-nomnoml: http://nomnoml.com
 :uri-nwdiag: http://blockdiag.com/en/nwdiag/index.html
 :uri-packetdiag: http://blockdiag.com/en/nwdiag/index.html
 :uri-phantomjs: http://phantomjs.org
@@ -45,7 +46,7 @@ ifndef::env-site[:status:]
 
 Asciidoctor Diagram is a set of Asciidoctor extensions that enable you to add diagrams, which you describe using plain text, to your AsciiDoc document.
 
-The extensions supports the {uri-a2s}[AsciiToSVG], BlockDiag ({uri-blockdiag}[BlockDiag], {uri-seqdiag}[SeqDiag], {uri-actdiag}[ActDiag], {uri-nwdiag}[NwDiag]), {uri-ditaa}[Ditaa], {uri-erd}[Erd], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {uri-svgbob}[SvgBob], {uri-syntrax}[Syntrax], {uri-umlet}[UMLet], {uri-vega}[Vega], {uri-vegalite}[Vega-Lite] and {uri-wavedrom}[WaveDrom] syntax.
+The extensions supports the {uri-a2s}[AsciiToSVG], BlockDiag ({uri-blockdiag}[BlockDiag], {uri-seqdiag}[SeqDiag], {uri-actdiag}[ActDiag], {uri-nwdiag}[NwDiag]), {uri-ditaa}[Ditaa], {uri-erd}[Erd], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-nomnoml}[Nomnoml], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {uri-svgbob}[SvgBob], {uri-syntrax}[Syntrax], {uri-umlet}[UMLet], {uri-vega}[Vega], {uri-vegalite}[Vega-Lite] and {uri-wavedrom}[WaveDrom] syntax.
 
 Each extension runs the diagram processor to generate an SVG, PNG, or TXT file from the input text.
 The generated file is then inserted into your converted document.
@@ -124,6 +125,7 @@ The following diagram types and output formats are available:
 |<<meme,meme>>               |{check}|       |{check}|       |
 |{uri-mermaid}[mermaid]      |       |{check}|{check}|{check}|
 |{uri-mscgen}[msc]           |       |       |{check}|{check}|
+|{uri-nomnoml}[nomnoml]      |       |       |       |{check}|
 |{uri-nwdiag}[nwdiag]        |       |{check}|{check}|{check}|
 |{uri-packetdiag}[packetdiag]|       |{check}|{check}|{check}|
 |{uri-plantuml}[plantuml]    |       |       |{check}|{check}|{check}
@@ -299,6 +301,7 @@ The following table lists the tools that are required for each diagram type, the
    |meme         |{uri-imagemagick}[ImageMagick]                                        |`convert` and `identify`
    |mermaid      |{uri-mermaid}[Mermaid.cli]                                            |`mermaid`
    |msc          |{uri-mscgen}[Mscgen]                                                  |`mscgen`
+   |nomnoml      |{uri-nomnoml}[Nomnoml]                                                |`nomnoml`
    |nwdiag       |{uri-nwdiag}[NwDiag]                                                  |`nwdiag`
    |packetdiag   |{uri-nwdiag}[NwDiag]                                                  |`packetdiag`
    |plantuml     |{uri-java}[Java]                                                      |`java`

data/lib/asciidoctor-diagram.rb

@@ -6,6 +6,7 @@ require_relative 'asciidoctor-diagram/graphviz'
 require_relative 'asciidoctor-diagram/meme'
 require_relative 'asciidoctor-diagram/mermaid'
 require_relative 'asciidoctor-diagram/msc'
+require_relative 'asciidoctor-diagram/nomnoml'
 require_relative 'asciidoctor-diagram/plantuml'
 require_relative 'asciidoctor-diagram/salt'
 require_relative 'asciidoctor-diagram/shaape'

data/lib/asciidoctor-diagram/a2s.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'a2s/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'a2s/extension'
-
   block Asciidoctor::Diagram::AsciiToSvgBlockProcessor, :a2s
   block_macro Asciidoctor::Diagram::AsciiToSvgBlockMacroProcessor, :a2s
 end

data/lib/asciidoctor-diagram/blockdiag.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'blockdiag/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'blockdiag/extension'
-
   ['BlockDiag', 'SeqDiag', 'ActDiag', 'NwDiag', 'RackDiag', 'PacketDiag'].each do |tool|
     block ::Asciidoctor::Diagram.const_get("#{tool}BlockProcessor"), tool.downcase.to_sym
     block_macro ::Asciidoctor::Diagram.const_get("#{tool}BlockMacroProcessor"), tool.downcase.to_sym

data/lib/asciidoctor-diagram/ditaa.rb

@@ -1,7 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'ditaa/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'ditaa/extension'
   block Asciidoctor::Diagram::DitaaBlockProcessor, :ditaa
   block_macro Asciidoctor::Diagram::DitaaBlockMacroProcessor, :ditaa
 end

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

@@ -1,12 +1,29 @@
 require 'set'
 
 require_relative '../extensions'
-require_relative 'converter'
+require_relative '../util/java'
 
 module Asciidoctor
   module Diagram
+    # @private
     module Ditaa
-      OPTION_KEYS = DitaaConverter::OPTIONS.keys
+      OPTIONS = {
+          'scale' => lambda { |o, v| o << '--scale' << v if v },
+          'tabs' => lambda { |o, v| o << '--tabs' << v if v },
+          'background' => lambda { |o, v| o << '--background' << v if v },
+          'antialias' => lambda { |o, v| o << '--no-antialias' if v == 'false' },
+          'separation' => lambda { |o, v| o  << '--no-separation' if v == 'false'},
+          'round-corners' => lambda { |o, v| o  << '--round-corners' if v == 'true'},
+          'shadows' => lambda { |o, v| o  << '--no-shadows' if v == 'false'},
+          'debug' => lambda { |o, v| o  << '--debug' if v == 'true'},
+          'fixed-slope' => lambda { |o, v| o  << '--fixed-slope' if v == 'true'},
+          'transparent' => lambda { |o, v| o  << '--transparent' if v == 'true'}
+      }
+
+      JARS = ['ditaa-1.3.13.jar', 'ditaamini-0.11.jar'].map do |jar|
+        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
+      end
+      Java.classpath.concat JARS
 
       def self.included(mod)
         mod.register_format(:png, :image) do |parent, source|
@@ -19,14 +36,35 @@ module Asciidoctor
       end
 
       def ditaa(parent, source, mime_type)
+        Java.load
+
         global_attributes = parent.document.attributes
-        opts = {}
-        opts['mime_type'] = mime_type
-        OPTION_KEYS.each do |key|
+
+        options = []
+
+        OPTIONS.keys.each do |key|
           value = source.attributes.delete(key) || global_attributes["ditaa-option-#{key}"]
-          opts[key] = value if value
+          OPTIONS[key].call(options, value)
         end
-        DitaaConverter.convert(source.to_s, opts)
+
+        options_string = options.join(' ')
+
+        headers = {
+            'Accept' => mime_type,
+            'X-Options' => options_string
+        }
+
+        response = Java.send_request(
+            :url => '/ditaa',
+            :body => source.to_s,
+            :headers => headers
+        )
+
+        unless response[:code] == 200
+          raise Java.create_error("Ditaa image generation failed", response)
+        end
+
+        response[:body]
       end
     end
 

data/lib/asciidoctor-diagram/erd.rb

@@ -1,7 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'erd/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'erd/extension'
   block Asciidoctor::Diagram::ErdBlockProcessor, :erd
   block_macro Asciidoctor::Diagram::ErdBlockMacroProcessor, :erd
 end

data/lib/asciidoctor-diagram/extensions.rb

@@ -192,7 +192,7 @@ module Asciidoctor
             File.open(metadata_file, 'w') { |f| JSON.dump(metadata, f) }
           end
 
-          image_attributes['target'] = parent.attr('data-uri') ? image_file : image_name
+          image_attributes['target'] = parent.attr('data-uri', nil, true) ? image_file : image_name
 
           scale = image_attributes['scale']
           if scalematch = /(\d+(?:\.\d+))/.match(scale)
@@ -245,13 +245,13 @@ module Asciidoctor
         def image_output_dir(parent)
           document = parent.document
 
-          images_dir = parent.attr('imagesoutdir')
+          images_dir = parent.attr('imagesoutdir', nil, true)
 
           if images_dir
             base_dir = nil
           else
-            base_dir = parent.attr('outdir') || doc_option(document, :to_dir)
-            images_dir = parent.attr('imagesdir')
+            base_dir = parent.attr('outdir', nil, true) || doc_option(document, :to_dir)
+            images_dir = parent.attr('imagesdir', nil, true)
           end
 
           parent.normalize_system_path(images_dir, base_dir)
@@ -260,7 +260,7 @@ module Asciidoctor
         def cache_dir(parent)
           document = parent.document
           cache_dir = '.asciidoctor/diagram'
-          base_dir = parent.attr('outdir') || doc_option(document, :to_dir)
+          base_dir = parent.attr('outdir', nil, true) || doc_option(document, :to_dir)
           parent.normalize_system_path(cache_dir, base_dir)
         end
 

data/lib/asciidoctor-diagram/graphviz.rb

@@ -1,7 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'graphviz/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'graphviz/extension'
   block Asciidoctor::Diagram::GraphvizBlockProcessor, :graphviz
   block_macro Asciidoctor::Diagram::GraphvizBlockMacroProcessor, :graphviz
 end

data/lib/asciidoctor-diagram/meme.rb

@@ -1,7 +1,6 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'meme/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'meme/extension'
-
   block_macro Asciidoctor::Diagram::MemeBlockMacroProcessor, :meme
 end

data/lib/asciidoctor-diagram/mermaid.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'mermaid/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'mermaid/extension'
-
   block Asciidoctor::Diagram::MermaidBlockProcessor, :mermaid
   block_macro Asciidoctor::Diagram::MermaidBlockMacroProcessor, :mermaid
 end

data/lib/asciidoctor-diagram/msc.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'msc/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'msc/extension'
-
   block Asciidoctor::Diagram::MscBlockProcessor, :msc
   block_macro Asciidoctor::Diagram::MscBlockMacroProcessor, :msc
 end

data/lib/asciidoctor-diagram/nomnoml.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'nomnoml/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::NomnomlBlockProcessor, :nomnoml
+  block_macro Asciidoctor::Diagram::NomnomlBlockMacroProcessor, :nomnoml
+end

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

@@ -0,0 +1,36 @@
+require_relative '../extensions'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+require_relative '../util/which'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    module Nomnoml
+      include CliGenerator
+      include Which
+
+      def self.included(mod)
+        [:svg].each do |f|
+          mod.register_format(f, :image) do |parent, source|
+            nomnoml(parent, source, f)
+          end
+        end
+      end
+
+      def nomnoml(parent, source, format)
+        generate_file(which(parent, 'nomnoml'), 'nomnoml', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
+        end
+      end
+    end
+
+    class NomnomlBlockProcessor < Extensions::DiagramBlockProcessor
+      include Nomnoml
+    end
+
+    class NomnomlBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
+      include Nomnoml
+    end
+  end
+end

data/lib/asciidoctor-diagram/plantuml.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'plantuml/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'plantuml/extension'
-
   block Asciidoctor::Diagram::PlantUmlBlockProcessor, :plantuml
   block_macro Asciidoctor::Diagram::PlantUmlBlockMacroProcessor, :plantuml
 end

data/lib/asciidoctor-diagram/salt.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'plantuml/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'plantuml/extension'
-
   block Asciidoctor::Diagram::SaltBlockProcessor, :salt
   block_macro Asciidoctor::Diagram::SaltBlockMacroProcessor, :salt
 end

data/lib/asciidoctor-diagram/shaape.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'shaape/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'shaape/extension'
-
   block Asciidoctor::Diagram::ShaapeBlockProcessor, :shaape
   block_macro Asciidoctor::Diagram::ShaapeBlockMacroProcessor, :shaape
 end

data/lib/asciidoctor-diagram/svgbob.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'svgbob/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'svgbob/extension'
-
   block Asciidoctor::Diagram::SvgBobBlockProcessor, :svgbob
   block_macro Asciidoctor::Diagram::SvgBobBlockMacroProcessor, :svgbob
 end

data/lib/asciidoctor-diagram/syntrax.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'syntrax/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'syntrax/extension'
-
   block Asciidoctor::Diagram::SyntraxBlockProcessor, :syntrax
   block_macro Asciidoctor::Diagram::SyntraxBlockMacroProcessor, :syntrax
 end

data/lib/asciidoctor-diagram/tikz.rb

@@ -1,7 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'tikz/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'tikz/extension'
   block Asciidoctor::Diagram::TikZBlockProcessor, :tikz
   block_macro Asciidoctor::Diagram::TikZBlockMacroProcessor, :tikz
 end

data/lib/asciidoctor-diagram/umlet.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'umlet/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'umlet/extension'
-
   block Asciidoctor::Diagram::UmletBlockProcessor, :umlet
   block_macro Asciidoctor::Diagram::UmletBlockMacroProcessor, :umlet
 end

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

@@ -14,6 +14,7 @@ module Asciidoctor
         def initialize(java, classpath)
           args = []
           args << '-Djava.awt.headless=true'
+          args << '-Djava.net.useSystemProxies=true'
           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.CommandServer'

data/lib/asciidoctor-diagram/vega.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'vega/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'vega/extension'
-
   block Asciidoctor::Diagram::VegaBlockProcessor, :vega
   block_macro Asciidoctor::Diagram::VegaBlockMacroProcessor, :vega
 

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.5.13"
+    VERSION = "1.5.14"
   end
 end

data/lib/asciidoctor-diagram/wavedrom.rb

@@ -1,8 +1,7 @@
-require_relative 'extensions'
+require 'asciidoctor/extensions'
+require_relative 'wavedrom/extension'
 
 Asciidoctor::Extensions.register do
-  require_relative 'wavedrom/extension'
-
   block Asciidoctor::Diagram::WavedromBlockProcessor, :wavedrom
   block_macro Asciidoctor::Diagram::WavedromBlockMacroProcessor, :wavedrom
 end

data/spec/nomnoml_spec.rb

@@ -0,0 +1,170 @@
+require_relative 'test_helper'
+
+code = <<-eos
+[Pirate|eyeCount: Int|raid();pillage()|
+  [beard]--[parrot]
+  [beard]-:>[foul mouth]
+]
+
+[<abstract>Marauder]<:--[Pirate]
+[Pirate]- 0..7[mischief]
+[jollyness]->[Pirate]
+[jollyness]->[rum]
+[jollyness]->[singing]
+[Pirate]-> *[rum|tastiness: Int|swig()]
+[Pirate]->[singing]
+[singing]<->[rum]
+
+[<start>st]->[<state>plunder]
+[plunder]->[<choice>more loot]
+[more loot]->[st]
+[more loot] no ->[<end>e]
+
+[<actor>Sailor] - [<usecase>shiver me;timbers]
+eos
+
+describe Asciidoctor::Diagram::NomnomlBlockMacroProcessor do
+  it "should generate SVG images when format is set to 'svg'" do
+    File.write('nomnoml.txt', code)
+
+    doc = <<-eos
+= Hello, Nomnoml!
+Doc Writer <doc@example.com>
+
+== First Section
+
+nomnoml::nomnoml.txt[format="svg"]
+    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
+end
+
+describe Asciidoctor::Diagram::NomnomlBlockProcessor, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, Nomnoml!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[nomnoml, format="svg"]
+----
+#{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
+
+    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 raise an error when when format is set to an invalid value" do
+    doc = <<-eos
+= Hello, Nomnoml!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[nomnoml, format="foobar"]
+----
+----
+    eos
+
+    expect { load_asciidoc doc }.to raise_error(/support.*format/i)
+  end
+
+  it "should not regenerate images when source has not changed" do
+    File.write('nomnoml.txt', code)
+
+    doc = <<-eos
+= Hello, Nomnoml!
+Doc Writer <doc@example.com>
+
+== First Section
+
+nomnoml::nomnoml.txt
+
+[nomnoml, format="svg"]
+----
+#{code}
+----
+    eos
+
+    d = load_asciidoc doc
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+    target = b.attributes['target']
+    mtime1 = File.mtime(target)
+
+    sleep 1
+
+    d = load_asciidoc doc
+
+    mtime2 = File.mtime(target)
+
+    expect(mtime2).to eq mtime1
+  end
+
+  it "should handle two block macros with the same source" do
+    File.write('nomnoml.txt', code)
+
+    doc = <<-eos
+= Hello, Nomnoml!
+Doc Writer <doc@example.com>
+
+== First Section
+
+nomnoml::nomnoml.txt[]
+nomnoml::nomnoml.txt[]
+    eos
+
+    load_asciidoc doc
+    expect(File.exist?('nomnoml.svg')).to be true
+  end
+
+  it "should respect target attribute in block macros" do
+    File.write('nomnoml.txt', code)
+
+    doc = <<-eos
+= Hello, Nomnoml!
+Doc Writer <doc@example.com>
+
+== First Section
+
+nomnoml::nomnoml.txt["foobar"]
+nomnoml::nomnoml.txt["foobaz"]
+    eos
+
+    load_asciidoc doc
+    expect(File.exist?('foobar.svg')).to be true
+    expect(File.exist?('foobaz.svg')).to be true
+    expect(File.exist?('nomnoml.svg')).to be false
+  end
+end

data/spec/test_helper.rb

@@ -14,6 +14,7 @@ require_relative '../lib/asciidoctor-diagram/graphviz/extension'
 require_relative '../lib/asciidoctor-diagram/meme/extension'
 require_relative '../lib/asciidoctor-diagram/mermaid/extension'
 require_relative '../lib/asciidoctor-diagram/msc/extension'
+require_relative '../lib/asciidoctor-diagram/nomnoml/extension'
 require_relative '../lib/asciidoctor-diagram/plantuml/extension'
 require_relative '../lib/asciidoctor-diagram/shaape/extension'
 require_relative '../lib/asciidoctor-diagram/svgbob/extension'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.5.14
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,6 @@ files:
 - lib/asciidoctor-diagram/blockdiag.rb
 - lib/asciidoctor-diagram/blockdiag/extension.rb
 - lib/asciidoctor-diagram/ditaa.rb
-- lib/asciidoctor-diagram/ditaa/converter.rb
 - lib/asciidoctor-diagram/ditaa/extension.rb
 - lib/asciidoctor-diagram/erd.rb
 - lib/asciidoctor-diagram/erd/extension.rb
@@ -103,6 +102,8 @@ files:
 - lib/asciidoctor-diagram/mermaid/extension.rb
 - lib/asciidoctor-diagram/msc.rb
 - lib/asciidoctor-diagram/msc/extension.rb
+- lib/asciidoctor-diagram/nomnoml.rb
+- lib/asciidoctor-diagram/nomnoml/extension.rb
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
 - lib/asciidoctor-diagram/salt.rb
@@ -149,6 +150,7 @@ files:
 - spec/meme_spec.rb
 - spec/mermaid_spec.rb
 - spec/msc_spec.rb
+- spec/nomnoml_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
 - spec/svgbob_spec.rb
@@ -178,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
@@ -193,6 +195,7 @@ test_files:
 - spec/meme_spec.rb
 - spec/mermaid_spec.rb
 - spec/msc_spec.rb
+- spec/nomnoml_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
 - spec/svgbob_spec.rb

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

@@ -1,55 +0,0 @@
-require_relative '../util/java'
-
-module Asciidoctor
-  module Diagram
-    module DitaaConverter
-      OPTIONS = {
-        'scale' => ->(o, v) { o << '--scale' << v if v  },
-        'tabs' => ->(o, v) { o << '--tabs' << v if v },
-        'background' => ->(o, v) { o << '--background' << v if v },
-        'antialias' => ->(o, v) { o << '--no-antialias' if v == 'false' },
-        'separation' => ->(o, v) { o << '--no-separation' if v == 'false' },
-        'round-corners' => ->(o, v) { o << '--round-corners' if v == 'true' },
-        'shadows' => ->(o, v) { o << '--no-shadows' if v == 'false' },
-        'debug' => ->(o, v) {o << '--debug' if v == 'true' },
-        'fixed-slope' => ->(o, v) { o << '--fixed-slope' if v == 'true' },
-        'transparent' => ->(o, v) { o << '--transparent' if v == 'true' }
-      }.freeze
-
-      JARS = %w[ditaa-1.3.13.jar ditaamini-0.11.jar].map do |jar|
-        File.expand_path File.join('../..', jar), File.dirname(__FILE__)
-      end
-      Java.classpath.concat JARS
-
-      def self.convert(source, opts)
-        Java.load
-        headers = {
-          Accept: opts['mime_type'],
-          'X-Options' =>  to_header_options(opts)
-        }
-        send_request(source, headers)
-      end
-
-      def self.to_header_options opts
-        options = []
-        OPTIONS.keys.each do |key|
-          value = opts[key]
-          OPTIONS[key].call(options, value)
-        end
-        options.join(' ')
-      end
-
-      def self.send_request(body, headers, url = '/ditaa')
-        response = Java.send_request(
-          url:  url,
-          body: body,
-          headers: headers
-        )
-        unless response[:code] == 200
-          raise Java.create_error("Ditaa image generation failed", response)
-        end
-        response[:body]
-      end
-    end
-  end
-end