metanorma-iso 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4efe57fc87938f85770ed9c8a784736a25e1f69712ed770f21bf6b59a212b3f
-  data.tar.gz: ebd36532e1f6742007b4415ace26933d72670d0d376485ed7f7fe5713bca3e5c
+  metadata.gz: 7dc868b1792a227210079cc57a26f3d6a149738feb8cc1003a081f2db6a8c035
+  data.tar.gz: 4ce69ed98d486e5618ad68bbac05b6b8589d8ac7b1b76bff90c4bed08b242315
 SHA512:
-  metadata.gz: 9c44d90b036a28539859a9c291bbdb6575061196fe52f25ddb76a48b512ee284f107e82ab8aa25e57c3c95135480ecd3e48e13932e839fcd8978764b25a0693b
-  data.tar.gz: d6166c40c1003fa88abfd11ee36938bd435c58549501e321a6048ecbcf5c21f2be25ad30667d75a26845d6b63e0cc251778451d970de8c43237452327b8061d9
+  metadata.gz: 8a759e049bbc37f0b3027a7ff7ed012e123645c28099e9b4c9af86cc3da964e7b121f69c4ae0d4b0d9d9a804009bb93c368716ad115ff45a761fa0d3cec89245
+  data.tar.gz: cc1c85767b13826f10d1289621379892722166aa38008009577be1c6703b3ad194870db780f050457e73e0f76b301186d64469c935007c56539c23f78651bc17

data/.github/workflows/ubuntu.yml

@@ -39,7 +39,7 @@ jobs:
           polling_interval_seconds: 5
           timeout_minutes: 5
           max_attempts: 3
-          command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
+          command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
       - name: Run specs
         run: |
           bundle exec rake

data/lib/asciidoctor/iso/front.rb

@@ -34,7 +34,7 @@ module Asciidoctor
 
       def metadata_author(node, xml)
         publishers = node.attr("publisher") || "ISO"
-        publishers.split(/,[ ]?/).each do |p|
+        csv_split(publishers).each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization { |a| organization(a, p) }
@@ -44,7 +44,7 @@ module Asciidoctor
 
       def metadata_publisher(node, xml)
         publishers = node.attr("publisher") || "ISO"
-        publishers.split(/,[ ]?/).each do |p|
+        csv_split(publishers).each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
             c.organization { |a| organization(a, p) }
@@ -53,8 +53,8 @@ module Asciidoctor
       end
 
       def metadata_copyright(node, xml)
-        publishers = node.attr("publisher") || "ISO"
-        publishers.split(/,[ ]?/).each do |p|
+        publishers = node.attr("copyright-holder") || node.attr("publisher") || "ISO"
+        csv_split(publishers).each do |p|
           xml.copyright do |c|
             c.from (node.attr("copyright-year") || Date.today.year)
             c.owner do |owner|

data/lib/asciidoctor/iso/validate_section.rb

@@ -7,6 +7,7 @@ module Asciidoctor
         foreword_validate(doc.root)
         normref_validate(doc.root)
         symbols_validate(doc.root)
+        sections_presence_validate(doc.root)
         sections_sequence_validate(doc.root)
         section_style(doc.root)
         subclause_validate(doc.root)
@@ -55,6 +56,15 @@ module Asciidoctor
         names
       end
 
+      def sections_presence_validate(root)
+        root.at("//sections/clause[@type = 'scope']") or
+          @log.add("Style", nil, "Scope clause missing")
+        root.at("//references[@normative = 'true']") or
+          @log.add("Style", nil, "Normative references missing")
+        root.at("//terms") or
+          @log.add("Style", nil, "Terms & definitions missing")
+      end
+
       # spec of permissible section sequence
       # we skip normative references, it goes to end of list
       SEQ =

data/lib/isodoc/iso/i18n-en.yaml

@@ -8,4 +8,3 @@ term_def_boilerplate: |
       <li> <p>IEC Electropedia: available at
       <link target="http://www.electropedia.org"/>
       </p> </li> </ul>
-

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.1".freeze
+    VERSION = "1.5.2".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -186,6 +186,7 @@ RSpec.describe Asciidoctor::ISO do
       :language: el
       :script: Grek
       :publisher: IEC,IETF,ISO
+      :copyright-holder: ISO,IETF
       :copyright-year: 2001
       :doctype: technical-report
     INPUT
@@ -248,8 +249,8 @@ RSpec.describe Asciidoctor::ISO do
            <from>2001</from>
            <owner>
              <organization>
-               <name>International Electrotechnical Commission</name>
-               <abbreviation>IEC</abbreviation>
+               <name>International Organization for Standardization</name>
+               <abbreviation>ISO</abbreviation>
              </organization>
            </owner>
          </copyright>
@@ -261,15 +262,6 @@ RSpec.describe Asciidoctor::ISO do
              </organization>
            </owner>
          </copyright>
-         <copyright>
-           <from>2001</from>
-           <owner>
-             <organization>
-               <name>International Organization for Standardization</name>
-               <abbreviation>ISO</abbreviation>
-             </organization>
-           </owner>
-         </copyright>
          <ext>
          <doctype>technical-report</doctype>
          <editorialgroup>

data/spec/asciidoctor-iso/validate_spec.rb

@@ -3,6 +3,93 @@ require "fileutils"
 
 RSpec.describe Asciidoctor::ISO do
 
+it "Warns of missing scope" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "Scope clause missing"
+  FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  == Scope
+  INPUT
+    expect(File.read("test.err")).not_to include "Scope clause missing"
+
+end
+
+it "Warns of missing normative references" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "Normative references missing"
+  FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  [bibliography]
+  == Normative references
+  INPUT
+    expect(File.read("test.err")).not_to include "Normative references missing"
+
+end
+
+it "Warns of missing terms & definitions" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "Terms & definitions missing"
+  FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  == Terms and definitions
+  === Term 1
+  INPUT
+    expect(File.read("test.err")).not_to include "Terms & definitions missing"
+
+end
+
+
 it "Warns of illegal doctype" do
     FileUtils.rm_f "test.err"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing