metanorma-standoc 2.1.5 → 2.2.1

data/spec/metanorma/refs_spec.rb

@@ -1732,7 +1732,6 @@ RSpec.describe Metanorma::Standoc do
                <title type='main' format='text/plain'>Network Configuration Access Control Model</title>
                <uri type='src'>https://www.rfc-editor.org/info/rfc8341</uri>
                <docidentifier type='IETF' primary='true'>RFC 8341</docidentifier>
-               <docidentifier type='IETF' scope='anchor'>RFC8341</docidentifier>
                <docidentifier type='DOI'>10.17487/RFC8341</docidentifier>
                <docnumber>RFC8341</docnumber>
                <date type='published'>
@@ -1787,7 +1786,6 @@ RSpec.describe Metanorma::Standoc do
                <uri type='src'>https://www.rfc-editor.org/info/rfc8341</uri>
                <docidentifier type='IETF' primary='true'>RFC 8341</docidentifier>
                <docidentifier type='metanorma'>[1]</docidentifier>
-               <docidentifier type='IETF' scope='anchor'>RFC8341</docidentifier>
                <docidentifier type='DOI'>10.17487/RFC8341</docidentifier>
                <docnumber>RFC8341</docnumber>
                <date type='published'>

data/spec/metanorma/reqt_spec.rb

@@ -0,0 +1,130 @@
+require "spec_helper"
+require "open3"
+
+RSpec.describe Metanorma::Standoc do
+  it "processes recommendation" do
+    input = <<~"INPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      [.recommendation,identifier="/ogc/recommendation/wfs/2",subject="user;developer, implementer",inherit="/ss/584/2015/level/1; /ss/584/2015/level/2",options="unnumbered",type=verification,model=ogc,tag=X,multilingual-rendering=common]
+      ====
+      I recommend this
+      ====
+    INPUT
+    output = <<~"OUTPUT"
+      #{BLANK_HDR}
+       <sections>
+         <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
+         <identifier>/ogc/recommendation/wfs/2</identifier>
+       <subject>user</subject>
+       <subject>developer, implementer</subject>
+       <inherit>/ss/584/2015/level/1</inherit>
+       <inherit>/ss/584/2015/level/2</inherit>
+         <description><p id="_">I recommend this</p>
+       </description>
+       </recommendation>
+              </sections>
+              </standard-document>
+    OUTPUT
+
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "applies default requirement model" do
+    mock_default_recommendation_model("ogc")
+    input = <<~"INPUT"
+      #{ASCIIDOC_BLANK_HDR}
+
+      [[A]]
+      [.permission]
+      ====
+      I permit this
+
+
+      [[B]]
+      [.permission]
+      =====
+      I also permit this
+
+      . List
+      . List
+      =====
+      ====
+    INPUT
+
+    xml = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS))
+    expect(xml.at("//xmlns:permission[@id = 'A']/@model").text).to eq("ogc")
+    expect(xml.at("//xmlns:permission/xmlns:permission/@model").text)
+      .to eq("ogc")
+  end
+
+  it "overrides default requirement model" do
+    mock_default_recommendation_model("ogc")
+    input = <<~"INPUT"
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :data-uri-image: false
+      :requirements-model: default
+
+      [[A]]
+      [.permission]
+      ====
+      I permit this
+
+      [[B]]
+      [.permission]
+      =====
+      I also permit this
+
+      . List
+      . List
+      =====
+      ====
+    INPUT
+
+    xml = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS))
+    expect(xml.at("//xmlns:permission[@id = 'A']/@model").text).to eq("default")
+    expect(xml.at("//xmlns:permission/xmlns:permission/@model").text)
+      .to eq("default")
+  end
+
+  it "inherits requirement model from parent" do
+    mock_default_recommendation_model("ogc")
+    input = <<~"INPUT"
+
+      #{ASCIIDOC_BLANK_HDR}
+      [[A]]
+      [.permission,model=ogc]
+      ====
+      I permit this
+
+      [[B]]
+      [.permission,model=default]
+      =====
+      I also permit this
+
+      . List
+      . List
+      =====
+      ====
+    INPUT
+
+    xml = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS))
+    expect(xml.at("//xmlns:permission[@id = 'A']/@model").text).to eq("ogc")
+    expect(xml.at("//xmlns:permission/xmlns:permission/@model").text)
+      .to eq("ogc")
+  end
+
+  private
+
+  def mock_default_recommendation_model(model)
+    allow_any_instance_of(::Metanorma::Standoc::Blocks)
+      .to receive(:default_requirement_model).and_return(
+        model,
+      )
+  end
+end

