asciidoctor-diagram 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c23479ec496e71fd006564fec4e1ca6cf88bd09ae730437e39e3d2dab6554c8
-  data.tar.gz: 583614138465d13c09a0134a888ecb513b27e9040d1d946fd62038c1421cfaf3
+  metadata.gz: '09488e585ecab52e38188d04020d60aa17873bea47c3043055f8f59770f9d1aa'
+  data.tar.gz: ab9eab53cc00fc988ccd4518ac62e91f815ea06cfc3d3615824a24d63efb07a7
 SHA512:
-  metadata.gz: 92fdb3bcfbf238bbcfc13f2ea84b5441c9db60c98e053bef529487351c82fb07192d44304661fd1ede94fa3286923029bb3e93f72c5bb5ffd3a8f8cbeda2227e
-  data.tar.gz: bc7a9000e2ae1beeed9e61d538938241b6401a5aa4cff8bb5b9d15f8fe8dd7c4991b58ea326677feaf9f6e72f20c72961ce1286c53ed0704e5d48af102ad99e7
+  metadata.gz: 7e75194b60961b932b7ca141448948c92404db4557b83611c28786de97fb7b36e30d434189815729a4aab79620dd6a1e90d7eb0281c1a5a3a66356730f319892
+  data.tar.gz: d7b8c2f8d8678e6299dd309292cc524d704830d6a882ae9228620d466862f0e37c9b1540a57090641f04f3499fcfcbf46f08933febfaa0dbb15579d33c3d1c64

data/CHANGELOG.adoc

@@ -1,5 +1,21 @@
 = Asciidoctor-diagram Changelog
 
+== 2.0.2
+
+Enhancements::
+
+  * #260: Update PlantUML to v1.2020.6
+  * #270: Add support for svgbob options (@hackingotter)
+  * #268: Changing diagram attribute values will now also trigger image regeneration
+  * #276: Add support for bytefield-svg
+
+Bug Fixes::
+
+  * Issue #253: Add support for PlantUML `atxt` and `utxt` output formats
+  * Issue #266: Resolve execution issue when the path for GnuPlot or Vega contains spaces
+  * Issue #267: Use binary mode when reading generated images from stdout
+  * Issue #273: Report Ditaa syntax errors correctly
+
 == 2.0.1
 
 Bug Fixes::

data/README.adoc

@@ -19,6 +19,7 @@ ifndef::env-site[:status:]
 :uri-asciidoctor-extensions: http://asciidoctor.org/docs/user-manual/#extension-points
 :uri-blockdiag: http://blockdiag.com
 :uri-bpmn: https://github.com/gtudan/bpmn-js-cmd
+:uri-bytefield: https://github.com/Deep-Symmetry/bytefield-svg
 :uri-ditaa: http://ditaa.sourceforge.net/
 :uri-dot: https://graphviz.gitlab.io/_pages/doc/info/lang.html
 :uri-erd: https://github.com/BurntSushi/erd
