asciidoctor-diagram 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ccff08a5e14979fee3b741ce234474feb2a795d
-  data.tar.gz: 0e61b1ad07479b28caa76797becf7ae54e2d4fb3
+  metadata.gz: abeb00e6c1a06050264ad6af1d4d2aeb1273e91f
+  data.tar.gz: 378319e93a82170c6544523d31bad76728643084
 SHA512:
-  metadata.gz: d2f65dc8a689996d4a42d86343559538b383d4fd115d98828c585cb7cb8927ce8a4e1ed8b5b39d8b7bccc81b1ec32be70250b91f464c7f56c2d33734229b2543
-  data.tar.gz: 6e37fdc49db2cf843e2a3c4652e292908072b914341a53875faf2463ec0027f49148cc0e3dcc2f872e5bf5203c02c0d23394731dab4fabaea20a738eb667311d
+  metadata.gz: 7d18137fa76b2612d93d25224aa18d771cc64cad4e24990384645bb8025f114ad4d038bdb543b4cddfb8d100c178e10115501bf73244a26bfb859029c06fa723
+  data.tar.gz: 9f9b51ea388030a030026b7bba7c58c05345ba989764324631ab6b5e85ded33350d85d0c27922a23de7c36f021b3a6e3664790ef7db07c23c9dbb92c5a880699

data/CHANGELOG.adoc

@@ -1,5 +1,12 @@
 = Asciidoctor-diagram Changelog
 
+== 1.5.9
+
+Enhancements::
+
+  * Add support for ASCIIToSVG
+  * Issue #181: Add support for Vega and Vega-Lite
+
 == 1.5.8
 
 Enhancements::

data/README.adoc

@@ -13,6 +13,7 @@ ifndef::imagesdir[:imagesdir: images]
 :check: icon:check[]
 ifdef::env-github[:check: :ballot_box_with_check:]
 ifndef::env-site[:status:]
+:uri-a2s: https://github.com/dhobsd/asciitosvg
 :uri-actdiag: http://blockdiag.com/en/actdiag/index.html
 :uri-asciidoctor-api: http://asciidoctor.org/docs/user-manual/#api
 :uri-asciidoctor-extensions: http://asciidoctor.org/docs/user-manual/#extension-points
@@ -36,13 +37,15 @@ ifndef::env-site[:status:]
 :uri-svgbob: https://github.com/ivanceras/svgbobrus
 :uri-syntrax: https://kevinpt.github.io/syntrax/
 :uri-umlet: http://www.umlet.com/
+:uri-vega: https://vega.github.io/vega/
+:uri-vegalite: https://vega.github.io/vega-lite/
 :uri-wavedrom: http://wavedrom.com
 :uri-wavedromeditor: https://github.com/wavedrom/wavedrom.github.io/releases
 :uri-wavedromcli: https://github.com/wavedrom/cli
 
 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 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] 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-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.
@@ -59,7 +62,7 @@ ifdef::status[]
 
 image:https://travis-ci.org/asciidoctor/asciidoctor-diagram.svg?branch=master["Linux Build Status", link="https://travis-ci.org/asciidoctor/asciidoctor-diagram"]
 image:https://ci.appveyor.com/api/projects/status/4r4gkk5gy3igs6nh/branch/master?svg=true["Windows Build Status", link="https://ci.appveyor.com/project/asciidoctor/asciidoctor-diagram"]
-image:https://img.shields.io/gem/v/asciidoctor-diagram.svg?label=gem%20version[Gem Version, link=https://rubygems.org/gems/asciidoctor-diagram]
+image:https://badge.fury.io/rb/asciidoctor-diagram.svg[Gem Version, link=https://rubygems.org/gems/asciidoctor-diagram]
 endif::status[]
 
 ifeval::["{toc-placement}" == "macro"]
@@ -82,7 +85,7 @@ by first adding the following entry to your project's [.path]_Gemfile_.
 .Gemfile
 [source,ruby]
 ----
-gem 'asciidoctor-diagram', '~> 1.5.7'
+gem 'asciidoctor-diagram'
 ----
 
 Then execute `bundle` in the CLI.
