metanorma-standoc 1.10.8 → 1.11.2

data/spec/asciidoctor/datamodel/attributes_table_preprocessor_spec.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
-  describe '#process' do
-    context 'when simple models without relations' do
+  describe "#process" do
+    context "when simple models without relations" do
       let(:datamodel_file) do
-        examples_path('datamodel/address_class_profile.adoc')
+        examples_path("datamodel/address_class_profile.adoc")
       end
       let(:result_file) do
-        examples_path('datamodel/address_class_profile.xml')
+        examples_path("datamodel/address_class_profile.xml")
       end
       let(:output) do
         [
           BLANK_HDR,
-          File.read(fixtures_path('macros_datamodel/address_class_profile.xml'))
+          File.read(fixtures_path("macros_datamodel/address_class_profile.xml")),
         ]
           .join
       end
@@ -27,7 +27,7 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
         end
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,
@@ -37,18 +37,18 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
       end
     end
 
-    context 'when complex relations' do
+    context "when complex relations" do
       let(:datamodel_file) do
-        examples_path('datamodel/address_component_profile.adoc')
+        examples_path("datamodel/address_component_profile.adoc")
       end
       let(:result_file) do
-        examples_path('datamodel/address_component_profile.xml')
+        examples_path("datamodel/address_component_profile.xml")
       end
       let(:output) do
-        path = fixtures_path('macros_datamodel/address_component_profile.xml')
+        path = fixtures_path("macros_datamodel/address_component_profile.xml")
         [
           BLANK_HDR,
-          File.read(path)
+          File.read(path),
         ]
           .join("\n")
       end
@@ -56,14 +56,14 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
       after do
         %w[doc html xml err].each do |extention|
           path = examples_path(
-            "datamodel/address_component_profile.#{extention}"
+            "datamodel/address_component_profile.#{extention}",
           )
           FileUtils.rm_f(path)
           FileUtils.rm_f("address_component_profile.#{extention}")
         end
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,
@@ -73,32 +73,32 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
       end
     end
 
-    context 'when missing definition' do
+    context "when missing definition" do
       let(:datamodel_file) do
-        examples_path('datamodel/blank_definition_profile.adoc')
+        examples_path("datamodel/blank_definition_profile.adoc")
       end
       let(:result_file) do
-        examples_path('datamodel/blank_definition_profile.xml')
+        examples_path("datamodel/blank_definition_profile.xml")
       end
       let(:output) do
-        path = fixtures_path('macros_datamodel/blank_definition_profile.xml')
+        path = fixtures_path("macros_datamodel/blank_definition_profile.xml")
         [
           BLANK_HDR,
-          File.read(path)
+          File.read(path),
         ].join("\n")
       end
 
       after do
         %w[doc html xml err].each do |extention|
           path = examples_path(
-            "datamodel/blank_definition_profile.#{extention}"
+            "datamodel/blank_definition_profile.#{extention}",
           )
           FileUtils.rm_f(path)
           FileUtils.rm_f("blank_definition_profile.#{extention}")
         end
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,

data/spec/asciidoctor/datamodel/diagram_preprocessor_spec.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc::Datamodel::DiagramPreprocessor do
-  describe '#process' do
-    context 'when simple models without relations' do
+  describe "#process" do
+    context "when simple models without relations" do
       let(:datamodel_file) do
-        examples_path('datamodel/common_models_diagram.adoc')
+        examples_path("datamodel/common_models_diagram.adoc")
       end
       let(:result_file) do
-        examples_path('datamodel/common_models_diagram.xml')
+        examples_path("datamodel/common_models_diagram.xml")
       end
       let(:output) do
         [
           BLANK_HDR,
           File.read(
-            fixtures_path('macros_datamodel/common_models_diagram.xml')
-          )
+            fixtures_path("macros_datamodel/common_models_diagram.xml"),
+          ),
         ].join
       end
 
@@ -26,10 +26,10 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::DiagramPreprocessor do
           FileUtils.rm_f(path)
           FileUtils.rm_f("common_models_diagram.#{extention}")
         end
-        FileUtils.rm_rf('common_models_diagram_htmlimages')
+        FileUtils.rm_rf("common_models_diagram_htmlimages")
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,
@@ -39,13 +39,13 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::DiagramPreprocessor do
       end
     end
 
-    context 'when complex relations' do
-      let(:datamodel_file) { examples_path('datamodel/top_down_diagram.adoc') }
-      let(:result_file) { examples_path('datamodel/top_down_diagram.xml') }
+    context "when complex relations" do
+      let(:datamodel_file) { examples_path("datamodel/top_down_diagram.adoc") }
+      let(:result_file) { examples_path("datamodel/top_down_diagram.xml") }
       let(:output) do
         [
           BLANK_HDR,
-          File.read(fixtures_path('macros_datamodel/top_down_diagram.xml'))
+          File.read(fixtures_path("macros_datamodel/top_down_diagram.xml")),
         ].join("\n")
       end
 
@@ -55,11 +55,11 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::DiagramPreprocessor do
           FileUtils.rm_f(path)
           FileUtils.rm_f("top_down_diagram.#{extention}")
         end
-        FileUtils.rm_rf(examples_path('datamodel/plantuml'))
-        FileUtils.rm_rf('top_down_diagram_htmlimages')
+        FileUtils.rm_rf(examples_path("datamodel/plantuml"))
+        FileUtils.rm_rf("top_down_diagram_htmlimages")
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,

data/spec/asciidoctor/inline_spec.rb

