Merge pull request #303 from metanorma/fix/doctype-attribute

metanorma/metanorma-standoc#817
metanorma · Sep 11, 2023 · 2f8c0b5 · 2f8c0b5
2 parents 6fe6729 + 7b0a6d4
commit 2f8c0b5
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 63 deletions.
diff --git a/Gemfile.devel b/Gemfile.devel
@@ -0,0 +1,4 @@
+gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "fix/doctype-attribute"
+gem "metanorma-iso", git: "https://github.com/metanorma/metanorma-iso", branch: "fix/doctype-attribute"
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"
+
diff --git a/lib/isodoc/ieee/word_convert.rb b/lib/isodoc/ieee/word_convert.rb
@@ -13,8 +13,7 @@ def initialize(options)
       end
 
       def convert1(docxml, filename, dir)
-        doctype = docxml.at(ns("//bibdata/ext/doctype"))
-        if %w(amendment corrigendum).include?(doctype&.text)
+        if %w(amendment corrigendum).include?(@doctype)
           @header = html_doc_path("header_amd.html")
         end
         super

diff --git a/lib/metanorma/ieee/validate.rb b/lib/metanorma/ieee/validate.rb
@@ -28,12 +28,11 @@ def bibdata_validate(doc)
       end
 
       def doctype_validate(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(standard recommended-practice guide whitepaper redline other)
-          .include? doctype or
+          .include?(@doctype) or
           @log.add("Document Attributes", nil,
-                   "#{doctype} is not a recognised document type")
-        docsubtype = xmldoc&.at("//bibdata/ext/subdoctype")&.text or return
+                   "#{@doctype} is not a recognised document type")
+        docsubtype = xmldoc.at("//bibdata/ext/subdoctype")&.text or return
         %w(amendment corrigendum erratum document).include? docsubtype or
           @log.add("Document Attributes", nil,
                    "#{docsubtype} is not a recognised document subtype")

diff --git a/lib/metanorma/ieee/validate_section.rb b/lib/metanorma/ieee/validate_section.rb
@@ -2,8 +2,7 @@ module Metanorma
   module IEEE
     class Converter < Standoc::Converter
       def section_validate(doc)
-        doctype = doc&.at("//bibdata/ext/doctype")&.text
-        unless %w(amendment technical-corrigendum).include? doctype
+        unless %w(amendment technical-corrigendum).include? @doctype
           sections_presence_validate(doc.root)
           sections_sequence_validate(doc.root)
         end

diff --git a/lib/metanorma/ieee/validate_style.rb b/lib/metanorma/ieee/validate_style.rb
@@ -117,11 +117,10 @@ def title_validate(xml)
       def title_validate_type(xml)
         title = xml.at("//bibdata/title") or return
         draft = xml.at("//bibdata//draft")
-        type = xml.at("//bibdata/ext/doctype")
         trial = xml.at("//bibdata/ext/trial-use[text() = 'true']")
         target = draft ? "Draft " : ""
         target += trial ? "Trial-Use " : ""
-        target += type ? "#{strict_capitalize_phrase(type.text)} " : ""
+        target += @doctype ? "#{strict_capitalize_phrase(@doctype)} " : ""
         /^#{target}/.match?(title.text) or
           @log.add("Style", title,
                    "Expected title to start as: #{target}")

diff --git a/spec/isodoc/inline_spec.rb b/spec/isodoc/inline_spec.rb
@@ -368,7 +368,7 @@
                    </m:msup>
                  </m:math>
                  <latexmath>( x + y )^{2}</latexmath>
-                <asciimath>( x + y )^(2)</asciimath>
+                <asciimath>(x + y)^(2)</asciimath>
               </stem>
             </p>
           </foreword>

diff --git a/spec/metanorma/refs_spec.rb b/spec/metanorma/refs_spec.rb
@@ -223,13 +223,13 @@
                     <docidentifier type="IETF" primary="true">RFC7991</docidentifier>
                   </bibitem>
                 </relation>
-                        <series type="stream">
-          <title format="text/plain">IAB</title>
-        </series>
                 <series>
                   <title format="text/plain">RFC</title>
                   <number>7749</number>
                 </series>
+                        <series type="stream">
+          <title format="text/plain">IAB</title>
+        </series>
                 <keyword>XML</keyword>
                 <keyword>IETF</keyword>
                 <keyword>RFC</keyword>
@@ -299,7 +299,7 @@
                    <docidentifier type="ISO" primary="true">ISO 639-5:2008</docidentifier>
                  </bibitem>
                </relation>
-               <relation type="instance">
+               <relation type="instanceOf">
                  <bibitem type="standard">
                    <title type="title-main" format="text/plain" language="en" script="Latn">Code for individual languages and language groups</title>
                    <title type="main" format="text/plain" language="en" script="Latn">Code for individual languages and language groups</title>

diff --git a/spec/relaton/render_spec.rb b/spec/relaton/render_spec.rb
@@ -318,31 +318,34 @@
   end
 
   it "renders software" do
-    input = <<~INPUT
-      <bibitem type="software">
-        <title>metanorma-standoc</title>
-        <uri>https://github.com/metanorma/metanorma-standoc</uri>
-        <date type="published"><on>2019-09-04</on></date>
-        <contributor>
-          <role type="author"/>
-          <organization>
-            <name>Ribose Inc.</name>
-          </organization>
-        </contributor>
-        <contributor>
-          <role type="distributor"/>
-          <organization>
-            <name>GitHub</name>
-          </organization>
-        </contributor>
-        <edition>1.3.1</edition>
-      </bibitem>
-    INPUT
-    output = <<~OUTPUT
-      <formattedref>Ribose Inc., “metanorma-standoc.” 2019, <link target='https://github.com/metanorma/metanorma-standoc'>https://github.com/metanorma/metanorma-standoc</link>.</formattedref>
-    OUTPUT
-    expect(renderer.render(input))
-      .to be_equivalent_to output
+    VCR.use_cassette "standoc" do
+      input = <<~INPUT
+        <bibitem type="software">
+          <title>metanorma-standoc</title>
+          <uri>https://github.com/metanorma/metanorma-standoc</uri>
+          <date type="published"><on>2019-09-04</on></date>
+          <date type="accessed"><on>2023-09-06</on></date>
+          <contributor>
+            <role type="author"/>
+            <organization>
+              <name>Ribose Inc.</name>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type="distributor"/>
+            <organization>
+              <name>GitHub</name>
+            </organization>
+          </contributor>
+          <edition>1.3.1</edition>
+        </bibitem>
+      INPUT
+      output = <<~OUTPUT
+        <formattedref>Ribose Inc., “metanorma-standoc.” 2019, accessed September 6, 2023, <link target='https://github.com/metanorma/metanorma-standoc'>https://github.com/metanorma/metanorma-standoc</link>.</formattedref>
+      OUTPUT
+      expect(renderer.render(input))
+        .to be_equivalent_to output
+    end
   end
 
   it "renders home standard" do

diff --git a/spec/vcr_cassettes/multistandard1.yml b/spec/vcr_cassettes/multistandard1.yml
diff --git a/spec/vcr_cassettes/standoc.yml b/spec/vcr_cassettes/standoc.yml