metanorma-iso 1.5.10 → 1.5.11

data/spec/isodoc/metadata_spec.rb

@@ -81,6 +81,9 @@ INPUT
 {:accesseddate=>"2012",
 :activateddate=>"2013",
 :agency=>"ISO",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
 :createddate=>"2010–2011",
 :docnumber=>"ISO/PreCD3 17301-1",
 :docnumber_lang=>"ISO/PreCD3 17301-1 (E)",
@@ -97,18 +100,24 @@ INPUT
 :doctitlepart=>"Rice",
 :doctitlepartlabel=>"Part 1",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
 :docyear=>"2016",
 :draft=>"0.4",
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
+:implementeddate=>"XXX",
+:issueddate=>"XXX",
 :keywords=>["kw2", "kw1"],
+:lang=>"en",
 :obsoleteddate=>"2014",
 :publisheddate=>"2011",
 :publisher=>"International Organization for Standardization",
+:receiveddate=>"XXX",
 :revdate=>"2016-05-01",
 :revdate_monthyear=>"May 2016",
 :sc=>"SC 4",
+:script=>"Latn",
 :secretariat=>"GB",
 :stage=>"30",
 :stage_int=>30,
@@ -116,12 +125,17 @@ INPUT
 :statusabbr=>"PreCD3",
 :tc=>"TC 34",
 :tc_docnumber=>["17301", "17302"],
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
 :unpublished=>true,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
 :wg=>"WG 3"}
 OUTPUT
   end
 
-  it "processes IsoXML metadata" do
+  it "processes IsoXML metadata #2" do
     c = IsoDoc::Iso::HtmlConvert.new({})
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -198,7 +212,12 @@ OUTPUT
 </bibdata>
 </iso-standard>
 INPUT