@@ -110,6 +113,7 @@ The following diagram types and output formats are available:
 [cols=">,5*^",options="header"]
 |===
 |Diagram Type                |gif    |pdf    |png    |svg    |txt
+|{uri-a2s}[a2s]              |       |       |       |{check}|
 |{uri-actdiag}[actdiag]      |       |{check}|{check}|{check}|
 |{uri-blockdiag}[blockdiag]  |       |{check}|{check}|{check}|
 |{uri-ditaa}[ditaa]          |       |       |{check}|{check}|
@@ -127,6 +131,8 @@ The following diagram types and output formats are available:
 |{uri-svgbob}[svgbob]        |       |       |       |{check}|
 |{uri-syntrax}[syntrax]      |       |{check}|{check}|{check}|
 |{uri-umlet}[umlet]          |{check}|{check}|{check}|{check}|
+|{uri-vega}[vega]            |       |       |{check}|{check}|
+|{uri-vegalite}[vegalite]    |       |       |{check}|{check}|
 |{uri-wavedrom}[wavedrom]    |       |       |{check}|{check}|
 |===
 
@@ -239,7 +245,7 @@ or load and register each extension individually.
 require 'asciidoctor-diagram/<extension_name>'
 ----
 
-`<extension_name>` can be one of `blockdiag`, `ditaa`, `erd`, `graphviz`, `meme`, `mermaid`, `msc`, `plantuml`, `shaape`, `svgbob`, `syntrax`, or `wavedrom`.
+`<extension_name>` can be one of `a2s`, `blockdiag`, `ditaa`, `erd`, `graphviz`, `meme`, `mermaid`, `msc`, `plantuml`, `shaape`, `svgbob`, `syntrax`, `umlet`, `vega` or `wavedrom`.
 
 Requiring one or more of these files will automatically register the extensions for all processed documents.
 
@@ -282,6 +288,7 @@ The following table lists the tools that are required for each diagram type, the
 [cols=">,2*<",options="header"]
 |===
    |Diagram Type |Tool                                                                  |Attribute
+   |a2s          |{uri-a2s}[AsciiToSvg]                                                 |`a2s`
    |actdiag      |{uri-actdiag}[ActDiag]                                                |`actdiag`
    |blockdiag    |{uri-blockdiag}[BlockDiag]                                            |`blockdiag`
    |ditaa        |{uri-java}[Java]                                                      |`java`
@@ -299,6 +306,8 @@ The following table lists the tools that are required for each diagram type, the
    |svgbob       |{uri-svgbob}[SvgBob]                                                  |`svgbob`
    |syntrax      |{uri-syntrax}[Syntrax]                                                |`syntrax`
    |umlet        |{uri-umlet}[Umlet]                                                    |`umlet`
+   |vega         |{uri-vega}[vg2png] and/or {uri-vega}[vg2png]                          |`vg2png` and `vg2svg`
+   |vegalite     |{uri-vegalite}[vl2vg] and {uri-vega}[vg2png] and/or {uri-vega}[vg2svg]|`vl2vg`, `vg2png` and `vg2svg`
 .2+|wavedrom     |{uri-wavedromeditor}[WaveDrom Editor]                                 |`wavedrom`
                  |{uri-wavedromcli}[WaveDrom CLI] and {uri-phantomjs}[PhantomJS]        |`wavedrom` and `phantomjs`
 |===
@@ -346,6 +355,14 @@ This is illustrated for the blockdiag `fontpath` attribute in the example below.
 Each attribute can either be specified at the block level or at the document level.
 The attribute name at the block level should be prefixed with the name of the diagram type and a dash.
 
+==== AsciiToSVG
+
+[cols=">,<,<",options="header"]
+|===
+|Name         |Default value   |Description
+|fontfamily   |unspecified     |The font family to use in the generated SVG image
+|noblur       |unspecified     |Disable drop-shadow blurring
+|===
 
 ==== Blockdiag
 

data/lib/asciidoctor-diagram.rb