@@ -49,7 +50,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-gnuplot}[Gnuplot], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-nomnoml}[Nomnoml], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {uri-smcat}[State Machine Cat], {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-bytefield}[Bytefield-SVG], {uri-ditaa}[Ditaa], {uri-erd}[Erd], {uri-gnuplot}[Gnuplot], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-nomnoml}[Nomnoml], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {uri-smcat}[State Machine Cat], {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.
@@ -123,6 +124,7 @@ The following diagram types and output formats are available:
 |{uri-actdiag}[actdiag]      |       |{check}|{check}|{check}|
 |{uri-blockdiag}[blockdiag]  |       |{check}|{check}|{check}|
 |{uri-bpmn}[bpmn]            |       |{check}|{check}|{check}|
+|{uri-bytefield}[bytefield]  |       |       |       |{check}|
 |{uri-ditaa}[ditaa]          |       |       |{check}|{check}|
 |{uri-erd}[erd]              |       |       |{check}|{check}|
 |{uri-gnuplot}[gnuplot]      |{check}|       |{check}|{check}|{check}
@@ -255,7 +257,7 @@ or load and register each extension individually.
 require 'asciidoctor-diagram/<extension_name>'
 ----
 
-`<extension_name>` can be one of `a2s`, `blockdiag`, `ditaa`, `erd`, `gnuplot`, `graphviz`, `meme`, `mermaid`, `msc`, `plantuml`, `shaape`, `smcat`, `svgbob`, `syntrax`, `umlet`, `vega` or `wavedrom`.
+`<extension_name>` can be one of `a2s`, `blockdiag`, `bytefield`, `ditaa`, `erd`, `gnuplot`, `graphviz`, `meme`, `mermaid`, `msc`, `plantuml`, `shaape`, `smcat`, `svgbob`, `syntrax`, `umlet`, `vega` or `wavedrom`.
 
 Requiring one or more of these files will automatically register the extensions for all processed documents.
 
@@ -302,6 +304,7 @@ The following table lists the tools that are required for each diagram type, the
    |actdiag      |{uri-actdiag}[ActDiag]                                                |`actdiag`
    |blockdiag    |{uri-blockdiag}[BlockDiag]                                            |`blockdiag`
    |bpmn         |{uri-bpmn}[bpmn-js-cmd]                                               |`bpmn`
+   |bytefield    |{uri-bytefield}[bytefield-svg]                                        |`bytefield-svg`
    |ditaa        |{uri-java}[Java]                                                      |`java`
    |erd          |{uri-erd}[Erd]                                                        |`erd`
    |gnuplot      |{uri-gnuplot}[Gnuplot]                                                |`gnuplot`
@@ -497,6 +500,17 @@ The attribute name at the block level should be prefixed with the name of the di
 |engine        |unspecified     |The layout engine to use. One of `dot`, `circo`, `fdp`, `neato`, `osage`, or `twopi`
 |===
 
+==== svgbob
+
+[cols=">,<,<",options="header"]
+|===
+|Name          |Default value   |Description
+|font-family   |arial           |text will be rendered with this font
+|font-size     |14              |text will be rendered with this font size
+|scale         |1               |scale the entire svg (dimensions, font size, stroke width) by this factor
+|stroke-width  |2               |stroke width for all lines
+|===
+
 ==== Syntrax
 
 [cols=">,<,<",options="header"]

data/lib/asciidoctor-diagram.rb

@@ -1,6 +1,7 @@
 require_relative 'asciidoctor-diagram/a2s'
 require_relative 'asciidoctor-diagram/blockdiag'
 require_relative 'asciidoctor-diagram/bpmn'
+require_relative 'asciidoctor-diagram/bytefield'
 require_relative 'asciidoctor-diagram/ditaa'
 require_relative 'asciidoctor-diagram/erd'
 require_relative 'asciidoctor-diagram/gnuplot'

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

@@ -29,7 +29,7 @@ module Asciidoctor
 
         opts[:width] = options[:width]
 
-        bpmnjs = source.find_command('bpmn-js', :raise_on_error => false)
+        bpmnjs = source.find_command('bpmn-js')
         opts[:height] = options[:height]
         opts[:theme] = options[:theme]
         config = options[:config]

data/lib/asciidoctor-diagram/bytefield.rb

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

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

@@ -0,0 +1,26 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class BytefieldConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def convert(source, format, options)
+        bytefield_path = source.find_command('bytefield-svg')
+
+        generate_stdin(bytefield_path, format.to_s, source.to_s) do |tool_path, output_path|
+          [tool_path, "--output", Platform.native_path(output_path)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class BytefieldBlockProcessor < DiagramBlockProcessor
+      use_converter BytefieldConverter
+    end
+
+    class BytefieldBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter BytefieldConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -151,14 +151,15 @@ module Asciidoctor
         metadata_file = parent.normalize_system_path "#{image_name}.cache", cache_dir
 
         if File.exist? metadata_file
-          metadata = File.open(metadata_file, 'r') {|f| JSON.load f}
+          metadata = File.open(metadata_file, 'r') {|f| JSON.load(f, nil, :symbolize_names => true, :create_additions => false) }
         else
           metadata = {}
         end
 
         image_attributes = source.attributes
+        options = converter.collect_options(source, name)
 
-        if !File.exist?(image_file) || source.should_process?(image_file, metadata)
+        if !File.exist?(image_file) || source.should_process?(image_file, metadata) || options != metadata[:options]
           params = IMAGE_PARAMS[format]
 
           server_url = source.attr('server-url', nil, name) || source.attr('server-url', nil, DIAGRAM_PREFIX)
@@ -173,7 +174,8 @@ module Asciidoctor
           result.force_encoding(params[:encoding])
 
           metadata = source.create_image_metadata
-          metadata['width'], metadata['height'] = params[:decoder].get_image_size(result)
+          metadata[:options] = options
+          metadata[:width], metadata[:height] = params[:decoder].get_image_size(result)
 
           FileUtils.mkdir_p(File.dirname(image_file)) unless Dir.exist?(File.dirname(image_file))
           File.open(image_file, 'wb') {|f| f.write result}
@@ -197,11 +199,11 @@ module Asciidoctor
 
         if /html/i =~ parent.document.attributes['backend']
           image_attributes.delete('scale')
-          if metadata['width'] && !image_attributes['width']
-            image_attributes['width'] = (metadata['width'] * scale_factor).to_i
+          if metadata[:width] && !image_attributes['width']
+            image_attributes['width'] = (metadata[:width] * scale_factor).to_i
           end
-          if metadata['height'] && !image_attributes['height']
-            image_attributes['height'] = (metadata['height'] * scale_factor).to_i
+          if metadata[:height] && !image_attributes['height']
+            image_attributes['height'] = (metadata[:height] * scale_factor).to_i
           end
         end
 

data/lib/asciidoctor-diagram/diagram_source.rb

@@ -143,11 +143,11 @@ module Asciidoctor
       end
 
       def should_process?(image_file, image_metadata)
-        image_metadata['checksum'] != checksum
+        image_metadata[:checksum] != checksum
       end
 
       def create_image_metadata
-        {'checksum' => checksum}
+        {:checksum => checksum}
       end
 
       def checksum

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

@@ -23,7 +23,7 @@ module Asciidoctor
           :transparent => lambda { |o, v| o  << '--transparent' if v == 'true'}
       }
 
-      JARS = ['ditaa-1.3.14.jar', 'ditaamini-0.12.jar'].map do |jar|
+      JARS = ['ditaa-1.3.15.jar', 'ditaamini-0.12.jar'].map do |jar|
         File.expand_path File.join('../..', jar), File.dirname(__FILE__)
       end
       Java.classpath.concat JARS

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

@@ -42,8 +42,8 @@ module Asciidoctor
 
         bg_img = source.resolve_path(bg_img, source.attr('imagesdir'))
 
-        top_label = options[:top]
-        bottom_label = options[:bottom]
+        top_label = options[:top_label]
+        bottom_label = options[:bottom_label]
         fill_color = options[:fill_color] || 'white'
         stroke_color = options[:stroke_color] || 'black'
         stroke_width = options[:stroke_width] || '2'

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

@@ -8,7 +8,7 @@ module Asciidoctor
       include DiagramConverter
 
       JARS = [
-          'plantuml-1.3.14.jar',
+          'plantuml-1.3.15.jar',
           'plantuml.jar',
           'jlatexmath-minimal-1.0.5.jar',
           'batik-all-1.10.jar'
@@ -40,7 +40,7 @@ module Asciidoctor
         when :txt, :utxt
           mime_type = 'text/plain;charset=utf-8'
         when :atxt
-          mime_type = 'text/plain;charset=us-ascii'
+          mime_type = 'text/plain'
         else
           raise "Unsupported format: #{format}"
         end

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

@@ -14,10 +14,34 @@ module Asciidoctor
         [:svg]
       end
 
+      OPTIONS = {
+          :font_family => lambda { |o, v| o << '--font-family' << v if v },
+          :font_size => lambda { |o, v| o << '--font-size' << v if v },
+          :stroke_width => lambda { |o, v| o << '--stroke-width' << v if v },
+          :scale => lambda { |o, v| o << '--scale' << v if v }
+      }
+
+      def collect_options(source, name)
+        options = {}
+
+        OPTIONS.keys.each do |option|
+          attr_name = option.to_s.tr('_', '-')
+          options[option] = source.attr(attr_name, nil, name) || source.attr(attr_name, nil, 'svgbob-option')
+        end
+
+        options
+      end
+
 
       def convert(source, format, options)
+
+        flags = []
+        options.each do |option, value|
+          OPTIONS[option].call(flags, value)
+        end
+        
         generate_stdin(source.find_command('svgbob'), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, '-o', Platform.native_path(output_path)]
+          ([tool_path, '-o', Platform.native_path(output_path)] + flags)
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Asciidoctor
         require_relative 'java'
 
         def self.run(*args)
-          opts = args.pop if args.last.is_a? Hash
+          opts = args.pop.dup if args.last.is_a? Hash
           in_data = opts && opts[:stdin_data]
 
           pb = java.lang.ProcessBuilder.new(*args)
@@ -61,12 +61,23 @@ module Asciidoctor
         require 'open3'
 
         def self.run(*args)
-          stdout, stderr, status = Open3.capture3(*args)
+          if Hash === args.last
+            opts = args.pop.dup
+          else
+            opts = {}
+          end
+
+          # When the first argument is an array, we force capture3 (or better the underlying Kernel#spawn)
+          # to use a non-shell execution variant.
+          cmd = File.basename(args[0])
+          args[0] = [args[0], cmd]
+
+          stdout, stderr, status = Open3.capture3(*args, opts)
 
           exit = status.exitstatus
 
           if exit != 0
-            raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
+            raise "#{cmd} failed: #{stdout.empty? ? stderr : stdout}"
           end
 
           {

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

@@ -26,7 +26,7 @@ module Asciidoctor
         else
           opts = [tool]
         end
-        generate(opts, :stdout, :stdin_data => code)
+        generate(opts, :stdout, :stdin_data => code, :binmode => true)
       end
 
       def generate_file(tool, input_ext, output_ext, code)

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

@@ -6,7 +6,7 @@ module Asciidoctor
     module Java
       def self.classpath
         @classpath ||= [
-            File.expand_path(File.join('../..', 'server-1.3.14.jar'), File.dirname(__FILE__))
+            File.expand_path(File.join('../..', 'server-1.3.15.jar'), File.dirname(__FILE__))
         ]
       end
 

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

data/spec/bytefield_spec.rb

@@ -0,0 +1,230 @@
+require_relative 'test_helper'
+
+code = <<-eos
+;; This the source for the sample diagram illustrated in the project Read Me.
+
+;; Some nice default background colors, used to distinguish header sections.
+(defattrs :bg-green {:fill "#a0ffa0"})
+(defattrs :bg-yellow {:fill "#ffffa0"})
+(defattrs :bg-pink {:fill "#ffb0a0"})
+(defattrs :bg-cyan {:fill "#a0fafa"})
+(defattrs :bg-purple {:fill "#e4b5f7"})
+
+(defn draw-group-label-header
+  "Creates a small borderless box used to draw the textual label headers
+  used below the byte labels for remotedb message diagrams.
+  Arguments are the number of colums to span and the text of the
+  label."
+  [span label]
+  (draw-box (text label [:math {:font-size 12}]) {:span    span
+                                                  :borders \#{}
+                                                  :height  14}))
+
+(defn draw-remotedb-header
+  "Generates the byte and field labels and standard header fields of a
+  request or response message for the remotedb database server with
+  the specified kind and args values."
+  [kind args]
+  (draw-column-headers)
+  (draw-group-label-header 5 "start")
+  (draw-group-label-header 5 "TxID")
+  (draw-group-label-header 3 "type")
+  (draw-group-label-header 2 "args")
+  (draw-group-label-header 1 "tags")
+  (next-row 18)
+
+  (draw-box 0x11 :bg-green)
+  (draw-box 0x872349ae [{:span 4} :bg-green])
+  (draw-box 0x11 :bg-yellow)
+  (draw-box (text "TxID" :math) [{:span 4} :bg-yellow])
+  (draw-box 0x10 :bg-pink)
+  (draw-box (hex-text kind 4 :bold) [{:span 2} :bg-pink])
+  (draw-box 0x0f :bg-cyan)
+  (draw-box (hex-text args 2 :bold) :bg-cyan)
+  (draw-box 0x14 :bg-purple)
+
+  (draw-box (text "0000000c" :hex [[:plain {:font-weight "light" :font-size 16}] " (12)"])
+            [{:span 4} :bg-purple])
+  (draw-box (hex-text 6 2 :bold) [:box-first :bg-purple])
+  (doseq [val [6 6 3 6 6 6 6 3]]
+    (draw-box (hex-text val 2 :bold) [:box-related :bg-purple]))
+  (doseq [val [0 0]]
+    (draw-box val [:box-related :bg-purple]))
+  (draw-box 0 [:box-last :bg-purple]))
+
+;; Figure 48: Cue point response message.
+
+(draw-remotedb-header 0x4702 9)
+
+(draw-box 0x11)
+(draw-box 0x2104 {:span 4})
+(draw-box 0x11)
+(draw-box 0 {:span 4})
+(draw-box 0x11)
+(draw-box (text "length" [:math] [:sub 1]) {:span 4})
+(draw-box 0x14)
+
+(draw-box (text "length" [:math] [:sub 1]) {:span 4})
+(draw-gap "Cue and loop point bytes")
+
+(draw-box nil :box-below)
+(draw-box 0x11)
+(draw-box 0x36 {:span 4})
+(draw-box 0x11)
+(draw-box (text "num" [:math] [:sub "hot"]) {:span 4})
+(draw-box 0x11)
+(draw-box (text "num" [:math] [:sub "cue"]) {:span 4})
+
+(draw-box 0x11)
+(draw-box (text "length" [:math] [:sub 2]) {:span 4})
+(draw-box 0x14)
+(draw-box (text "length" [:math] [:sub 2]) {:span 4})
+(draw-gap "Unknown bytes" {:min-label-columns 6})
+(draw-bottom)
+eos
+
+describe Asciidoctor::Diagram::BytefieldBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    File.write('bytefield.txt', code)
+
+    doc = <<-eos
+= Hello, Bytefield!
+Doc Writer <doc@example.com>
+
+== First Section
+
+bytefield::bytefield.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::BytefieldBlockProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, Bytefield!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[bytefield, 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, Bytefield!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[bytefield, 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('bytefield.txt', code)
+
+    doc = <<-eos
+= Hello, Bytefield!
+Doc Writer <doc@example.com>
+
+== First Section
+
+bytefield::bytefield.txt
+
+[bytefield, 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('bytefield.txt', code)
+
+    doc = <<-eos
+= Hello, Bytefield!
+Doc Writer <doc@example.com>
+
+== First Section
+
+bytefield::bytefield.txt[]
+bytefield::bytefield.txt[]
+    eos
+
+    load_asciidoc doc
+    expect(File.exist?('bytefield.svg')).to be true
+  end
+
+  it "should respect target attribute in block macros" do
+    File.write('bytefield.txt', code)
+
+    doc = <<-eos
+= Hello, Bytefield!
+Doc Writer <doc@example.com>
+
+== First Section
+
+bytefield::bytefield.txt["foobar"]
+bytefield::bytefield.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?('bytefield.svg')).to be false
+  end
+end

data/spec/ditaa_spec.rb

@@ -253,4 +253,36 @@ Doc Writer <doc@example.com>
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
   end
+
+  it "should report syntax errors" do
+    doc = <<-eos
+= Hello, Ditaa!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[ditaa,format="svg"]
+----
+This should cause a bug.
+
+// TODO:
+// - don't make bugs
+// - oops I wrote a comment here
+
+    +--------+   +-------+    +-------+
+    |        | --+ ditaa +--> |       |
+    |  Text  |   +-------+    |diagram|
+    |Document|   |!magic!|    |       |
+    |     {d}|   |       |    |       |
+    +---+----+   +-------+    +-------+
+        :                         ^
+        |       Lots of work      |
+        +-------------------------+
+----
+    eos
+
+    expect {
+      load_asciidoc doc
+    }.to raise_error(/Cannot follow cell/i)
+  end
 end

data/spec/test_helper.rb

@@ -8,6 +8,7 @@ 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/bytefield'
 require_relative '../lib/asciidoctor-diagram/ditaa/extension'
 require_relative '../lib/asciidoctor-diagram/erd/extension'
 require_relative '../lib/asciidoctor-diagram/gnuplot/extension'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,9 @@ files:
 - lib/asciidoctor-diagram/bpmn.rb
 - lib/asciidoctor-diagram/bpmn/converter.rb
 - lib/asciidoctor-diagram/bpmn/extension.rb
+- lib/asciidoctor-diagram/bytefield.rb
+- lib/asciidoctor-diagram/bytefield/converter.rb
+- lib/asciidoctor-diagram/bytefield/extension.rb
 - lib/asciidoctor-diagram/diagram_converter.rb
 - lib/asciidoctor-diagram/diagram_processor.rb
 - lib/asciidoctor-diagram/diagram_source.rb
@@ -174,16 +177,17 @@ files:
 - lib/asciidoctor-diagram/wavedrom/converter.rb
 - lib/asciidoctor-diagram/wavedrom/extension.rb
 - lib/batik-all-1.10.jar
-- lib/ditaa-1.3.14.jar
+- lib/ditaa-1.3.15.jar
 - lib/ditaamini-0.12.jar
 - lib/jlatexmath-minimal-1.0.5.jar
-- lib/plantuml-1.3.14.jar
+- lib/plantuml-1.3.15.jar
 - lib/plantuml.jar
-- lib/server-1.3.14.jar
+- lib/server-1.3.15.jar
 - spec/a2s_spec.rb
 - spec/blockdiag_spec.rb
 - spec/bpmn-example.xml
 - spec/bpmn_spec.rb
+- spec/bytefield_spec.rb
 - spec/ditaa_spec.rb
 - spec/erd_spec.rb
 - spec/gnuplot_spec.rb
@@ -234,6 +238,7 @@ test_files:
 - spec/blockdiag_spec.rb
 - spec/bpmn-example.xml
 - spec/bpmn_spec.rb
+- spec/bytefield_spec.rb
 - spec/ditaa_spec.rb
 - spec/erd_spec.rb
 - spec/gnuplot_spec.rb