metanorma-iso 1.8.2 → 1.8.3

data/spec/asciidoctor/validate_spec.rb

@@ -1144,6 +1144,53 @@ RSpec.describe Asciidoctor::ISO do
       .not_to include "Document must include (references) Normative References"
   end
 
+  it "Warning if there are two Terms sections" do
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      #{VALIDATING_BLANK_HDR}
+
+      == Scope
+
+      == Terms and definitions
+
+      == A Clause
+
+      [heading=terms and definitions]
+      == Terms related to clinical psychology
+
+    INPUT
+    expect(File.read("test.err"))
+      .to include "Only annexes and references can follow clauses"
+  end
+
+  it "No warning if there are two Terms sections in a Vocabulary document" do
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :no-isobib:
+      :docsubtype: vocabulary
+
+      == Scope
+
+      == Terms and definitions
+
+      == A Clause
+
+      [heading=terms and definitions]
+      == Terms related to clinical psychology
+
+      [heading=symbols and abbreviated terms]
+      == Symbols related to clinical psychology
+
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "Only annexes and references can follow clauses"
+    expect(File.read("test.err"))
+      .to include "Only terms, annexes and references can follow clauses"
+  end
+
+
   it "Warning if final section is not named Bibliography" do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}

data/spec/spec_helper.rb

@@ -24,16 +24,14 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-=begin
-  config.around do |example|
-    Dir.mktmpdir("rspec-") do |dir|
-      tmp_assets = File.join(dir, "spec/assets/")
-      FileUtils.mkdir_p tmp_assets
-      FileUtils.cp_r Dir.glob("spec/assets/*"), tmp_assets
-      Dir.chdir(dir) { example.run }
-    end
-  end
-=end
+  #   config.around do |example|
+  #     Dir.mktmpdir("rspec-") do |dir|
+  #       tmp_assets = File.join(dir, "spec/assets/")
+  #       FileUtils.mkdir_p tmp_assets
+  #       FileUtils.cp_r Dir.glob("spec/assets/*"), tmp_assets
+  #       Dir.chdir(dir) { example.run }
+  #     end
+  #   end
 end
 
 def strip_guid(xml)
@@ -120,22 +118,25 @@ VALIDATING_BLANK_HDR = <<~"HDR".freeze
   :no-isobib:
 HDR
 
-ASCIIDOCTOR_ISO_DIR = Pathname.new(File.dirname(__FILE__)) / "../lib/asciidoctor/iso"
+ASCIIDOCTOR_ISO_DIR = Pathname
+  .new(File.dirname(__FILE__)) / "../lib/asciidoctor/iso"
 
 BOILERPLATE =
   HTMLEntities.new.decode(
     File.read(ASCIIDOCTOR_ISO_DIR / "boilerplate.xml", encoding: "utf-8")
-      .gsub(/\{\{ agency \}\}/, "ISO").gsub(/\{\{ docyear \}\}/, Date.today.year.to_s)
+      .gsub(/\{\{ agency \}\}/, "ISO")
+  .gsub(/\{\{ docyear \}\}/, Date.today.year.to_s)
       .gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "")
-      .gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
+      .gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’"),
   )
 
 BOILERPLATE_FR =
   HTMLEntities.new.decode(
     File.read(ASCIIDOCTOR_ISO_DIR / "boilerplate-fr.xml", encoding: "utf-8")
-    .gsub(/\{\{ agency \}\}/, "ISO").gsub(/\{\{ docyear \}\}/, Date.today.year.to_s)
+    .gsub(/\{\{ agency \}\}/, "ISO")
+    .gsub(/\{\{ docyear \}\}/, Date.today.year.to_s)
     .gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "")
-    .gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
+    .gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’"),
   )
 
 BLANK_HDR1 = <<~"HDR".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement