metanorma-iso 2.0.6 → 2.0.8

data/spec/metanorma/amd_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Metanorma::ISO do
   it "processes amendment sections" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{AMD_BLANK_HDR}
       == Foreword
 
@@ -54,6 +54,7 @@ RSpec.describe Metanorma::ISO do
 
       === Bibliography Subsection
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, '<doctype>amendment</doctype>')}
         <sections>
           <clause id="_" obligation="normative">
@@ -127,10 +128,12 @@ RSpec.describe Metanorma::ISO do
         </annex>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes default metadata, amendment" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -182,7 +185,7 @@ RSpec.describe Metanorma::ISO do
       :updates-document-type: international-standard
     INPUT
 
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <title format="text/plain" language="en" type="main">Introduction — Main Title — Title — Title Part — Mass fraction of
@@ -207,6 +210,7 @@ RSpec.describe Metanorma::ISO do
         de transport
       </title>
           <docidentifier type="ISO">ISO 17301-1:2016/PreNP Amd 1</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/PreNP Amd 1</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2016/PreNP Amd 1(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2016/PreNP Amd 1:2017(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -278,10 +282,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes metadata, amendment" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+  it "processes metadata, amendment, stage 30" do
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -295,11 +301,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :amendment-number: 1
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/CD Amd 1</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/CD Amd 1</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -348,10 +354,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes metadata, amendment" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+  it "processes metadata, amendment, stage 40" do
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -365,10 +373,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :amendment-number: 1
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/DAmd 1</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/DAmd 1</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/DAmd 1(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/DAmd 1(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -417,10 +426,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes metadata, amendment" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+  it "processes metadata, amendment, published" do
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -433,10 +444,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :amendment-number: 1
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/Amd 1</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/Amd 1</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/Amd 1(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/Amd 1(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -485,10 +497,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes metadata, corrigendum" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+  it "processes metadata, corrigendum, stage 30" do
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -502,11 +516,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :corrigendum-number: 3
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{'      '}
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/CD Cor.3</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/CD Cor.3</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -555,10 +569,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes metadata, corrigendum" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+  it "processes metadata, corrigendum, stage 50" do
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -572,10 +588,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :corrigendum-number: 3
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
         <bibdata type='standard'>
           <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/FDCor.3</docidentifier>
           <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
           <docidentifier type='iso-reference'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -624,10 +641,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes metadata, corrigendum" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+  it "processes metadata, corrigendum, published" do
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -640,10 +659,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :corrigendum-number: 3
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/Cor.3</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/Cor.3</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/Cor.3(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/Cor.3(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -692,5 +712,7 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 end

data/spec/metanorma/base_spec.rb

@@ -65,6 +65,7 @@ RSpec.describe Metanorma::ISO do
             <title format="text/plain" language="fr" type="title-main">Titre Principal</title>
             <title format="text/plain" language="fr" type="title-part">Part du Titre</title>
             <docidentifier type="ISO">ISO/PreWD3 1000-1</docidentifier>
+            <docidentifier type='iso-undated'>ISO/PreWD3 1000-1</docidentifier>
             <docidentifier type="iso-with-lang">ISO/PreWD3 1000-1(E)</docidentifier>
             <docidentifier type="iso-reference">ISO/PreWD3 1000-1:2000(E)</docidentifier>
             <docnumber>1000</docnumber>
@@ -167,6 +168,7 @@ RSpec.describe Metanorma::ISO do
               <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
                 <bibdata type="standard">
                   <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
+                  <docidentifier type='iso-undated'>ISO/IEC/IETF/TR 1000-1-1</docidentifier>
                   <docidentifier type="iso-with-lang">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
                   <docidentifier type="iso-reference">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
                   <docidentifier type="iso-tc">2000</docidentifier>
@@ -340,6 +342,7 @@ RSpec.describe Metanorma::ISO do
             <title language='fr' format='text/plain' type='title-main'>Titre Principal</title>
             <title language='fr' format='text/plain' type='title-part'>Part du Titre</title>
             <docidentifier type='ISO'>ISO 1000-1:2000</docidentifier>
+            <docidentifier type='iso-undated'>ISO 1000-1</docidentifier>
             <docidentifier type='iso-with-lang'>ISO 1000-1:2000(R)</docidentifier>
             <docidentifier type='iso-reference'>ISO 1000-1:2000(R)</docidentifier>
             <docnumber>1000</docnumber>
@@ -426,6 +429,7 @@ RSpec.describe Metanorma::ISO do
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
           <bibdata type='standard'>
             <docidentifier type='ISO'>SD 1000-1-1</docidentifier>
+            <docidentifier type='iso-undated'>SD 1000-1-1</docidentifier>
             <docidentifier type='iso-with-lang'>SD 1000-1-1(X)</docidentifier>
             <docidentifier type='iso-reference'>SD 1000-1-1(X)</docidentifier>
             <docidentifier type='iso-tc'>2000</docidentifier>
@@ -521,6 +525,7 @@ RSpec.describe Metanorma::ISO do
               <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
                 <bibdata type="standard">
                 <docidentifier type='ISO'>ISO/FDIS 1000.2</docidentifier>
+                <docidentifier type='iso-undated'>ISO/FDIS 1000.2</docidentifier>
         <docidentifier type='iso-with-lang'>ISO/FDIS 1000.2(F)</docidentifier>
         <docidentifier type='iso-reference'>ISO/FDIS 1000.2(F)</docidentifier>
                   <docnumber>1000</docnumber>
@@ -589,6 +594,7 @@ RSpec.describe Metanorma::ISO do
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 1000</docidentifier>
+          <docidentifier type='iso-undated'>ISO 1000</docidentifier>
           <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
           <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
           <docnumber>1000</docnumber>
@@ -657,6 +663,7 @@ RSpec.describe Metanorma::ISO do
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
           <bibdata type="standard">
             <docidentifier type="ISO">ISO 1000</docidentifier>
+            <docidentifier type='iso-undated'>ISO 1000</docidentifier>
             <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
             <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
             <docnumber>1000</docnumber>
@@ -725,6 +732,7 @@ RSpec.describe Metanorma::ISO do
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
           <bibdata type='standard'>
             <docidentifier type='ISO'>ISO DIR 1000</docidentifier>
+            <docidentifier type='iso-undated'>ISO DIR 1000</docidentifier>
             <docidentifier type='iso-with-lang'>ISO DIR 1000(E)</docidentifier>
             <docidentifier type='iso-reference'>ISO DIR 1000(E)</docidentifier>
             <docnumber>1000</docnumber>

data/spec/metanorma/blocks_spec.rb

@@ -159,7 +159,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
               <termnote id="_">
                 <p id="_">This is a note</p></termnote>
@@ -282,7 +282,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
               <termexample id="_">
                 <p id="_">This is an example</p></termexample>
@@ -532,7 +532,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
                       <definition>
           <verbal-definition>
@@ -574,7 +574,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
                       <definition>
           <verbal-definition>

data/spec/metanorma/cleanup_spec.rb

@@ -93,7 +93,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>#{TERM_BOILERPLATE}
 
-            <term id="term-tempus">
+            <term id="term-Tempus">
               <preferred><expression><name>Tempus</name></expression></preferred>
               <domain>relativity</domain>
               <definition><verbal-definition>
@@ -204,7 +204,7 @@ RSpec.describe Metanorma::ISO do
               <li>
                 <p id="_">So am I</p></li>
             </ul>
-            <term id="term-time">
+            <term id="term-Time">
               <preferred><expression><name>Time</name></expression></preferred>
               <definition><verbal-definition>
                 <p id="_">This paragraph is extraneous</p>
@@ -454,7 +454,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
                       <definition>
           <verbal-definition>
@@ -1257,7 +1257,7 @@ RSpec.describe Metanorma::ISO do
                 </p>
               </li>
             </ul>
-            <term id='term-term1'>
+            <term id='term-Term1'>
               <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>
@@ -1308,13 +1308,13 @@ RSpec.describe Metanorma::ISO do
               </ul>
               <terms id='_' obligation='normative'>
                 <title>Normal Terms</title>
-                <term id='term-term1'>
+                <term id='term-Term1'>
                   <preferred><expression><name>Term1</name></expression></preferred>
                 </term>
               </terms>
               <terms id='_' obligation='normative'>
                 <title>Abnormal terms</title>
-                <term id='term-term-2'>
+                <term id='term-Term-2'>
                   <preferred><expression><name>Term 2</name></expression></preferred>
                 </term>
               </terms>
@@ -1372,13 +1372,13 @@ RSpec.describe Metanorma::ISO do
                 </ul>
                 <terms id='_' obligation='normative'>
                   <title>Normal Terms</title>
-                  <term id='term-term1'>
+                  <term id='term-Term1'>
                     <preferred><expression><name>Term1</name></expression></preferred>
                   </term>
                 </terms>
                 <terms id='_' obligation='normative'>
                   <title>Abnormal terms</title>
-                  <term id='term-term-2'>
+                  <term id='term-Term-2'>
                     <preferred><expression><name>Term 2</name></expression></preferred>
                   </term>
                 </terms>
@@ -1437,13 +1437,13 @@ RSpec.describe Metanorma::ISO do
                     </p>
                   </li>
                 </ul>
-                <term id='term-term1'>
+                <term id='term-Term1'>
                   <preferred><expression><name>Term1</name></expression></preferred>
                 </term>
               </terms>
               <terms id='_' obligation='normative'>
                 <title>Other Terms</title>
-                <term id='term-term-2'>
+                <term id='term-Term-2'>
                   <preferred><expression><name>Term 2</name></expression></preferred>
                 </term>
               </terms>
@@ -1495,7 +1495,7 @@ RSpec.describe Metanorma::ISO do
                 </p>
               </li>
             </ul>
-            <term id='term-term1'>
+            <term id='term-Term1'>
               <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>

data/spec/metanorma/section_spec.rb

@@ -92,7 +92,7 @@ RSpec.describe Metanorma::ISO do
                   <link target="https://www.electropedia.org"/></p>
               </li>
             </ul>
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>
@@ -100,7 +100,7 @@ RSpec.describe Metanorma::ISO do
             <title>Terms, definitions, symbols and abbreviated terms</title>
             <terms id="_" obligation="normative">
               <title>Normal Terms</title>
-              <term id="term-term2">
+              <term id="term-Term2">
                 <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
@@ -287,7 +287,7 @@ RSpec.describe Metanorma::ISO do
                   <link target="https://www.electropedia.org"/></p>
               </li>
             </ul>
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>

data/spec/spec_helper.rb

@@ -62,7 +62,7 @@ def xmlpp(xml)
   f.compact = true
   f.write(REXML::Document.new(xml
     .gsub(%r{<fetched>20[0-9-]+</fetched>}, "<fetched/>")), s)
-  s
+  HTMLEntities.new.decode(s)
 end
 
 ASCIIDOC_BLANK_HDR = <<~"HDR".freeze