@@ -73,8 +73,8 @@ RSpec.describe Asciidoctor::Standoc do
       sub<sub><em>scr</em>ipt</sub>
       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
       mark
-      <admitted>alt</admitted>
-      <deprecates>deprecated</deprecates>
+      <admitted><expression><name>alt</name></expression></admitted>
+      <deprecates><expression><name>deprecated</name></expression></deprecates>
       <domain>domain</domain>
       <strike>strike</strike>
       <underline>underline</underline>
@@ -294,9 +294,9 @@ RSpec.describe Asciidoctor::Standoc do
       http://example.com[Link]
       http://example.com[Link,title="tip"]
       link:++https://asciidoctor.org/now_this__link_works.html++[]
-      http://example.com[Link,updatetype=true]
+      http://example.com[Link,update-type=true]
       link:../example[updatetype=true]
-      link:../example[Link,updatetype=true]
+      link:../example[Link,update-type=true]
     INPUT
     output = <<~OUTPUT
            #{BLANK_HDR}
@@ -306,9 +306,9 @@ RSpec.describe Asciidoctor::Standoc do
       <link target="http://example.com">Link</link>
       <link target="http://example.com" alt="tip">Link</link>
       <link target='https://asciidoctor.org/now_this__link_works.html'/>
-      <link target="http://example.com" updatetype="true">Link</link>
-      <link target="../example" updatetype="true"/>
-      <link target="../example" updatetype="true">Link</link></p>
+      <link target="http://example.com" update-type="true">Link</link>
+      <link target="../example" update-type="true"/>
+      <link target="../example" update-type="true">Link</link></p>
       </p>
       </sections>
       </standard-document>

data/spec/asciidoctor/isobib_cache_spec.rb

@@ -716,29 +716,25 @@ RSpec.describe Asciidoctor::Standoc do
 
   def mock_isobib_get_123
     expect(RelatonIso::IsoBibliography).to receive(:get)
-      .with("ISO 123", "2001",
-            { lang: "en", title: "<em>Standard</em>", usrlbl: nil })
+      .with("ISO 123", "2001", anything)
       .and_return(RelatonIsoBib::XMLParser.from_xml(ISO_123_DATED))
   end
 
   def mock_isobib_get_123_undated
     expect(RelatonIso::IsoBibliography).to receive(:get)
-      .with("ISO 123", nil,
-            { lang: "en", title: "<em>Standard</em>", usrlbl: nil })
+      .with("ISO 123", nil, anything)
       .and_return(RelatonIsoBib::XMLParser.from_xml(ISO_123_UNDATED))
   end
 
   def mock_isobib_get_124
     expect(RelatonIso::IsoBibliography).to receive(:get)
-      .with("ISO 124", "2014",
-            { lang: "en", title: "<em>Standard</em>", usrlbl: nil })
+      .with("ISO 124", "2014", anything)
       .and_return(RelatonIsoBib::XMLParser.from_xml(ISO_124_DATED))
   end
 
   def mock_ietfbib_get_123
     expect(RelatonIetf::IetfBibliography).to receive(:get)
-      .with("RFC 123", nil,
-            { lang: "en", title: "<em>Standard</em>", usrlbl: nil })
+      .with("RFC 123", nil, anything)
       .and_return(RelatonIsoBib::XMLParser.from_xml(IETF_123_SHORT))
   end
 end

data/spec/asciidoctor/macros_plantuml_spec.rb

@@ -64,6 +64,7 @@ RSpec.describe Asciidoctor::Standoc do
       :novalid:
       :no-isobib:
       :imagesdir: spec/assets
+      :data-uri-image: false
 
       [plantuml]
       ....
@@ -100,6 +101,7 @@ RSpec.describe Asciidoctor::Standoc do
         :novalid:
         :no-isobib:
         :imagesdir: spec/assets
+        :data-uri-image: false
 
         [lutaml_diagram]
         ....
@@ -135,7 +137,7 @@ RSpec.describe Asciidoctor::Standoc do
     end
 
     context "when inline macro, path supplied as the second arg" do
-      let(:example_file) { fixtures_path('diagram_definitions.lutaml') }
+      let(:example_file) { fixtures_path("diagram_definitions.lutaml") }
       let(:input) do
         <<~TEXT
           = Document title
@@ -145,6 +147,7 @@ RSpec.describe Asciidoctor::Standoc do
           :novalid:
           :no-isobib:
           :imagesdir: spec/assets
+          :data-uri-image: false
 
           lutaml_diagram::#{example_file}[]
 
@@ -345,6 +348,38 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes the PlantUML macro with mismatched delimiters" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [plantuml]
+      ....
+      @startuml
+      Alice -> Bob: Authentication Request
+      Bob --> Alice: Authentication Response
+
+      Alice -> Bob: Another authentication Request
+      Alice <-- Bob: another authentication Response
+      ....
+    INPUT
+    expect { Asciidoctor.convert(input, *OPTIONS) }
+      .to output(%r{@startuml without matching @enduml in PlantUML!}).to_stderr
+    output = <<~OUTPUT
+             #{BLANK_HDR}
+             <sections>
+               <sourcecode id="_" lang="plantuml">@startuml
+      Alice -&gt; Bob: Authentication Request
+      Bob --&gt; Alice: Authentication Response
+
+      Alice -&gt; Bob: Another authentication Request
+      Alice &lt;-- Bob: another authentication Response</sourcecode>
+              </sections>
+             </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   private
 
   def mock_plantuml_disabled