-{:agency=>"ISO/IEC",
+{:accesseddate=>"XXX",
+:agency=>"ISO/IEC",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
+:createddate=>"XXX",
 :docnumber=>"ISO/IEC/CD 17301-1-3",
 :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
 :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
@@ -213,20 +232,166 @@ INPUT
 :doctitlepart=>"Rice",
 :doctitlepartlabel=>"Part&nbsp;1&ndash;3",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
 :docyear=>"2016",
 :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
 :ics=>"1.2.3, 1.2.3",
+:implementeddate=>"XXX",
+:issueddate=>"XXX",
+:lang=>"en",
+:obsoleteddate=>"XXX",
 :obsoletes=>"IEC 8121",
 :obsoletes_part=>"3.1",
+:publisheddate=>"XXX",
 :publisher=>"International Organization for Standardization and International Electrotechnical Commission",
+:receiveddate=>"XXX",
+:sc=>"DEF 4",
+:script=>"Latn",
+:secretariat=>"XXX",
+:stage=>"60",
+:stage_int=>60,
+:statusabbr=>"IS",
+:tc=>"ABC 34",
+:tc_docnumber=>["17301"],
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
+:unpublished=>false,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
+:wg=>"GHI 3"}
+OUTPUT
+  end
+
+  it "processes IsoXML metadata in French" do
+    c = IsoDoc::Iso::HtmlConvert.new({})
+    arr = c.convert_init(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>fr</language>
+    </bibdata>
+    </iso-standard>
+    INPUT
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata type="standard">
+  <title>
+    <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
+    <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+    <title type="title-part" language="en" format="text/plain">Rice</title>
+  </title>
+  <title>
+    <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
+    <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
+    <title type="title-part" language="fr" format="text/plain">Riz</title>
+  </title>
+  <docidentifier type="ISO">ISO/IEC/CD 17301-1-3</docidentifier>
+  <docidentifier type="iso-with-lang">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
+  <docidentifier type="iso-reference">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
+  <docidentifier type="iso-tc">17301</docidentifier>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+     </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+    </organization>
+  </contributor>
+  <language>fr</language>
+  <script>Latn</script>
+  <status>
+    <stage abbreviation="IS">60</stage>
+    <substage>92</substage>
+  </status>
+  <copyright>
+    <from>2016</from>
+    <owner>
+      <organization>
+        <name>International Organization for Standardization</name>
+      </organization>
+    </owner>
+  </copyright>
+  <relation type="obsoletes">
+    <locality type="clause"><referenceFrom>3.1</referenceFrom></locality>
+    <docidentifier>IEC 8121</docidentifier>
+  </relation>
+  <ext>
+  <doctype language="">international-standard</doctype>
+  <doctype language="fr">Standard International</doctype>
+  <editorialgroup>
+    <technical-committee number="34" type="ABC">Food products</technical-committee>
+    <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
+    <workgroup number="3" type="GHI">Rice Group</workgroup>
+  </editorialgroup>
+  <ics><code>1.2.3</code></ics>
+  <ics><code>1.2.3</code></ics>
+    <structuredidentifier>
+    <project-number part="1" subpart="3">ISO/IEC/CD 17301</project-number>
+  </strucuredidentifier>
+  <stagename>International standard</stagename>
+  </ext>
+</bibdata>
+</iso-standard>
+INPUT
+{:accesseddate=>"XXX",
+:agency=>"ISO/IEC",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
+:createddate=>"XXX",
+:docnumber=>"ISO/IEC/CD 17301-1-3",
+:docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
+:docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
+:docsubtitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice",
+:docsubtitleintro=>"Cereals and pulses",
+:docsubtitlemain=>"Specifications and test methods",
+:docsubtitlepart=>"Rice",
+:docsubtitlepartlabel=>"Part&nbsp;1&ndash;3",
+:doctitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz",
+:doctitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
+:doctitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai",
+:doctitlepart=>"Riz",
+:doctitlepartlabel=>"Partie&nbsp;1&ndash;3",
+:doctype=>"International Standard",
+:doctype_display=>"Standard International",
+:docyear=>"2016",
+:editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
+:ics=>"1.2.3, 1.2.3",
+:implementeddate=>"XXX",
+:issueddate=>"XXX",
+:lang=>"fr",
+:obsoleteddate=>"XXX",
+:obsoletes=>"IEC 8121",
+:obsoletes_part=>"3.1",
+:publisheddate=>"XXX",
+:publisher=>"International Organization for Standardization et International Electrotechnical Commission",
+:receiveddate=>"XXX",
 :sc=>"DEF 4",
-:secretariat=>"XXXX",
+:script=>"Latn",
+:secretariat=>"XXX",
 :stage=>"60",
 :stage_int=>60,
 :statusabbr=>"IS",
 :tc=>"ABC 34",
 :tc_docnumber=>["17301"],
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
 :unpublished=>false,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
 :wg=>"GHI 3"}
 OUTPUT
   end

data/spec/isodoc/postproc_spec.rb

@@ -613,11 +613,8 @@ documentation.</p>
     presxml = <<~OUTPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
                <bibdata type="standard">
-               <status><stage>30</stage></status>
+               <status><stage language="">30</stage></status>
                </bibdata>
-               <local_bibdata type="standard">
-               <status><stage>30</stage></status>
-               </local_bibdata>
            <boilerplate>
          <copyright-statement>
            <clause inline-header="true">
@@ -664,7 +661,7 @@ documentation.</p>
 
      FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-expect((IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", presxml, false)
     word = File.read("test.html", encoding: "UTF-8")
     expect((word)).to include '<h1 class="IntroTitle">Warning for Stuff</h1>'

data/spec/isodoc/ref_spec.rb

@@ -123,11 +123,8 @@ RSpec.describe IsoDoc do
     presxml = <<~OUTPUT
        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>en</language>
+           <language current="true">en</language>
          </bibdata>
-         <local_bibdata>
-    <language>en</language>
-    </local_bibdata>
          <preface>
            <foreword>
              <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
@@ -342,7 +339,7 @@ html = <<~OUTPUT
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 

data/spec/spec_helper.rb

@@ -118,8 +118,15 @@ BOILERPLATE =
   gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
 )
 
+BOILERPLATE_FR =
+  HTMLEntities.new.decode(
+  File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iso", "boilerplate-fr.xml"), encoding: "utf-8").
+  gsub(/\{\{ agency \}\}/, "ISO").gsub(/\{\{ docyear \}\}/, Date.today.year.to_s).
+  gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "").
+  gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
+)
 
-BLANK_HDR = <<~"HDR"
+BLANK_HDR1 = <<~"HDR"
 <?xml version="1.0" encoding="UTF-8"?>
 <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
@@ -162,9 +169,18 @@ BLANK_HDR = <<~"HDR"
   <stagename>International standard</stagename>
   </ext>
 </bibdata>
+HDR
+
+BLANK_HDR = <<~"HDR"
+#{BLANK_HDR1}
 #{BOILERPLATE}
 HDR
 
+BLANK_HDR_FR = <<~"HDR"
+#{BLANK_HDR1.sub(%r{<language>en</language>}, "<language>fr</language>")}
+#{BOILERPLATE_FR}
+HDR
+
 TERM_BOILERPLATE = <<~END
   <p id="_">For the purposes of this document,
     the following terms and definitions apply.</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -284,6 +284,7 @@ files:
 - lib/asciidoctor/iso/base.rb
 - lib/asciidoctor/iso/basicdoc.rng
 - lib/asciidoctor/iso/biblio.rng
+- lib/asciidoctor/iso/boilerplate-fr.xml
 - lib/asciidoctor/iso/boilerplate.xml
 - lib/asciidoctor/iso/cleanup.rb
 - lib/asciidoctor/iso/converter.rb