metanorma-iso 2.0.4 → 2.0.6.1

data/spec/metanorma/refs_spec.rb

@@ -138,9 +138,6 @@ RSpec.describe Metanorma::ISO do
                     </organization>
                   </contributor>
                   <edition>1</edition>
-                  <note type="Unpublished-Status">
-                    <p id="_">Under preparation. (Stage at the time of publication ISO/FDIS 17664-1).</p>
-                  </note>
                   <language>en</language>
                   <language>fr</language>
                   <script>Latn</script>
@@ -290,70 +287,285 @@ RSpec.describe Metanorma::ISO do
   end
 
   it "sort ISO references in Bibliography" do
-    VCR.use_cassette "sortrefs" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [bibliography]
+      == Bibliography
+
+      * [[[iso1,ISO 8000-110]]]
+      * [[[iso2,ISO 8000-61]]]
+      * [[[iso3,ISO 8000-8]]]
+      * [[[iso4,ISO 9]]]
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+              <sections> </sections>
+        <bibliography>
+          <references id='_' normative='false' obligation='informative'>
+            <title>Bibliography</title>
+            <bibitem id='iso4' type='standard'>
+              <docidentifier>ISO 9</docidentifier>
+              <docnumber>9</docnumber>
+              <contributor>
+                <role type='publisher'/>
+                <organization>
+                  <name>International Organization for Standardization</name>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </contributor>
+            </bibitem>
+            <bibitem id='iso3' type='standard'>
+              <docidentifier>ISO 8000-8</docidentifier>
+              <docnumber>8000-8</docnumber>
+              <contributor>
+                <role type='publisher'/>
+                <organization>
+                  <name>International Organization for Standardization</name>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </contributor>
+            </bibitem>
+            <bibitem id='iso2' type='standard'>
+              <docidentifier>ISO 8000-61</docidentifier>
+              <docnumber>8000-61</docnumber>
+              <contributor>
+                <role type='publisher'/>
+                <organization>
+                  <name>International Organization for Standardization</name>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </contributor>
+            </bibitem>
+            <bibitem id='iso1' type='standard'>
+              <docidentifier>ISO 8000-110</docidentifier>
+              <docnumber>8000-110</docnumber>
+              <contributor>
+                <role type='publisher'/>
+                <organization>
+                  <name>International Organization for Standardization</name>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </contributor>
+            </bibitem>
+          </references>
+        </bibliography>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "renders withdrawn and cancelled ISO references" do
+    VCR.use_cassette "withdrawn_iso", match_requests_on: %i[method uri body] do
       input = <<~INPUT
-        #{ASCIIDOC_BLANK_HDR}
+        #{ISOBIB_BLANK_HDR}
+
+        <<iso1,clause=1>>
+        <<iso2,clause=1>>
+
         [bibliography]
         == Bibliography
 
-        * [[[iso1,ISO 8000-110]]]
-        * [[[iso2,ISO 8000-61]]]
-        * [[[iso3,ISO 8000-8]]]
-        * [[[iso4,ISO 9]]]
+        * [[[iso1,ISO 683-3:2019]]]
+        * [[[iso2,ISO 31-0]]]
       INPUT
       output = <<~OUTPUT
