asciidoctor-diagram 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 674abb9267b7d32b26a63f665dff96822efea03927e194109c6301cd14530b51
-  data.tar.gz: fb94061afb3aefd801ea7c23bdd4e1306e45bffbdaeeeff34fb6f53f5a131324
+  metadata.gz: 9c999abc157686ce7101a23d06b8e3cdf83ec0244f1d9697343ec7e9a6afe946
+  data.tar.gz: 44349c53eefb7e2eb330348a29e2f1a4ee6b60ed1ec5548dc4b3c99ab6fcab5a
 SHA512:
-  metadata.gz: 46b3d4f0ff19bf97ca232f4531fa94d7a56d102de08500254a916fded1e2232c905dc540cc4b3e76279a690f105b42782211dc9f93ea13eb3dce873d54708e1a
-  data.tar.gz: 17891073b283b12280e2d118cd3b66a253fd8e74f30a41cae7431b47cbb663fd74cf6b80fe9d463410d991b86c0d1d55dd29bc76afd37db1653d3cccb8abe3fe
+  metadata.gz: afd079eab9fbfd29a76690012e699c9fa5e45ab14f35b9469defb3a46060e3011b814913af1d5c5365c63157ee8def0101a41ba6b6368d154ad26fe36440ac75
+  data.tar.gz: e994d6101f63d0fcfde7b04c4763aa43a9eac167cb19295777124cbc25b3042c132869d47597fd33c107b7da583442697bd80852faa9db641d91155cd8b86edd

data/CHANGELOG.adoc

@@ -1,5 +1,15 @@
 = Asciidoctor-diagram Changelog
 
+== 2.1.2
+
+Enhancements::
+
+  * Issue #345: Switch to POST requests when URI length becomes too long
+
+Bug Fixes::
+
+  * Issue #348: Rename Syntrax `style` attribute to `style-file` to avoid clashing with the built-in block style attribute.
+
 == 2.1.1
 
 Enhancements::

data/docs/modules/ROOT/partials/advanced.adoc

@@ -149,12 +149,20 @@ The attribute name at the document level should be prefixed with the diagram typ
 
 ==== Shared Attributes
 
+The set of shared attributes applies to all diagram types.
+The value for these attributes can be defined at the document level for a single diagram type using the diagram type as prefix or for all diagram types using `diagram` as prefix.
+
 [cols=">,<,<",options="header"]
 |===
-|Name         |Default value   |Description
-|svg-type     |unspecified     |One of `static`, `inline` or `interactive`.
+|Name          |Default value   |Description
+|svg-type      |unspecified     |One of `static`, `inline` or `interactive`.
 This determines the style of SVG embedding that's used in certain backends.
 The xref:asciidoc:macros:image-svg.adoc[asciidoc spec] describes this in more detail.
+|server-url    |unspecified    |External service to render diagram.
+Usage removes the need to depend on external tools to be installed locally.
+|server-type   |unspecified    |One of `plantuml` or `kroki_io`
+|max-get-size  |1024           |The maximum size of the URI path for HTTP GET requests.
+If the maximum size is exceeded, POST requests are used instead
 |===
 
 ==== AsciiToSVG
@@ -298,7 +306,7 @@ No specific attributes.
 |Name          |Default value   |Description
 |heading       |unspecifed      |Diagram title
 |scale         |1               |A scale factor that is applied to the image.
-|style         |unspecifed      |Path to a style config file to pass to Syntrax.
+|style-file    |unspecifed      |Path to a style config file to pass to Syntrax.
 |transparent   |false           |Makes the background of the image transparent instead of opaque white.
 |===
 

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

@@ -11,6 +11,8 @@ module Asciidoctor
   module Diagram
     # @private
     class HttpConverter
+      DEFAULT_MAX_GET_SIZE = 1024
+
       include DiagramConverter
 
       def initialize(base_uri, type, converter)
@@ -23,6 +25,14 @@ module Asciidoctor
         @converter.supported_formats
       end
 
+      def collect_options(source)
+        options = {}
+
+        options[:max_get_size] = source.global_attr('max-get-size', DEFAULT_MAX_GET_SIZE).to_i
+
+        options
+      end
+
       def convert(source, format, options)
         code = source.code
 
@@ -41,37 +51,49 @@ module Asciidoctor
           encoded = Base64.urlsafe_encode64(compressed)
           data = '0A' + encoded
 
