rspec

metanorma · Jan 6, 2025 · 635a5fc · 635a5fc
1 parent 6bbc6ba
commit 635a5fc
Show file tree

Hide file tree

Showing 26 changed files with 1,370 additions and 953 deletions.
diff --git a/lib/metanorma/standoc/biblio.rng b/lib/metanorma/standoc/biblio.rng
@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>

diff --git a/metanorma-standoc.gemspec b/metanorma-standoc.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
-  spec.add_dependency "iev", "~> 0.3.0"
+  spec.add_dependency "iev", "~> 0.3.5"
   spec.add_dependency "isodoc", "~> 2.12.4"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"

diff --git a/spec/metanorma/cleanup_blocks_spec.rb b/spec/metanorma/cleanup_blocks_spec.rb
@@ -1341,9 +1341,9 @@
     INPUT
     output = <<~OUTPUT
       <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
-             <bibdata type="standard">
+       <bibdata type="standard">
        <title language="en" format="text/plain">Document title</title>
-       <language>en</language><script>Latn</script><status><stage>published</stage></status><copyright><from>2024</from></copyright><ext><doctype>standard</doctype><flavor>standoc</flavor></ext></bibdata><metanorma-extension><presentation-metadata><name>TOC Heading Levels</name><value>2</value></presentation-metadata><presentation-metadata><name>HTML TOC Heading Levels</name><value>2</value></presentation-metadata><presentation-metadata><name>DOC TOC Heading Levels</name><value>2</value></presentation-metadata><presentation-metadata><name>PDF TOC Heading Levels</name><value>2</value></presentation-metadata></metanorma-extension>
+       <language>en</language><script>Latn</script><status><stage>published</stage></status><copyright><from>2025</from></copyright><ext><doctype>standard</doctype><flavor>standoc</flavor></ext></bibdata><metanorma-extension><presentation-metadata><name>TOC Heading Levels</name><value>2</value></presentation-metadata><presentation-metadata><name>HTML TOC Heading Levels</name><value>2</value></presentation-metadata><presentation-metadata><name>DOC TOC Heading Levels</name><value>2</value></presentation-metadata><presentation-metadata><name>PDF TOC Heading Levels</name><value>2</value></presentation-metadata></metanorma-extension>
        <sections><clause id="_scope" type="scope" inline-header="false" obligation="normative">
        <title>Scope</title>
        <example id="_">

diff --git a/spec/metanorma/cleanup_spec.rb b/spec/metanorma/cleanup_spec.rb
@@ -1546,7 +1546,7 @@
            <stage>published</stage>
          </status>
          <copyright>
-           <from>2024</from>
+           <from>#{Date.today.year}</from>
          </copyright>
          <relation type="updatedBy">
            <bibitem>

diff --git a/spec/metanorma/refs_fetch_spec.rb b/spec/metanorma/refs_fetch_spec.rb
@@ -1027,6 +1027,7 @@
                 <fetched/>
                 <title format="text/plain" language="en" script="Latn">Signes abréviatifs pour les poids et mesures métriques</title>
                 <uri type="citation" language="en" script="Latn">https://www.bipm.org/en/committees/ci/cipm/4-1879/resolution-</uri>
+                <uri type="citation" language="fr" script="Latn">https://www.bipm.org/fr/committees/ci/cipm/4-1879/resolution-</uri>
                 <uri type="src" language="en" script="Latn">https://raw.githubusercontent.com/metanorma/bipm-data-outcomes/main/cipm/meetings-en/meeting-4.yml</uri>
                 <uri type="src" language="fr" script="Latn">https://raw.githubusercontent.com/metanorma/bipm-data-outcomes/main/cipm/meetings-fr/meeting-4.yml</uri>
                 <uri type="pdf">https://www.bipm.org/documents/20126/17315032/CIPM4.pdf/47e647d4-26c2-d3d6-b367-e749fb22b261</uri>

diff --git a/spec/vcr_cassettes/bipm.yml b/spec/vcr_cassettes/bipm.yml
diff --git a/spec/vcr_cassettes/bsi16341.yml b/spec/vcr_cassettes/bsi16341.yml
diff --git a/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml b/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml
diff --git a/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml b/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml
diff --git a/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec2.yml b/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec2.yml