metanorma-iec 1.2.11 → 1.2.16

data/spec/asciidoctor-iec/lists_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
+   before(:all) do
+  @blank_hdr = blank_hdr_gen
+end
+
   it "processes simple lists" do
     output = Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
       #{ASCIIDOC_BLANK_HDR}
@@ -17,7 +21,7 @@ RSpec.describe Asciidoctor::Iec do
 
     INPUT
     expect(xmlpp(strip_guid(output))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections>
          <ul id="_">
          <li>
@@ -99,7 +103,7 @@ RSpec.describe Asciidoctor::Iec do
 
     INPUT
     expect(xmlpp(strip_guid(output))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections><ul id="id">
          <li>
            <p id="_">First</p>
@@ -172,7 +176,7 @@ RSpec.describe Asciidoctor::Iec do
       * Hello [[id3]] List item
 
      INPUT
-             #{BLANK_HDR}
+             #{@blank_hdr}
              <sections>
               <ul id="id1">
          <li id="id2">

data/spec/asciidoctor-iec/section_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
+   before(:all) do
+  @blank_hdr = blank_hdr_gen
+end
+
   it "processes sections" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -52,7 +56,7 @@ RSpec.describe Asciidoctor::Iec do
 
       === Bibliography Subsection
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <preface><foreword id="_" obligation="informative">
          <title>FOREWORD</title>
          <p id="_">Text</p>
@@ -189,7 +193,7 @@ RSpec.describe Asciidoctor::Iec do
 
       === Bibliography Subsection
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <preface>     
        <foreword id="_" obligation="informative">
          <title>FOREWORD</title>
@@ -298,7 +302,7 @@ RSpec.describe Asciidoctor::Iec do
       [appendix,obligation=informative]
       == Annex
      INPUT
-             #{BLANK_HDR}
+             #{@blank_hdr}
        <sections><clause id="_" inline-header="false" obligation="informative">
          <title>Clause 1</title>
          <clause id="_" inline-header="false" obligation="informative">
@@ -329,7 +333,7 @@ RSpec.describe Asciidoctor::Iec do
       [%inline-header]
       === Clause Aa
      INPUT
-             #{BLANK_HDR}
+             #{@blank_hdr}
        <sections><clause id="_" inline-header="false" obligation="normative">
          <title>Clause 1</title>
          <clause id="_" inline-header="true" obligation="normative">
@@ -354,7 +358,7 @@ RSpec.describe Asciidoctor::Iec do
       === {blank}
 
      INPUT
-             #{BLANK_HDR}
+             #{@blank_hdr}
        <sections>
          <clause id="_" inline-header="false" obligation="normative">
          <title>Clause 1</title>

data/spec/asciidoctor-iec/validate_spec.rb

@@ -15,41 +15,42 @@ RSpec.describe Asciidoctor::Iec do
 
     it "generates error file" do
       expect do
+        mock_pdf
         Metanorma::Compile
           .new
-          .compile("spec/assets/xref_error.adoc", type: "iec")
+          .compile("spec/assets/xref_error.adoc", type: "iec", no_install_fonts: true)
       end.to(change { File.exist?("spec/assets/xref_error.err") }
               .from(false).to(true))
     end
   end
 
-it "Warns of illegal doctype" do
+  it "Warns of illegal doctype" do
     FileUtils.rm_f "test.err"
     Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :doctype: pizza
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :no-isobib:
+      :doctype: pizza
 
-  text
-  INPUT
+      text
+    INPUT
     expect(File.read("test.err")).to include "pizza is not a recognised document type"
-end
+  end
 
-it "Warns of illegal function" do
+  it "Warns of illegal function" do
     FileUtils.rm_f "test.err"
     Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :function: pizza
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :no-isobib:
+      :function: pizza
 
-  text
-  INPUT
+      text
+    INPUT
     expect(File.read("test.err")).to include "pizza is not a recognised document function"
-end
+  end
 end

data/spec/isodoc/iso_spec.rb

@@ -32,8 +32,8 @@ RSpec.describe IsoDoc::Iec do
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: user nominated fonts" do

data/spec/metanorma/processor_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Metanorma::Iec::Processor do
     expect(xmlpp(strip_guid(processor.input_to_isodoc(<<~"INPUT", nil)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
     INPUT
-    #{BLANK_HDR}
+    #{blank_hdr_gen}
 <sections/>
 </iec-standard>
     OUTPUT

data/spec/spec_helper.rb

@@ -112,38 +112,17 @@ TERMS_BOILERPLATE = <<~"BOILERPLATE"
 </ul>
 BOILERPLATE
 
-BOILERPLATE =
-  HTMLEntities.new.decode(
-  File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iec", "iec_intro_en.xml"), encoding: "utf-8").
-  gsub(/\{\{ agency \}\}/, "IEC").gsub(/\{\{ docyear \}\}/, Date.today.year.to_s).
-  gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "").
-  gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’").
-  gsub(/<p>/, "<p id='_'>").
-  gsub(/<ol>/, "<ol id='_'>").
-  gsub(/ - /, " — ").
-  gsub(/\.\.\./, "…")
-)
-
-BOILERPLATE_LICENSE = <<~END
-<license-statement>
-  <clause>
-    <title>Warning for CDs, CDVs and FDISs</title>
-    <p id='_'>
-      This document is not an IEC International Standard. It is distributed
-      for review and comment. It is subject to change without notice and may
-      not be referred to as an International Standard.
-    </p>
-    <p id='_'>
-      Recipients of this draft are invited to submit, with their comments,
-      notification of any relevant patent rights of which they are aware and
-      to provide supporting documentation.
-    </p>
-  </clause>
-</license-statement>
-END
-
-UNPUBLISHED_BOILERPLATE = BOILERPLATE.sub(/<\/boilerplate>/, "#{BOILERPLATE_LICENSE}</boilerplate>")
-
+def boilerplate(xmldoc)
+  file = File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iec", "iec_intro_en.xml"), encoding: "utf-8")
+  conv = Asciidoctor::Iec::Converter.new(nil, backend: :iec, header_footer: true)
+  conv.init(Asciidoctor::Document.new [])
+  ret = Nokogiri::XML(
+    conv.boilerplate_isodoc(xmldoc).populate_template(file, nil).
+    gsub(/<p>/, "<p id='_'>").
+    gsub(/<ol>/, "<ol id='_'>"))
+  conv.smartquotes_cleanup(ret)
+  HTMLEntities.new.decode(ret.to_xml)
+end
 
 BLANK_HDR = <<~"HDR"
 <?xml version="1.0" encoding="UTF-8"?>
@@ -189,9 +168,16 @@ BLANK_HDR = <<~"HDR"
   <stagename>International standard</stagename>
   </ext>
 </bibdata>
-#{BOILERPLATE}
 HDR
 
+def blank_hdr_gen
+<<~"HDR"
+#{BLANK_HDR}
+#{boilerplate(Nokogiri::XML(BLANK_HDR + "</iec-standard>"))}
+HDR
+end
+
+
 IEC_TITLE = <<~END
  <p class="zzSTDTitle1">INTERNATIONAL ELECTROTECHNICAL COMMISSION</p>
              <p class="zzSTDTitle1">____________</p>
@@ -275,6 +261,12 @@ def stub_fetch_ref(**opts)
   end.at_least :once
 end
 
+def mock_pdf
+  allow(::Mn2pdf).to receive(:convert) do |url, output, c, d|
+    FileUtils.cp(url.gsub(/"/, ""), output.gsub(/"/, ""))
+  end
+end
+
 private
 
 def get_xml(search, code, opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 description: |
-  metanorma-iso lets you write IEC standards in AsciiDoc syntax.
+  metanorma-iec lets you write IEC standards in AsciiDoc syntax.
 
   This gem is in active development.
 email:
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: metanorma-iec lets you write IEC standards in AsciiDoc.