@@ -1,3 +1,4 @@
+require_relative 'asciidoctor-diagram/a2s'
 require_relative 'asciidoctor-diagram/blockdiag'
 require_relative 'asciidoctor-diagram/ditaa'
 require_relative 'asciidoctor-diagram/erd'
@@ -11,4 +12,5 @@ require_relative 'asciidoctor-diagram/shaape'
 require_relative 'asciidoctor-diagram/svgbob'
 require_relative 'asciidoctor-diagram/syntrax'
 require_relative 'asciidoctor-diagram/umlet'
+require_relative 'asciidoctor-diagram/vega'
 require_relative 'asciidoctor-diagram/wavedrom'

data/lib/asciidoctor-diagram/a2s.rb

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

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

@@ -0,0 +1,60 @@
+require_relative '../extensions'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+require_relative '../util/which'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    module AsciiToSvg
+      include CliGenerator
+      include Which
+
+      def self.included(mod)
+        [:svg].each do |f|
+          mod.register_format(f, :image) do |parent, source|
+            a2s(parent, source, f)
+          end
+        end
+      end
+
+      def a2s(parent, source, format)
+        inherit_prefix = name
+
+        sx = source.attr('scalex', nil, inherit_prefix)
+        sy = source.attr('scaley', nil, inherit_prefix)
+        scale = source.attr('scale', nil, inherit_prefix)
+        noblur = source.attr('noblur', 'false', inherit_prefix) == 'true'
+        font = source.attr('fontfamily', nil, inherit_prefix)
+
+        generate_stdin(which(parent, 'a2s'), format.to_s, source.to_s) do |tool_path, output_path|
+          args = [tool_path, "-o#{Platform.native_path(output_path)}"]
+
+          if sx && sy
+            args << "-s#{sx},#{sy}"
+          elsif scale
+            args << "-s#{scale},#{scale}"
+          end
+
+          if noblur
+            args << '-b'
+          end
+
+          if font
+            args << "-f#{font}"
+          end
+
+          args
+        end
+      end
+    end
+
+    class AsciiToSvgBlockProcessor < Extensions::DiagramBlockProcessor
+      include AsciiToSvg
+    end
+
+    class AsciiToSvgBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
+      include AsciiToSvg
+    end
+  end
+end

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

@@ -87,19 +87,30 @@ module Asciidoctor
           if options[:config]
             args << '--configFile' << Platform.native_path(options[:config])
           elsif options[:gantt] || options[:sequence]
-            config = []
+            mermaidConfig = []
 
             if options[:gantt]
-              config << "\"gantt\": #{File.read(options[:gantt])}"
+              mermaidConfig << "\"gantt\": #{File.read(options[:gantt])}"
             end
 
             if options[:sequence]
-              config << "\"sequenceDiagram\": #{File.read(options[:sequence])}"
+              configKey = config['mmdcSequenceConfigKey'] ||= begin
+                version_parts = ::Asciidoctor::Diagram::Cli.run(mmdc, '--version')[:out].split('.').map { |p| p.to_i }
+                major = version_parts[0] || 0
+                minor = version_parts[1] || 0
+                patch = version_parts[2] || 0
+                if major > 0 || (major == 0 && minor > 4) || (major == 0 && minor == 4 && patch > 1)
+                  'sequence'
+                else
+                  'sequenceDiagram'
+                end
+              end
+              mermaidConfig << "\"#{configKey}\": #{File.read(options[:sequence])}"
             end
 
             config_file = "#{input_path}.json"
 
-            File.write(config_file, "{#{config.join ','}}")
+            File.write(config_file, "{#{mermaidConfig.join ','}}")
 
             args << '--configFile' << Platform.native_path(config_file)
           end

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

@@ -20,6 +20,15 @@ module Asciidoctor
         end
       end
 
+      def generate_stdin_stdout(tool, code)
+        if block_given?
+          opts = yield tool
+        else
+          opts = [tool]
+        end
+        generate(opts, :stdout, :stdin_data => code)
+      end
+
       def generate_file(tool, input_ext, output_ext, code)
         tool_name = File.basename(tool)
 