-          path = uri.path
+          path = uri.path.dup
           path << '/' unless path.end_with? '/'
           path << format.to_s
-          path << '/' << data
-          uri.path = path
         when :kroki_io
           compressed = Zlib.deflate(code, Zlib::BEST_COMPRESSION)
           data = Base64.urlsafe_encode64(compressed)
 
-          path = uri.path
+          path = uri.path.dup
           path << '/' unless path.end_with? '/'
           path << source.diagram_type.to_s
           path << '/' << format.to_s
-          path << '/' << data
-          uri.path = path
         else
           raise "Unsupported server type: " + @type
         end
 
-        get_uri(uri)
+        get_path = path.dup << '/' << data
+
+        if get_path.length > options[:max_get_size]
+          uri.path = path
+          get_uri(uri, code, 'text/plain; charset=utf-8')
+        else
+          uri.path = get_path
+          get_uri(uri)
+        end
       end
 
       private
 
-      def get_uri(uri, attempt = 1)
+      def get_uri(uri, post_data = nil, post_content_type = nil, attempt = 1)
         if attempt >= 10
           raise "Too many redirects"
         end
 
+        if post_data.nil?
+          request = Net::HTTP::Get.new(uri.path)
+        else
+          request = Net::HTTP::Post.new(uri.path)
+          request.body = post_data
+          request.set_content_type(post_content_type) if post_content_type
+        end
+
         Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme.downcase == 'https') do |http|
-          response = http.request_get uri.path
+          response = http.request(request)
           case response
             when Net::HTTPSuccess
               response.body
@@ -79,10 +101,12 @@ module Asciidoctor
               location = response['Location']
               new_uri = URI.parse(location)
               if new_uri.relative?
-                get_uri(uri + location, attempt + 1)
+                resolved_uri = uri + location
               else
-                get_uri(new_uri, attempt + 1)
+                resolved_uri = new_uri
               end
+
+              get_uri(resolved_uri, post_data, post_content_type, attempt + 1)
             else
               response.value
           end

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

@@ -19,7 +19,7 @@ module Asciidoctor
             :heading => source.attr('heading'),
             :scale => source.attr('scale'),
             :transparent => source.attr('transparent'),
-            :style => source.attr('style')
+            :style => source.attr('style-file')
         }
       end
 

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.1.1"
+    VERSION = "2.1.2"
   end
 end

data/spec/a2s_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+A2S_CODE = <<-eos
                       .--.            .---.  .---. .---.  .---.    .---.  .---. 
                       |  |   OS API   '---'  '---' '---'  '---'    '---'  '---' 
                       v  |              |      |     |      |        |      |   
@@ -21,9 +21,9 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::AsciiToSvgBlockMacroProcessor do
-  include_examples "block_macro", :a2s, code, [:svg]
+  include_examples "block_macro", :a2s, A2S_CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::AsciiToSvgBlockProcessor do
-  include_examples "block", :svgbob, code, [:svg]
+  include_examples "block", :svgbob, A2S_CODE, [:svg]
 end

