metanorma-iso 1.5.9 → 1.5.10

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.9".freeze
+    VERSION = "1.5.10".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -189,6 +189,12 @@ RSpec.describe Asciidoctor::ISO do
       :copyright-holder: ISO,IETF
       :copyright-year: 2001
       :doctype: technical-report
+      :pub-address: 1 Infinity Loop + \
+      California
+      :pub-phone: 3333333
+      :pub-fax: 4444444
+      :pub-email: x@example.com
+      :pub-uri: http://www.example.com
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
@@ -280,6 +286,116 @@ RSpec.describe Asciidoctor::ISO do
     OUTPUT
   end
 
+     it "processes subdivisions" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, "")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :revdate: 2000-01
+      :published-date: 1000-01
+      :docnumber: 1000
+      :partnumber: 1-1
+      :tc-docnumber: 2000
+      :language: el
+      :script: Grek
+      :subdivision: Subdivision
+      :subdivision-abbr: SD
+      :doctype: This is a DocType
+      :pub-address: 1 Infinity Loop + \\
+      California
+      :pub-phone: 3333333
+      :pub-fax: 4444444
+      :pub-email: x@example.com
+      :pub-uri: http://www.example.com
+
+    INPUT
+    <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
+  <bibdata type='standard'>
+    <docidentifier type='ISO'>SD 1000-1-1</docidentifier>
+    <docidentifier type='iso-with-lang'>SD 1000-1-1(X)</docidentifier>
+    <docidentifier type='iso-reference'>SD 1000-1-1(X)</docidentifier>
+    <docidentifier type='iso-tc'>2000</docidentifier>
+    <docnumber>1000</docnumber>
+    <date type='published'>
+      <on>1000-01</on>
+    </date>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <subdivision>Subdivision</subdivision>
+        <abbreviation>SD</abbreviation>
+        <address>
+          <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+        </address>
+        <phone>3333333</phone>
+        <phone type='fax'>4444444</phone>
+        <email>x@example.com</email>
+        <uri>http://www.example.com</uri>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <subdivision>Subdivision</subdivision>
+        <abbreviation>SD</abbreviation>
+        <address>
+          <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+        </address>
+        <phone>3333333</phone>
+        <phone type='fax'>4444444</phone>
+        <email>x@example.com</email>
+        <uri>http://www.example.com</uri>
+      </organization>
+    </contributor>
+    <version>
+      <revision-date>2000-01</revision-date>
+    </version>
+    <language>el</language>
+    <script>Grek</script>
+    <status>
+      <stage abbreviation='IS'>60</stage>
+      <substage>60</substage>
+    </status>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Organization for Standardization</name>
+          <subdivision>Subdivision</subdivision>
+          <abbreviation>SD</abbreviation>
+          <address>
+            <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+          </address>
+          <phone>3333333</phone>
+          <phone type='fax'>4444444</phone>
+          <email>x@example.com</email>
+          <uri>http://www.example.com</uri>
+        </organization>
+      </owner>
+    </copyright>
+    <ext>
+      <doctype>this-is-a-doctype</doctype>
+      <editorialgroup>
+        <technical-committee/>
+        <subcommittee/>
+        <workgroup/>
+      </editorialgroup>
+      <structuredidentifier>
+        <project-number part='1' subpart='1'>SD 1000</project-number>
+      </structuredidentifier>
+      <stagename>International standard</stagename>
+    </ext>
+  </bibdata>
+  <sections> </sections>
+</iso-standard>
+
+OUTPUT
+     end
+
     it "defaults substage, defines iteration on stage 50, gives stage 50 on technical specification" do
     expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title

data/spec/asciidoctor-iso/validate_spec.rb

@@ -2,6 +2,26 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe Asciidoctor::ISO do
+  context "when xref_error.adoc compilation" do
+    around do |example|
+      FileUtils.rm_f "spec/assets/xref_error.err"
+      example.run
+      Dir["spec/assets/xref_error*"].each do |file|
+        next if file.match?(/adoc$/)
+
+        FileUtils.rm_f(file)
+      end
+    end
+
+    it "generates error file" do
+      expect do
+        Metanorma::Compile
+          .new
+          .compile("spec/assets/xref_error.adoc", type: "iso")
+      end.to(change { File.exist?("spec/assets/xref_error.err") }
+              .from(false).to(true))
+    end
+  end
 
 it "Warns of missing scope" do
     FileUtils.rm_f "test.err"
@@ -332,7 +352,7 @@ it "warns that undated reference has locality" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
-  
+
   == Scope
   <<iso123,clause=1>>
 
@@ -417,7 +437,7 @@ it "warns that Scope contains subclauses" do
   #{VALIDATING_BLANK_HDR}
 
   == Scope
-  
+
   === Scope subclause
   INPUT
     expect(File.read("test.err")).to include "Scope contains subclauses: should be succinct"
@@ -427,7 +447,7 @@ end
 it "warns that Table should have title" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   |===
   |a |b |c
@@ -439,7 +459,7 @@ end
 it "gives Style warning if number not broken up in threes" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   12121
@@ -450,7 +470,7 @@ end
 it "gives No style warning if number not broken up in threes is ISO reference" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   ISO 12121
@@ -461,7 +481,7 @@ end
 it "Style warning if decimal point" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   8.1
@@ -472,7 +492,7 @@ end
 it "Style warning if billion used" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   "Billions" are a term of art.
@@ -483,7 +503,7 @@ end
 it "Style warning if no space before percent sign" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   95%