@@ -57,7 +66,7 @@ module Asciidoctor
 
         result = ::Asciidoctor::Diagram::Cli.run(*args, open3_opts)
 
-        data = read_result(target_file, out_file)
+        data = target_file == :stdout ? result[:out] : read_result(target_file, out_file)
 
         if data.empty?
           raise "#{args[0]} failed: #{result[:out].empty? ? result[:err] : result[:out]}"

data/lib/asciidoctor-diagram/vega.rb

@@ -0,0 +1,11 @@
+require_relative 'extensions'
+
+Asciidoctor::Extensions.register do
+  require_relative 'vega/extension'
+
+  block Asciidoctor::Diagram::VegaBlockProcessor, :vega
+  block_macro Asciidoctor::Diagram::VegaBlockMacroProcessor, :vega
+
+  block Asciidoctor::Diagram::VegaBlockProcessor, :vegalite
+  block_macro Asciidoctor::Diagram::VegaBlockMacroProcessor, :vegalite
+end

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

@@ -0,0 +1,52 @@
+require_relative '../extensions'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+require_relative '../util/which'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    module Vega
+      include CliGenerator
+      include Which
+
+      def self.included(mod)
+        [:svg, :png].each do |f|
+          mod.register_format(f, :image) do |parent, source|
+            vega(parent, source, f)
+          end
+        end
+      end
+
+      def vega(parent, source, format)
+        base_dir = source.base_dir
+
+        code = source.to_s
+
+        if code.include?('/schema/vega-lite/') || name.to_s.include?('lite') || source.attr('vegalite')
+          vega_code = generate_stdin_stdout(which(parent, "vl2vg"), code)
+        else
+          vega_code = code
+        end
+
+        generate_file(which(parent, "vg2#{format}"), "json", format.to_s, vega_code) do |tool_path, input_path, output_path|
+          args = [tool_path, '--base', Platform.native_path(base_dir)]
+          if format == :svg
+            args << '--header'
+          end
+
+          args << Platform.native_path(input_path)
+          args << Platform.native_path(output_path)
+        end
+      end
+    end
+
+    class VegaBlockProcessor < Extensions::DiagramBlockProcessor
+      include Vega
+    end
+
+    class VegaBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
+      include Vega
+    end
+  end
+end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.5.8"
+    VERSION = "1.5.9"
   end
 end

data/spec/a2s_spec.rb

@@ -0,0 +1,167 @@
+require_relative 'test_helper'
+
+code = <<-eos
+                      .--.            .---.  .---. .---.  .---.    .---.  .---. 
+                      |  |   OS API   '---'  '---' '---'  '---'    '---'  '---' 
+                      v  |              |      |     |      |        |      |   
+             .-. .-. .-. |              v      v     |      v        |      v   
+         .-->'-' '-' '-' |            .------------. | .-----------. |  .-----. 
+         |     \\  |  /   |            | Filesystem | | | Scheduler | |  | MMU | 
+         |      v . v    |            '------------' | '-----------' |  '-----' 
+         '_______/ \\_____|                   |       |      |        |          
+                 \\ /                         v       |      |        v          
+                  |     ____              .----.     |      |    .---------.    
+                  '--> /___/              | IO |<----'      |    | Network |    
+                                          '----'            |    '---------'    
+                                             |              |         |         
+                                             v              v         v         
+                                      .---------------------------------------. 
+                                      |                  HAL                  | 
+                                      '---------------------------------------'
+eos
+
+describe Asciidoctor::Diagram::AsciiToSvgBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    File.write('a2s.txt', code)
+
+    doc = <<-eos
+= Hello, a2s!
+Doc Writer <doc@example.com>
+
+== First Section
+
+a2s::a2s.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::AsciiToSvgBlockProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, a2s!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[a2s, 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, a2s!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[a2s, 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('a2s.txt', code)
+
+    doc = <<-eos
+= Hello, a2s!
+Doc Writer <doc@example.com>
+
+== First Section
+
+a2s::a2s.txt
+
+[a2s]
+----
+#{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('a2s.txt', code)
+
+    doc = <<-eos
+= Hello, a2s!
+Doc Writer <doc@example.com>
+
+== First Section
+
+a2s::a2s.txt[]
+a2s::a2s.txt[]
+    eos
+
+    load_asciidoc doc
+    expect(File.exist?('a2s.svg')).to be true
+  end
+
+  it "should respect target attribute in block macros" do
+    File.write('a2s.txt', code)
+
+    doc = <<-eos
+= Hello, a2s!
+Doc Writer <doc@example.com>
+
+== First Section
+
+a2s::a2s.txt["foobar"]
+a2s::a2s.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?('a2s.svg')).to be false
+  end
+end

data/spec/test_helper.rb

@@ -6,6 +6,7 @@ require 'stringio'
 require 'tmpdir'
 
 require_relative '../lib/asciidoctor-diagram'
+require_relative '../lib/asciidoctor-diagram/a2s/extension'
 require_relative '../lib/asciidoctor-diagram/blockdiag/extension'
 require_relative '../lib/asciidoctor-diagram/ditaa/extension'
 require_relative '../lib/asciidoctor-diagram/erd/extension'
@@ -18,6 +19,7 @@ require_relative '../lib/asciidoctor-diagram/shaape/extension'
 require_relative '../lib/asciidoctor-diagram/svgbob/extension'
 require_relative '../lib/asciidoctor-diagram/syntrax/extension'
 require_relative '../lib/asciidoctor-diagram/umlet/extension'
+require_relative '../lib/asciidoctor-diagram/vega/extension'
 require_relative '../lib/asciidoctor-diagram/wavedrom/extension'
 
 require_relative '../lib/asciidoctor-diagram/util/platform'

data/spec/vega_spec.rb

@@ -0,0 +1,241 @@
+require_relative 'test_helper'
+
+vega_code = <<-eos
+{
+  "$schema": "https://vega.github.io/schema/vega/v3.json",
+  "width": 400,
+  "height": 200,
+  "padding": 5,
+
+  "data": [
+    {
+      "name": "table",
+      "values": [
+        {"category": "A", "amount": 28},
+        {"category": "B", "amount": 55},
+        {"category": "C", "amount": 43},
+        {"category": "D", "amount": 91},
+        {"category": "E", "amount": 81},
+        {"category": "F", "amount": 53},
+        {"category": "G", "amount": 19},
+        {"category": "H", "amount": 87}
+      ]
+    }
+  ],
+
+  "signals": [
+    {
+      "name": "tooltip",
+      "value": {},
+      "on": [
+        {"events": "rect:mouseover", "update": "datum"},
+        {"events": "rect:mouseout",  "update": "{}"}
+      ]
+    }
+  ],
+
+  "scales": [
+    {
+      "name": "xscale",
+      "type": "band",
+      "domain": {"data": "table", "field": "category"},
+      "range": "width",
+      "padding": 0.05,
+      "round": true
+    },
+    {
+      "name": "yscale",
+      "domain": {"data": "table", "field": "amount"},
+      "nice": true,
+      "range": "height"
+    }
+  ],
+
+  "axes": [
+    { "orient": "bottom", "scale": "xscale" },
+    { "orient": "left", "scale": "yscale" }
+  ],
+
+  "marks": [
+    {
+      "type": "rect",
+      "from": {"data":"table"},
+      "encode": {
+        "enter": {
+          "x": {"scale": "xscale", "field": "category"},
+          "width": {"scale": "xscale", "band": 1},
+          "y": {"scale": "yscale", "field": "amount"},
+          "y2": {"scale": "yscale", "value": 0}
+        },
+        "update": {
+          "fill": {"value": "steelblue"}
+        },
+        "hover": {
+          "fill": {"value": "red"}
+        }
+      }
+    },
+    {
+      "type": "text",
+      "encode": {
+        "enter": {
+          "align": {"value": "center"},
+          "baseline": {"value": "bottom"},
+          "fill": {"value": "#333"}
+        },
+        "update": {
+          "x": {"scale": "xscale", "signal": "tooltip.category", "band": 0.5},
+          "y": {"scale": "yscale", "signal": "tooltip.amount", "offset": -2},
+          "text": {"signal": "tooltip.amount"},
+          "fillOpacity": [
+            {"test": "datum === tooltip", "value": 0},
+            {"value": 1}
+          ]
+        }
+      }
+    }
+  ]
+}
+eos
+
+vegalite_code = <<-eos
+{
+  "$schema": "https://vega.github.io/schema/vega-lite/v2.json",
+  "description": "A simple bar chart with embedded data.",
+  "data": {
+    "values": [
+      {"a": "A","b": 28}, {"a": "B","b": 55}, {"a": "C","b": 43},
+      {"a": "D","b": 91}, {"a": "E","b": 81}, {"a": "F","b": 53},
+      {"a": "G","b": 19}, {"a": "H","b": 87}, {"a": "I","b": 52}
+    ]
+  },
+  "mark": "bar",
+  "encoding": {
+    "x": {"field": "a", "type": "ordinal"},
+    "y": {"field": "b", "type": "quantitative"}
+  }
+}
+eos
+
+describe Asciidoctor::Diagram::VegaBlockMacroProcessor, :broken_on_windows do
+  it "should generate vega SVG images when format omitted" do
+    File.write('vega.json', vega_code)
+
+    doc = <<-eos
+= Hello, Vega!
+Doc Writer <doc@example.com>
+
+== First Section
+
+vega::vega.json[]
+    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 generate vegalite SVG images when format omitted" do
+    File.write('vega.json', vegalite_code)
+
+    doc = <<-eos
+= Hello, Vega!
+Doc Writer <doc@example.com>
+
+== First Section
+
+vegalite::vega.json[]
+    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::VegaBlockProcessor, :broken_on_windows do
+  it "should generate vega SVG images when format is omitted" do
+    doc = <<-eos
+= Hello, Vega!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[vega]
+----
+#{vega_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 generate vegalite SVG images when format is omitted" do
+    doc = <<-eos
+= Hello, Vega!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[vegalite]
+----
+#{vegalite_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
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-24 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,8 @@ files:
 - images/asciidoctor-diagram-classes.png
 - images/asciidoctor-diagram-process.png
 - lib/asciidoctor-diagram.rb
+- lib/asciidoctor-diagram/a2s.rb
+- lib/asciidoctor-diagram/a2s/extension.rb
 - lib/asciidoctor-diagram/blockdiag.rb
 - lib/asciidoctor-diagram/blockdiag/extension.rb
 - lib/asciidoctor-diagram/ditaa.rb
@@ -123,6 +125,8 @@ files:
 - lib/asciidoctor-diagram/util/png.rb
 - lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/util/which.rb
+- lib/asciidoctor-diagram/vega.rb
+- lib/asciidoctor-diagram/vega/extension.rb
 - lib/asciidoctor-diagram/version.rb
 - lib/asciidoctor-diagram/wavedrom.rb
 - lib/asciidoctor-diagram/wavedrom/extension.rb
@@ -133,6 +137,7 @@ files:
 - lib/plantuml-1.3.13.jar
 - lib/plantuml.jar
 - lib/server-1.3.13.jar
+- spec/a2s_spec.rb
 - spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
 - spec/erd_spec.rb
@@ -147,6 +152,7 @@ files:
 - spec/syntrax_spec.rb
 - spec/test_helper.rb
 - spec/umlet_spec.rb
+- spec/vega_spec.rb
 - spec/wavedrom_spec.rb
 homepage: https://github.com/asciidoctor/asciidoctor-diagram
 licenses:
@@ -174,6 +180,7 @@ specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
   using PlantUML
 test_files:
+- spec/a2s_spec.rb
 - spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
 - spec/erd_spec.rb
@@ -188,4 +195,5 @@ test_files:
 - spec/syntrax_spec.rb
 - spec/test_helper.rb
 - spec/umlet_spec.rb
+- spec/vega_spec.rb
 - spec/wavedrom_spec.rb