data/spec/blockdiag_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+BLOCKDIAG_CODE = <<-eos
 blockdiag {
    A -> B -> C -> D;
    A -> E -> F -> G;
@@ -8,9 +8,9 @@ blockdiag {
 eos
 
 describe Asciidoctor::Diagram::BlockDiagBlockMacroProcessor do
-  include_examples "block_macro", :blockdiag, code, [:png, :svg, :pdf]
+  include_examples "block_macro", :blockdiag, BLOCKDIAG_CODE, [:png, :svg, :pdf]
 end
 
 describe Asciidoctor::Diagram::BlockDiagBlockProcessor do
-  include_examples "block", :blockdiag, code, [:png, :svg, :pdf]
+  include_examples "block", :blockdiag, BLOCKDIAG_CODE, [:png, :svg, :pdf]
 end

data/spec/bpmn_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<EOF
+BPNM_CODE = <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0zt4mn9" targetNamespace="http://bpmn.io/schema/bpmn" exporter="bpmn-js (https://demo.bpmn.io)" exporterVersion="5.1.2">
   <bpmn:process id="Process_081h9u7" isExecutable="false">
@@ -48,9 +48,9 @@ code = <<EOF
 EOF
 
 describe Asciidoctor::Diagram::BpmnBlockMacroProcessor do
-  include_examples "block_macro", :bpmn, code, [:png, :svg, :pdf]
+  include_examples "block_macro", :bpmn, BPNM_CODE, [:png, :svg, :pdf]
 end
 
 describe Asciidoctor::Diagram::BpmnBlockProcessor do
-  include_examples "block", :bpmn, code, [:png, :svg, :pdf]
+  include_examples "block", :bpmn, BPNM_CODE, [:png, :svg, :pdf]
 end

data/spec/bytefield_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+BYTEFIELD_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.
@@ -84,9 +84,9 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::BytefieldBlockMacroProcessor do
-  include_examples "block_macro", :bytefield, code, [:svg]
+  include_examples "block_macro", :bytefield, BYTEFIELD_CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::BytefieldBlockProcessor do
-  include_examples "block", :bytefield, code, [:svg]
+  include_examples "block", :bytefield, BYTEFIELD_CODE, [:svg]
 end

data/spec/diagrams_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+DIAGRAMS_CODE = <<-eos
 from diagrams import Diagram
 from diagrams.aws.compute import EC2
 from diagrams.aws.database import RDS
@@ -15,9 +15,9 @@ with Diagram("Grouped Workers", show=False, direction="TB"):
 eos
 
 describe Asciidoctor::Diagram::DiagramsBlockMacroProcessor do
-  include_examples "block_macro", :diagrams, code, [:png, :svg]
+  include_examples "block_macro", :diagrams, DIAGRAMS_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::DiagramsBlockProcessor do
-  include_examples "block", :diagrams, code, [:png, :svg]
+  include_examples "block", :diagrams, DIAGRAMS_CODE, [:png, :svg]
 end

data/spec/ditaa_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+DITAA_CODE = <<-eos
 +--------+   +-------+    +-------+
 |        | --+ ditaa +--> |       |
 |  Text  |   +-------+    |diagram|
@@ -13,11 +13,11 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::DitaaBlockMacroProcessor do
-  include_examples "block_macro", :ditaa, code, [:png, :svg]
+  include_examples "block_macro", :ditaa, DITAA_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::DitaaBlockProcessor do
-  include_examples "block", :ditaa, code, [:png, :svg]
+  include_examples "block", :ditaa, DITAA_CODE, [:png, :svg]
 
   it "should support ditaa options as attributes" do
     doc = <<-eos

data/spec/dpic_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+DPIC_CODE = <<-eos
   arrow "$u$" above
 S: circle rad 10/72.27  # 10 pt
   line right 0.35
@@ -11,9 +11,9 @@ G: box "$G(s)$"
 eos
 
 describe Asciidoctor::Diagram::DpicBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :dpic, code, [:svg]
+  include_examples "block_macro", :dpic, DPIC_CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::DpicBlockProcessor, :broken_on_windows do
-  include_examples "block", :dpic, code, [:svg]
+  include_examples "block", :dpic, DPIC_CODE, [:svg]
 end

data/spec/erd_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+ERD_CODE = <<-eos
 title {label: "nfldb Entity-Relationship diagram (condensed)", size: "20"}
 
 # Entities
@@ -84,9 +84,9 @@ player      1--* play_player
 eos
 
 describe Asciidoctor::Diagram::ErdBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :erd, code, [:png, :svg]
+  include_examples "block_macro", :erd, ERD_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_windows do
-  include_examples "block", :erd, code, [:png, :svg]
+  include_examples "block", :erd, ERD_CODE, [:png, :svg]
 end

data/spec/gnuplot_spec.rb

@@ -1,15 +1,15 @@
 require_relative 'test_helper'
 
-code = <<-eos
+GNUPLOT_CODE = <<-eos
 plot [0:5][0:20] x**2 title 'O(n^2)'
 eos
 
 describe Asciidoctor::Diagram::GnuplotBlockMacroProcessor do
-  include_examples "block_macro", :gnuplot, code, [:png, :svg, :gif, :txt]
+  include_examples "block_macro", :gnuplot, GNUPLOT_CODE, [:png, :svg, :gif, :txt]
 end
 
 describe Asciidoctor::Diagram::GnuplotBlockProcessor do
-  include_examples "block", :gnuplot, code, [:png, :svg, :gif, :txt]
+  include_examples "block", :gnuplot, GNUPLOT_CODE, [:png, :svg, :gif, :txt]
 
   it "should generate images with user defined size" do
     doc = <<-eos
@@ -20,7 +20,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png",width="800", height="600"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -50,7 +50,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", crop=false, transparent=false]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -80,7 +80,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", crop=true, transparent=true]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -110,7 +110,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -140,7 +140,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial,11"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -170,7 +170,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", font="Arial", scale="0.5"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 
@@ -200,7 +200,7 @@ Doc Writer <doc@example.com>
 
 [gnuplot, format="png", background="red"]
 ----
-#{code}
+#{GNUPLOT_CODE}
 ----
     eos
 

data/spec/graphviz_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+DOT_CODE = <<-eos
 digraph foo {
   node [style=rounded]
   node1 [shape=box]
@@ -12,9 +12,9 @@ digraph foo {
 eos
 
 describe Asciidoctor::Diagram::GraphvizBlockMacroProcessor do
-  include_examples "block_macro", :graphviz, code, [:png, :svg]
+  include_examples "block_macro", :graphviz, DOT_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::GraphvizBlockProcessor do
-  include_examples "block", :graphviz, code, [:png, :svg]
+  include_examples "block", :graphviz, DOT_CODE, [:png, :svg]
 end

data/spec/lilypond_spec.rb

@@ -1,13 +1,13 @@
 require_relative 'test_helper'
 
-code = <<-eos
+LILYPOND_CODE = <<-eos
 \\relative c' { f d f a d f e d cis a cis e a g f e }
 eos
 
 describe Asciidoctor::Diagram::LilypondBlockMacroProcessor do
-  include_examples "block_macro", :lilypond, code, [:png]
+  include_examples "block_macro", :lilypond, LILYPOND_CODE, [:png]
 end
 
 describe Asciidoctor::Diagram::LilypondBlockProcessor do
-  include_examples "block", :lilypond, code, [:png]
+  include_examples "block", :lilypond, LILYPOND_CODE, [:png]
 end

data/spec/mermaid_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+MERMAID_CODE = <<-eos
 graph LR
     A[Square Rect] -- Link text --> B((Circle))
     A --> C(Round Rect)
@@ -9,7 +9,7 @@ graph LR
 eos
 
 describe Asciidoctor::Diagram::MermaidBlockMacroProcessor do
-  include_examples "block_macro", :mermaid, code, [:png, :svg]
+  include_examples "block_macro", :mermaid, MERMAID_CODE, [:png, :svg]
 
   it "should respect the sequenceConfig attribute" do
     seq_diag = <<-eos
@@ -135,7 +135,7 @@ mermaid::mermaid.txt[target="without_config"]
 end
 
 describe Asciidoctor::Diagram::MermaidBlockProcessor do
-  include_examples "block", :mermaid, code, [:png, :svg]
+  include_examples "block", :mermaid, MERMAID_CODE, [:png, :svg]
 
   it "should work with kroki.io" do
     doc = <<-eos

data/spec/msc_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+MSC_CODE = <<-eos
 # MSC for some fictional process
 msc {
   hscale = "2";
@@ -25,9 +25,9 @@ msc {
 eos
 
 describe Asciidoctor::Diagram::MscBlockMacroProcessor do
-  include_examples "block_macro", :msc, code, [:png, :svg]
+  include_examples "block_macro", :msc, MSC_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::MscBlockProcessor do
-  include_examples "block", :msc, code, [:png, :svg]
+  include_examples "block", :msc, MSC_CODE, [:png, :svg]
 end

data/spec/nomnoml_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+NOMNOML_CODE = <<-eos
 [Pirate
   [beard]--[parrot]
   [beard]-:>[foul mouth]
@@ -24,9 +24,9 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::NomnomlBlockMacroProcessor do
-  include_examples "block_macro", :nomnoml, code, [:svg]
+  include_examples "block_macro", :nomnoml, NOMNOML_CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::NomnomlBlockProcessor do
-  include_examples "block", :nomnoml, code, [:svg]
+  include_examples "block", :nomnoml, NOMNOML_CODE, [:svg]
 end

data/spec/pikchr_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+PIKCHR_CODE = <<-eos
 # Change from the original:
 #    * Expand the macro by hand, as Pikchr does not support
 #      macros
@@ -43,11 +43,11 @@ box invis wid 2*boxwid "ndtable:" with .e at Start.w
 eos
 
 describe Asciidoctor::Diagram::PikchrBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :pikchr, code, [:svg]
+  include_examples "block_macro", :pikchr, PIKCHR_CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::PikchrBlockProcessor, :broken_on_windows do
-  include_examples "block", :pikchr, code, [:svg]
+  include_examples "block", :pikchr, PIKCHR_CODE, [:svg]
 
   it "should report syntax errors" do
     doc = <<-eos

data/spec/plantuml_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+PLANTUML_CODE = <<-eos
 User -> (Start)
 User --> (Use the application) : Label
 
@@ -8,7 +8,7 @@ User --> (Use the application) : Label
 eos
 
 describe Asciidoctor::Diagram::PlantUmlBlockMacroProcessor do
-  include_examples "block_macro", :plantuml, code, [:png, :svg, :txt]
+  include_examples "block_macro", :plantuml, PLANTUML_CODE, [:png, :svg, :txt]
 
   it 'should support substitutions in diagram code' do
     code = <<-eos
@@ -156,7 +156,39 @@ plantuml::dir/plantuml.txt[format="svg", subs=attributes+]
 end
 
 describe Asciidoctor::Diagram::PlantUmlBlockProcessor do
-  include_examples "block", :plantuml, code, [:png, :svg, :txt]
+  include_examples "block", :plantuml, PLANTUML_CODE, [:png, :svg, :txt]
+
+  it "should work with plantuml.com" do
+    doc = <<-eos
+= Hello, kroki!
+:diagram-server-url: http://plantuml.com/plantuml
+:diagram-server-type: plantuml
+Doc Writer <doc@example.com>
+
+== First Section
+
+[plantuml, format=svg]
+----
+#{PLANTUML_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 use plantuml configuration when specified as a document attribute' do
     doc = <<-eos

data/spec/shaape_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+SHAAPE_CODE = <<-eos
         +-->
        /     /\
   >---+---->+  +
@@ -8,9 +8,9 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::ShaapeBlockMacroProcessor, :broken_on_osx, :broken_on_github, :broken_on_windows do
-  include_examples "block_macro", :shaape, code, [:png, :svg]
+  include_examples "block_macro", :shaape, SHAAPE_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::ShaapeBlockProcessor, :broken_on_osx, :broken_on_github, :broken_on_windows do
-  include_examples "block", :shaape, code, [:png, :svg]
+  include_examples "block", :shaape, SHAAPE_CODE, [:png, :svg]
 end

data/spec/smcat_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+SMCAT_CODE = <<-eos
 initial,
 doing: entry/ write unit test
        do/ write code
@@ -18,9 +18,9 @@ testing      => final        : test ok;
 eos
 
 describe Asciidoctor::Diagram::SmcatBlockMacroProcessor do
-  include_examples "block_macro", :smcat, code, [:svg]
+  include_examples "block_macro", :smcat, SMCAT_CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::SmcatBlockProcessor do
-  include_examples "block", :smcat, code, [:svg]
+  include_examples "block", :smcat, SMCAT_CODE, [:svg]
 end

data/spec/svgbob_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+SVGBOB_CODE = <<-eos
                       .--.            .---.  .---. .---.  .---.    .---.  .---. 
                       |  |   OS API   '---'  '---' '---'  '---'    '---'  '---' 
                       v  |              |      |     |      |        |      |   
@@ -21,9 +21,9 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::SvgBobBlockMacroProcessor do
-  include_examples "block_macro", :svgbob, code, [:svg]
+  include_examples "block_macro", :svgbob, SVGBOB_CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::SvgBobBlockProcessor do
-  include_examples "block", :svgbob, code, [:svg]
+  include_examples "block", :svgbob, SVGBOB_CODE, [:svg]
 end

data/spec/symbolator_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+SYMBOLATOR_CODE = <<-eos
 library ieee;
 use ieee.std_logic_1164.all;
 
@@ -15,9 +15,9 @@ end package;
 eos
 
 describe Asciidoctor::Diagram::SymbolatorBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :symbolator, code, [:png, :svg, :pdf]
+  include_examples "block_macro", :symbolator, SYMBOLATOR_CODE, [:png, :svg, :pdf]
 end
 
 describe Asciidoctor::Diagram::SymbolatorBlockProcessor, :broken_on_windows do
-  include_examples "block", :symbolator, code, [:png, :svg, :pdf]
+  include_examples "block", :symbolator, SYMBOLATOR_CODE, [:png, :svg, :pdf]
 end

data/spec/syntrax_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+SYNTRAX_CODE = <<-eos
 indentstack(10,
   line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
     opt('.', loop('0-9', None))),
@@ -10,9 +10,9 @@ indentstack(10,
 eos
 
 describe Asciidoctor::Diagram::SyntraxBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :syntrax, code, [:png, :svg]
+  include_examples "block_macro", :syntrax, SYNTRAX_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::SyntraxBlockProcessor, :broken_on_windows do
-  include_examples "block", :syntrax, code, [:png, :svg]
+  include_examples "block", :syntrax, SYNTRAX_CODE, [:png, :svg]
 end

data/spec/tikz_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-'eos'
+TIKZ_CODE = <<-'eos'
 \begin{tikzpicture}[font=\LARGE] 
 
 % Figure parameters (tta and k needs to have the same sign)
@@ -99,14 +99,14 @@ code = <<-'eos'
 eos
 
 describe Asciidoctor::Diagram::TikZBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :tikz, code, [:pdf]
+  include_examples "block_macro", :tikz, TIKZ_CODE, [:pdf]
 end
 
 describe Asciidoctor::Diagram::TikZBlockProcessor, :broken_on_windows do
-  include_examples "block", :tikz, code, [:pdf]
+  include_examples "block", :tikz, TIKZ_CODE, [:pdf]
   
   it "should support the preamble attribute" do
-      File.write("tikz.txt", code)
+      File.write("tikz.txt", TIKZ_CODE)
 
       doc = <<'eos'
 = Hello, tikz!

data/spec/umlet_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+CODE = <<-eos
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <diagram program="umlet" version="14.2">
   <zoom_level>10</zoom_level>
@@ -21,9 +21,9 @@ eos
 
 
 describe Asciidoctor::Diagram::UmletBlockMacroProcessor do
-  include_examples "block_macro", :umlet, code, [:svg]
+  include_examples "block_macro", :umlet, CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::UmletBlockProcessor do
-  include_examples "block", :umlet, code, [:svg]
+  include_examples "block", :umlet, CODE, [:svg]
 end

data/spec/vega_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-vega_code = <<-eos
+VEGA_CODE = <<-eos
 {
   "$schema": "https://vega.github.io/schema/vega/v3.json",
   "width": 400,
@@ -98,7 +98,7 @@ vega_code = <<-eos
 }
 eos
 
-vegalite_code = <<-eos
+VEGALITE_CODE = <<-eos
 {
   "$schema": "https://vega.github.io/schema/vega-lite/v2.json",
   "description": "A simple bar chart with embedded data.",
@@ -118,11 +118,11 @@ vegalite_code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::VegaBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :vega, vega_code, [:svg]
-  # include_examples "block_macro", :vegalite, vegalite_code, [:svg]
+  include_examples "block_macro", :vega, VEGA_CODE, [:svg]
+  # include_examples "block_macro", :vegalite, VEGALITE_CODE, [:svg]
 end
 
 describe Asciidoctor::Diagram::VegaBlockProcessor, :broken_on_windows do
-  include_examples "block", :vega, vega_code, [:svg]
-  # include_examples "block", :vegalite, vegalite_code, [:svg]
+  include_examples "block", :vega, VEGA_CODE, [:svg]
+  # include_examples "block", :vegalite, VEGALITE_CODE, [:svg]
 end

data/spec/wavedrom_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-code = <<-eos
+WAVEDROM_CODE = <<-eos
 { signal : [
   { name: "clk",  wave: "p......" },
   { name: "bus",  wave: "x.34.5x",   data: "head body tail" },
@@ -9,9 +9,9 @@ code = <<-eos
 eos
 
 describe Asciidoctor::Diagram::WavedromBlockMacroProcessor, :broken_on_windows do
-  include_examples "block_macro", :wavedrom, code, [:png, :svg]
+  include_examples "block_macro", :wavedrom, WAVEDROM_CODE, [:png, :svg]
 end
 
 describe Asciidoctor::Diagram::WavedromBlockProcessor, :broken_on_windows do
-  include_examples "block", :wavedrom, code, [:png, :svg]
+  include_examples "block", :wavedrom, WAVEDROM_CODE, [:png, :svg]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A family of Asciidoctor extensions that generate images from a broad range