@@ -572,7 +592,7 @@ end
 # it "Style warning if foreword contains subclauses" do
   # expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(%r{non-standard unit}).to_stderr
   #  #{VALIDATING_BLANK_HDR}
-# 
+#
   # INPUT
 # end
 
@@ -644,7 +664,7 @@ it "Warning if introduction not followed by scope" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
 
-  .Foreword 
+  .Foreword
   Foreword
 
   == Introduction
@@ -661,7 +681,7 @@ it "Warning if normative references not followed by terms and definitions" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
 
-  .Foreword 
+  .Foreword
   Foreword
 
   == Scope
@@ -681,7 +701,7 @@ it "Warning if there are no clauses in the document" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
 
-  .Foreword 
+  .Foreword
   Foreword
 
   == Scope
@@ -1089,7 +1109,7 @@ it "Warning if term definition starts with article" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
   == Terms and Definitions
-  
+
   === Term
 
   The definition of a term is a part of the specialized vocabulary of a particular field
@@ -1102,7 +1122,7 @@ it "Warning if term definition ends with period" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
   == Terms and Definitions
-  
+
   === Term
 
   Part of the specialized vocabulary of a particular field.
@@ -1202,7 +1222,7 @@ it "Warn if an undated reference has no associated footnote" do
     FileUtils.rm_f "test.err"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
-  
+
   [bibliography]
   == Bibliography
   * [[[ISO8,ISO 8:--]]], _Title_

data/spec/assets/xref_error.adoc

@@ -0,0 +1,7 @@
+= X
+A
+
+== Clause
+
+<<a,b>>
+

data/spec/isodoc/amd_spec.rb

@@ -642,7 +642,7 @@ OUTPUT
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
       <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
   <bibdata type='standard'>
     <title language='en' format='text/plain' type='main'>Introduction — Main Title — Title — Title Part  — Mass fraction of
@@ -735,8 +735,6 @@ OUTPUT
 </iso-standard>
 INPUT
 {:agency=>"ISO",
-:authors=>[],
-:authors_affiliations=>{},
 :createddate=>"2016-05-01",
 :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
 :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
@@ -765,9 +763,6 @@ INPUT
 :edition=>"2",
 :editorialgroup=>["A 1", "B 2", "C 3"],
 :ics=>"1, 2, 3",
-:keywords=>[],
-:obsoletes=>nil,
-:obsoletes_part=>nil,
 :publisher=>"International Organization for Standardization",
 :revdate=>"2000-01-01",
 :revdate_monthyear=>"January 2000",
@@ -778,7 +773,6 @@ INPUT
 :stageabbr=>"NWIP",
 :statusabbr=>"PreNWIP3",
 :tc=>"A 1",
-:tc_docnumber=>[],
 :unpublished=>true,
 :wg=>"C 3"}
 OUTPUT

data/spec/isodoc/metadata_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
     <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
@@ -81,8 +81,6 @@ INPUT
 {:accesseddate=>"2012",
 :activateddate=>"2013",
 :agency=>"ISO",
-:authors=>[],
-:authors_affiliations=>{},
 :createddate=>"2010&ndash;2011",
 :docnumber=>"ISO/PreCD3 17301-1",
 :docnumber_lang=>"ISO/PreCD3 17301-1 (E)",
@@ -104,11 +102,8 @@ INPUT
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
-:ics=>nil,
 :keywords=>["kw2", "kw1"],
 :obsoleteddate=>"2014",
-:obsoletes=>nil,
-:obsoletes_part=>nil,
 :publisheddate=>"2011",
 :publisher=>"International Organization for Standardization",
 :revdate=>"2016-05-01",
@@ -131,7 +126,7 @@ OUTPUT
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title>
@@ -204,12 +199,9 @@ OUTPUT
 </iso-standard>
 INPUT
 {:agency=>"ISO/IEC",
-:authors=>[],
-:authors_affiliations=>{},
 :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)",
-:docnumeric=>nil,
 :docsubtitle=>"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",
 :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
 :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai",
@@ -222,17 +214,11 @@ INPUT
 :doctitlepartlabel=>"Part&nbsp;1&ndash;3",
 :doctype=>"International Standard",
 :docyear=>"2016",
-:draft=>nil,
-:draftinfo=>"",
-:edition=>nil,
 :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
 :ics=>"1.2.3, 1.2.3",
-:keywords=>[],
 :obsoletes=>"IEC 8121",
 :obsoletes_part=>"3.1",
 :publisher=>"International Organization for Standardization and International Electrotechnical Commission",
-:revdate=>nil,
-:revdate_monthyear=>nil,
 :sc=>"DEF 4",
 :secretariat=>"XXXX",
 :stage=>"60",

data/spec/spec_helper.rb

@@ -29,6 +29,10 @@ def strip_guid(x)
   x.gsub(%r{ id="_[^"]+"}, ' id="_"').gsub(%r{ target="_[^"]+"}, ' target="_"')
 end
 
+def metadata(x)
+  Hash[x.sort].delete_if{ |k, v| v.nil? || v.respond_to?(:empty?) && v.empty? }
+end
+
 def xmlpp(x)
   s = ""
   f = REXML::Formatters::Pretty.new(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -364,6 +364,7 @@ files:
 - spec/assets/word.css
 - spec/assets/wordcover.html
 - spec/assets/wordintro.html
+- spec/assets/xref_error.adoc
 - spec/examples/103_01_02.html
 - spec/examples/english.yaml
 - spec/examples/iso_123_.xml