-              #{BLANK_HDR}
-                <sections> </sections>
-          <bibliography>
-            <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
-              <bibitem id='iso4' type='standard'>
-                <docidentifier>ISO 9</docidentifier>
-                <docnumber>9</docnumber>
-                <contributor>
-                  <role type='publisher'/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id='iso3' type='standard'>
-                <docidentifier>ISO 8000-8</docidentifier>
-                <docnumber>8000-8</docnumber>
-                <contributor>
-                  <role type='publisher'/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id='iso2' type='standard'>
-                <docidentifier>ISO 8000-61</docidentifier>
-                <docnumber>8000-61</docnumber>
-                <contributor>
-                  <role type='publisher'/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id='iso1' type='standard'>
-                <docidentifier>ISO 8000-110</docidentifier>
-                <docnumber>8000-110</docnumber>
-                <contributor>
-                  <role type='publisher'/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-            </references>
-          </bibliography>
-        </iso-standard>
+        #{BLANK_HDR}
+                 <preface>
+           <foreword id='_' obligation='informative'>
+             <title>Foreword</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='iso1' citeas='ISO 683-3:2019'>
+                 <localityStack>
+                   <locality type='clause'>
+                     <referenceFrom>1</referenceFrom>
+                   </locality>
+                 </localityStack>
+               </eref>
+               <fn reference='1'>
+                 <p id='_'>Cancelled and replaced by ISO 683-3:2022.</p>
+               </fn>
+               <eref type='inline' bibitemid='iso2' citeas='ISO 31-0'>
+                 <localityStack>
+                   <locality type='clause'>
+                     <referenceFrom>1</referenceFrom>
+                   </locality>
+                 </localityStack>
+               </eref>
+               <fn reference='2'>
+                 <p id='_'>Withdrawn.</p>
+               </fn>
+             </p>
+           </foreword>
+         </preface>
+         <sections> </sections>
+                  <bibliography>
+           <references id='_' normative='false' obligation='informative'>
+             <title>Bibliography</title>
+             <bibitem id='iso2' type='standard'>
+               <fetched/>
+               <title type='title-intro' format='text/plain' language='en' script='Latn'>Title missing</title>
+               <title type='title-main' format='text/plain' language='en' script='Latn'>Legacy paper document</title>
+               <title type='main' format='text/plain' language='en' script='Latn'>Title missing — Legacy paper document</title>
+               <uri type='src'>https://www.iso.org/standard/2405.html</uri>
+               <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
+               <docidentifier type='ISO' primary='true'>ISO 31-0</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1:en</docidentifier>
+               <docnumber>31</docnumber>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                   <uri>www.iso.org</uri>
+                 </organization>
+               </contributor>
+               <edition>1</edition>
+               <note type='Unpublished-Status'>
+                 <p id='_'>Withdrawn.</p>
+               </note>
+               <language>en</language>
+               <script>Latn</script>
+               <status>
+                 <stage>95</stage>
+                 <substage>99</substage>
+               </status>
+               <copyright>
+                 <from>1974</from>
+                 <owner>
+                   <organization>
+                     <name>ISO</name>
+                   </organization>
+                 </owner>
+               </copyright>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <fetched/>
+                   <title type='title-intro' format='text/plain' language='en' script='Latn'>Title missing</title>
+                   <title type='title-main' format='text/plain' language='en' script='Latn'>Legacy paper document</title>
+                   <title type='main' format='text/plain' language='en' script='Latn'>Title missing — Legacy paper document</title>
+                   <uri type='src'>https://www.iso.org/standard/2405.html</uri>
+                   <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
+                   <docidentifier type='ISO' primary='true'>ISO 31-0:1974</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1:en</docidentifier>
+                   <docnumber>31</docnumber>
+                   <date type='published'>
+                     <on>1974-01</on>
+                   </date>
+                   <contributor>
+                     <role type='publisher'/>
+                     <organization>
+                       <name>International Organization for Standardization</name>
+                       <abbreviation>ISO</abbreviation>
+                       <uri>www.iso.org</uri>
+                     </organization>
+                   </contributor>
+                   <edition>1</edition>
+                   <note type='Unpublished-Status'>
+                     <p id='_'>Withdrawn.</p>
+                   </note>
+                   <language>en</language>
+                   <script>Latn</script>
+                   <status>
+                     <stage>95</stage>
+                     <substage>99</substage>
+                   </status>
+                   <copyright>
+                     <from>1974</from>
+                     <owner>
+                       <organization>
+                         <name>ISO</name>
+                       </organization>
+                     </owner>
+                   </copyright>
+                   <place>Geneva</place>
+                 </bibitem>
+               </relation>
+               <place>Geneva</place>
+             </bibitem>
+             <bibitem id='iso1' type='standard'>
+               <fetched/>
+               <title type='title-main' format='text/plain' language='en' script='Latn'>Heat-treatable steels, alloy steels and free-cutting steels</title>
+               <title type='title-part' format='text/plain' language='en' script='Latn'>Part 3: Case-hardening steels</title>
+               <title type='main' format='text/plain' language='en' script='Latn'>
+                 Heat-treatable steels, alloy steels and free-cutting steels — Part 3:
+                 Case-hardening steels
+               </title>
+               <uri type='src'>https://www.iso.org/standard/76389.html</uri>
+               <uri type='rss'>https://www.iso.org/contents/data/standard/07/63/76389.detail.rss</uri>
+               <docidentifier type='ISO' primary='true'>ISO 683-3:2019</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso:683:-3:stage-95.99:ed-3:en</docidentifier>
+               <docnumber>683</docnumber>
+               <date type='published'>
+                 <on>2019-01</on>
+               </date>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                   <uri>www.iso.org</uri>
+                 </organization>
+               </contributor>
+               <edition>3</edition>
+               <note type='Unpublished-Status'>
+                 <p id='_'>Cancelled and replaced by ISO 683-3:2022.</p>
+               </note>
+               <language>en</language>
+               <script>Latn</script>
+               <abstract format='text/plain' language='en' script='Latn'>
+                 This document specifies the technical delivery requirements for —
+                 semi-finished products, hot formed, e.g. blooms, billets, slabs (see
+                 NOTE 1), — bars (see NOTE 1), — wire rod, — finished flat products,
+                 and — hammer or drop forgings (see NOTE 1) manufactured from the
+                 case-hardening non-alloy or alloy steels listed in Table 3 and
+                 supplied in one of the heat-treatment conditions given for the
+                 different types of products in Table 1 and in one of the surface
+                 conditions given in Table 2. The steels are, in general, intended for
+                 the manufacture of case-hardened machine parts. NOTE 1 Hammer-forged
+                 semi-finished products (blooms, billets, slabs, etc.), seamless rolled
+                 rings and hammer-forged bars are covered under semi-finished products
+                 or bars and not under the term “hammer and drop forgings”. NOTE 2 For
+                 International Standards relating to steels complying with the
+                 requirements for the chemical composition in Table 3, however,
+                 supplied in other product forms or treatment conditions than given
+                 above or intended for special applications, and for other related
+                 International Standards, see the Bibliography. In special cases,
+                 variations in these technical delivery requirements or additions to
+                 them can form the subject of an agreement at the time of enquiry and
+                 order (see 5.2 and Annex A). In addition to this document, the general
+                 technical delivery requirements of ISO 404 are applicable.
+               </abstract>
+               <status>
+                 <stage>95</stage>
+                 <substage>99</substage>
+               </status>
+               <copyright>
+                 <from>2019</from>
+                 <owner>
+                   <organization>
+                     <name>ISO</name>
+                   </organization>
+                 </owner>
+               </copyright>
+               <relation type='obsoletes'>
+                 <bibitem type='standard'>
+                   <formattedref format='text/plain'>ISO 683-3:2016</formattedref>
+                 </bibitem>
+               </relation>
+               <relation type='updates'>
+                 <bibitem type='standard'>
+                   <formattedref format='text/plain'>ISO 683-3:2022</formattedref>
+                   <date type='circulated'>
+                     <on>2022-01-21</on>
+                   </date>
+                 </bibitem>
+               </relation>
+               <place>Geneva</place>
+             </bibitem>
+           </references>
+         </bibliography>
+       </iso-standard>
       OUTPUT
       expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
         .to be_equivalent_to xmlpp(output)