data/spec/metanorma/section_spec.rb

@@ -77,6 +77,8 @@ RSpec.describe Metanorma::Standoc do
 
       == Terms and Definitions
 
+      == Acknowledgements
+
       [appendix]
       == Annex
 
@@ -175,6 +177,9 @@ RSpec.describe Metanorma::Standoc do
       <clause id="_" inline-header="false" obligation="normative">
         <title>Terms and Definitions</title>
       </clause>
+      <clause id='_' inline-header='false' obligation='normative'>
+        <title>Acknowledgements</title>
+      </clause>
       </sections><annex id="_" inline-header="false" obligation="normative">
         <title>Annex</title>
         <clause id="_" inline-header="false" obligation="normative">

data/spec/metanorma/validate_spec.rb

@@ -30,7 +30,9 @@ RSpec.describe Metanorma::Standoc do
         [[abc]]
         == Clause 2
       INPUT
-      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+      expect do
+        Asciidoctor.convert(input, *OPTIONS)
+      end.to raise_error(SystemExit)
     rescue SystemExit
     end
     expect(File.read("test.err"))
@@ -387,7 +389,9 @@ RSpec.describe Metanorma::Standoc do
         {{<<def>>,term}}
         {{<<ghi>>,term}}
       INPUT
-      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+      expect do
+        Asciidoctor.convert(input, *OPTIONS)
+      end.to raise_error(SystemExit)
     rescue SystemExit
     end
     expect(File.read("test.err"))
@@ -420,7 +424,9 @@ RSpec.describe Metanorma::Standoc do
         related:see[<<def>>,term]
         related:see[<<ghi>>,term]
       INPUT
-      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+      expect do
+        Asciidoctor.convert(input, *OPTIONS)
+      end.to raise_error(SystemExit)
     rescue SystemExit
     end
     expect(File.read("test.err"))
@@ -448,7 +454,9 @@ RSpec.describe Metanorma::Standoc do
         [[abc]]
         == Clause 2
       INPUT
-      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+      expect do
+        Asciidoctor.convert(input, *OPTIONS)
+      end.to raise_error(SystemExit)
     rescue SystemExit
     end
     expect(File.read("test.err"))
@@ -470,7 +478,9 @@ RSpec.describe Metanorma::Standoc do
         == Normative references
         * [[[A,1]]]
       INPUT
-      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+      expect do
+        Asciidoctor.convert(input, *OPTIONS)
+      end.to raise_error(SystemExit)
     rescue SystemExit
     end
     expect(File.read("test.err"))
@@ -493,7 +503,6 @@ RSpec.describe Metanorma::Standoc do
         [cols="1,1,1,1"]
         |===
         3.2+| a | a
-
         | a
         | a | a | a | a
         |===
@@ -507,6 +516,37 @@ RSpec.describe Metanorma::Standoc do
       .not_to include "Table exceeds maximum number of columns defined"
     expect(File.read("test.err"))
       .not_to include "Table rows in table are inconsistent: check rowspan"
+    expect(File.read("test.err"))
+      .not_to include "Table rows in table cannot go outside thead: check rowspan"
+  end
+
+  it "warns if rowspan goes across thead" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+    begin
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+
+        == Clause
+
+        [cols="1,1,1,1",headerrows=2]
+        |===
+        3.3+| a | a
+
+        | a
+        | a | a | a | a
+        |===
+      INPUT
+      expect do
+        Asciidoctor.convert(input, *OPTIONS)
+      end.to raise_error(SystemExit)
+    rescue SystemExit
+    end
+    expect(File.read("test.err"))
+      .to include "Table rows in table cannot go outside thead: check rowspan"
   end
 
   xit "warns and aborts if columns out of bounds against colgroup" do