metanorma-iso 2.1.0 → 2.1.3

data/spec/metanorma/validate_spec.rb

@@ -150,7 +150,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).to include "Scope clause missing"
     end
 
-    it "Scope clause not missing 1" do
+    it "Scope clause not missing if supplied" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -164,7 +164,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).not_to include "Scope clause missing"
     end
 
-    it "Scope clause not missing 2" do
+    it "Scope clause not missing in amendments" do
       FileUtils.rm_f "test.err"
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
@@ -196,7 +196,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).to include "Normative references missing"
     end
 
-    it "Normative references not missing 1" do
+    it "Normative references not missing if supplied" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -212,7 +212,7 @@ RSpec.describe Metanorma::ISO do
         .not_to include "Normative references missing"
     end
 
-    it "Normative references not missing 2" do
+    it "Normative references not missing in amendments" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -243,7 +243,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).to include "Terms & definitions missing"
     end
 
-    it "Terms & definitions not missing 1" do
+    it "Terms & definitions not missing if supplied" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -258,7 +258,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).not_to include "Terms & definitions missing"
     end
 
-    it "Terms & definitions not missing 2" do
+    it "Terms & definitions not missing in amendment" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -1699,6 +1699,7 @@ RSpec.describe Metanorma::ISO do
       :docfile: test.adoc
       :nodoc:
       :technical-committee-type: X
+      :technical-committee-number: X
       :no-isobib:
 
     INPUT
@@ -1712,19 +1713,7 @@ RSpec.describe Metanorma::ISO do
       :docfile: test.adoc
       :nodoc:
       :subcommittee-type: X
-      :no-isobib:
-
-    INPUT
-    expect(File.read("test.err")).to include "invalid subcommittee type"
-  end
-
-  it "Warning if invalid subcommittee type" do
-    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
-      = Document title
-      Author
-      :docfile: test.adoc
-      :nodoc:
-      :subcommittee-type: X
+      :subcommittee-number: X
       :no-isobib:
 
     INPUT

data/spec/spec_helper.rb

@@ -47,7 +47,7 @@ RSpec.configure do |config|
 end
 
 def strip_guid(xml)
-  xml.gsub(%r{ id="_[^"]+"}, ' id="_"')
+  xml.gsub(%r{ id=['"]_[^"']+['"]}, ' id="_"')
     .gsub(%r{ target="_[^"]+"}, ' target="_"')
     .gsub(%r{ src="cid:[^.]+.gif"}, ' src="_.gif"')
     .gsub(%r{ src='cid:[^.]+.gif'}, ' src="_.gif"')
@@ -60,6 +60,13 @@ def metadata(hash)
 end
 
 def xmlpp(xml)
+  c = HTMLEntities.new
+  xml &&= xml.split(/(&\S+?;)/).map do |n|
+    if /^&\S+?;$/.match?(n)
+      c.encode(c.decode(n), :hexadecimal)
+    else n
+    end
+  end.join
   s = ""
   f = REXML::Formatters::Pretty.new(2)
   f.compact = true
@@ -144,7 +151,8 @@ BOILERPLATE =
     File.read(ASCIIDOCTOR_ISO_DIR / "boilerplate.xml", encoding: "utf-8")
       .gsub(/\{\{ agency \}\}/, "ISO")
   .gsub(/\{\{ docyear \}\}/, Date.today.year.to_s)
-      .gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "")
+      .gsub(/\{% if unpublished %\}.*?\{% endif %\}/m, "")
+      .gsub(/\{% if stage_int >= 40 %\}(.*?)\{% endif %\}/m, "\\1")
       .gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’"),
   )
 
@@ -153,7 +161,8 @@ BOILERPLATE_FR =
     File.read(ASCIIDOCTOR_ISO_DIR / "boilerplate-fr.xml", encoding: "utf-8")
     .gsub(/\{\{ agency \}\}/, "ISO")
     .gsub(/\{\{ docyear \}\}/, Date.today.year.to_s)
-    .gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "")
+    .gsub(/\{% if unpublished %\}.*?\{% endif %\}/m, "")
+      .gsub(/\{% if stage_int >= 40 %\}(.*?)\{% endif %\}/m, "\\1")
     .gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’"),
   )
 
@@ -191,12 +200,13 @@ BLANK_HDR1 = <<~"HDR".freeze
         </owner>
       </copyright>
       <ext>
-        <doctype>article</doctype>
+        <doctype>standard</doctype>
         <editorialgroup>
-          <technical-committee/>
-          <subcommittee/>
-          <workgroup/>
+          <agency>ISO</agency>
         </editorialgroup>
+        <approvalgroup>
+          <agency>ISO</agency>
+        </approvalgroup>
         <stagename>International standard</stagename>
       </ext>
     </bibdata>