data/spec/metanorma/section_spec.rb

@@ -85,13 +85,11 @@ RSpec.describe Metanorma::ISO do
             <ul id="_">
               <li>
                 <p id="_">ISO Online browsing platform: available at
-
-                  <link target="http://www.iso.org/obp"/></p>
+                  <link target="https://www.iso.org/obp"/></p>
               </li>
               <li>
                 <p id="_">IEC Electropedia: available at
-
-                  <link target="http://www.electropedia.org"/></p>
+                  <link target="https://www.electropedia.org"/></p>
               </li>
             </ul>
             <term id="term-term1">
@@ -282,13 +280,11 @@ RSpec.describe Metanorma::ISO do
             <ul id="_">
               <li>
                 <p id="_">ISO Online browsing platform: available at
-
-                  <link target="http://www.iso.org/obp"/></p>
+                  <link target="https://www.iso.org/obp"/></p>
               </li>
               <li>
                 <p id="_">IEC Electropedia: available at
-
-                  <link target="http://www.electropedia.org"/></p>
+                  <link target="https://www.electropedia.org"/></p>
               </li>
             </ul>
             <term id="term-term1">
@@ -332,13 +328,13 @@ RSpec.describe Metanorma::ISO do
               <li>
                 <p id='_'>
                   ISO Online browsing platform: available at
-                  <link target='http://www.iso.org/obp'/>
+                  <link target='https://www.iso.org/obp'/>
                 </p>
               </li>
               <li>
                 <p id='_'>
                   IEC Electropedia: available at
-                  <link target='http://www.electropedia.org'/>
+                  <link target='https://www.electropedia.org'/>
                 </p>
               </li>
             </ul>
@@ -381,13 +377,11 @@ RSpec.describe Metanorma::ISO do
             <ul id="_">
               <li>
                 <p id="_">ISO Online browsing platform: available at
-
-                  <link target="http://www.iso.org/obp"/></p>
+                  <link target="https://www.iso.org/obp"/></p>
               </li>
               <li>
                 <p id="_">IEC Electropedia: available at
-
-                  <link target="http://www.electropedia.org"/></p>
+                  <link target="https://www.electropedia.org"/></p>
               </li>
             </ul>
           </terms>
@@ -424,13 +418,13 @@ RSpec.describe Metanorma::ISO do
                <li>
                  <p id='_'>
                    ISO Online browsing platform: available at
-                   <link target='http://www.iso.org/obp'/>
+                   <link target='https://www.iso.org/obp'/>
                  </p>
                </li>
                <li>
                  <p id='_'>
                    IEC Electropedia: available at
-                   <link target='http://www.electropedia.org'/>
+                   <link target='https://www.electropedia.org'/>
                  </p>
                </li>
              </ul>
@@ -461,26 +455,24 @@ RSpec.describe Metanorma::ISO do
 
     INPUT
     output = <<~OUTPUT
-      #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, "<doctype>article</doctype><subdoctype>vocabulary</subdoctype>")}
+      #{BLANK_HDR.sub(%r{<doctype>article</doctype>},
+                      '<doctype>article</doctype><subdoctype>vocabulary</subdoctype>')}
                <sections>
            <terms id='_' obligation='normative'>
-             <title>Terms and definitions</title>
+             <title>Terms and Definitions</title>
              <p id='_'>No terms and definitions are listed in this document.</p>
-             <p id='_'>
-               ISO and IEC maintain terminological databases for use in standardization
+             <p id='_'>ISO and IEC maintain terminological databases for use in standardization
                at the following addresses:
              </p>
              <ul id='_'>
                <li>
-                 <p id='_'>
-                   ISO Online browsing platform: available at
-                   <link target='http://www.iso.org/obp'/>
+                 <p id='_'>ISO Online browsing platform: available at
+                   <link target='https://www.iso.org/obp'/>
                  </p>
                </li>
                <li>
-                 <p id='_'>
-                   IEC Electropedia: available at
-                   <link target='http://www.electropedia.org'/>
+                 <p id='_'>IEC Electropedia: available at
+                   <link target='https://www.electropedia.org'/>
                  </p>
                </li>
              </ul>