metanorma-standoc 1.3.20 → 1.3.21

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -2,18 +2,41 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc do
   it "processes the Asciidoctor::Standoc inline macros" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       alt:[term1]
       deprecated:[term1]
       domain:[term1]
+      inherit:[<<ref1>>]
+
+      [bibliography]
+      == Bibliography
+      * [[[ref1,XYZ 123]]] _Title_
     INPUT
             #{BLANK_HDR}
-       <sections>
-         <admitted>term1</admitted>
-       <deprecates>term1</deprecates>
-       <domain>term1</domain>
-       </sections>
+         <preface>
+  <foreword id='_' obligation='informative'>
+    <title>Foreword</title>
+    <admitted>term1</admitted>
+    <deprecates>term1</deprecates>
+    <domain>term1</domain>
+    <inherit>
+      <eref type='inline' bibitemid='ref1' citeas='XYZ 123'/>
+    </inherit>
+  </foreword>
+</preface>
+<sections> </sections>
+<bibliography>
+  <references id='_' obligation='informative'>
+    <title>Bibliography</title>
+    <bibitem id='ref1'>
+      <formattedref format='application/x-isodoc+xml'>
+        <em>Title</em>
+      </formattedref>
+      <docidentifier>XYZ 123</docidentifier>
+    </bibitem>
+  </references>
+</bibliography>
        </standard-document>
     OUTPUT
   end

data/spec/asciidoctor-standoc/table_spec.rb

@@ -114,7 +114,7 @@ RSpec.describe Asciidoctor::Standoc do
   it "processes complex tables" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
-      [cols="<,^,^,^,^",options="header,footer",headerrows=2,alt="An extensive summary, and illustration, of tables",subsequence="A",options="unnumbered",summary="This is an extremely long, convoluted summary"]
+      [cols="<,^,^,^,^",options="header,footer",headerrows=2,alt="An extensive summary, and illustration, of tables",subsequence="A",options="unnumbered",summary="This is an extremely long, convoluted summary",width=70%]
       .Maximum _permissible_ mass fraction of defects
       |===
       .2+|Defect 4+^| Maximum permissible mass fraction of defects in husked rice +
@@ -144,7 +144,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
             #{BLANK_HDR}
        <sections>
-         <table id="_" alt="An extensive summary, and illustration, of tables" unnumbered="true" subsequence="A" summary="This is an extremely long, convoluted summary">
+         <table id="_" alt="An extensive summary, and illustration, of tables" unnumbered="true" subsequence="A" summary="This is an extremely long, convoluted summary" width="70%">
          <name>Maximum <em>permissible</em> mass fraction of defects</name>
          <thead>
            <tr>

data/spec/asciidoctor-standoc/validate_spec.rb

@@ -5,7 +5,8 @@ require "fileutils"
 RSpec.describe Asciidoctor::Standoc do
 
   it "warns about hanging paragraphs" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/Hanging paragraph in clause/).to_stderr
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   #{VALIDATING_BLANK_HDR}
 
   == Clause 1
@@ -16,26 +17,32 @@ RSpec.describe Asciidoctor::Standoc do
 
   Subclause
   INPUT
+  expect(File.read("test.err")).to include "Hanging paragraph in clause"
   end
 
   it "warns that video is a skipped node" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/converter missing for video node/).to_stderr
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   #{VALIDATING_BLANK_HDR}
 
   video::video_file.mp4[]
   INPUT
+  expect(File.read("test.err")).to include "converter missing for video node"
   end
 
 it "warns that figure does not have title" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/Figure should have title/).to_stderr
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   #{VALIDATING_BLANK_HDR}
 
   image::spec/examples/rice_images/rice_image1.png[]
   INPUT
+  expect(File.read("test.err")).to include "Figure should have title"
 end
 
 it "warns that callouts do not match annotations" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/mismatch of callouts and annotations/).to_stderr
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
       #{VALIDATING_BLANK_HDR}
       [source,ruby]
       --
@@ -47,50 +54,60 @@ it "warns that callouts do not match annotations" do
       <1> This is one callout
       <2> This is another callout
       INPUT
+  expect(File.read("test.err")).to include "mismatch of callouts and annotations"
 end
 
 it "warns that term source is not a real reference" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/iso123 is not a real reference/).to_stderr
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   #{VALIDATING_BLANK_HDR}
 
   [.source]
   <<iso123>>
   INPUT
+  expect(File.read("test.err")).to include "iso123 is not a real reference"
 end
 
 it "warns of Non-reference in bibliography" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/no anchor on reference/).to_stderr
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   #{VALIDATING_BLANK_HDR}
 
   == Normative References
   * I am not a reference
   INPUT
+  expect(File.read("test.err")).to include "no anchor on reference"
 end
 
 it "warns that Table should have title" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(%r{Table should have title}).to_stderr
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   #{VALIDATING_BLANK_HDR}     
 
   |===
   |a |b |c
   |===
   INPUT
+  expect(File.read("test.err")).to include "Table should have title"
 end
 
 it "validates document against ISO XML schema" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(%r{value of attribute "align" is invalid; must be equal to}).to_stderr
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   #{VALIDATING_BLANK_HDR}
 
   [align=mid-air]
   Para
   INPUT
+  expect(File.read("test.err")).to include 'value of attribute "align" is invalid; must be equal to'
 end
 
 it "Warning if terms mismatches IEV" do
+  FileUtils.rm_f "test.err"
   FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
   FileUtils.rm_f "test_iev/pstore"
   mock_open_uri('103-01-02')
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(%r{Term "automation" does not match IEV 103-01-02 "functional"}).to_stderr
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   = Document title
   Author
   :docfile: test.adoc
@@ -105,14 +122,16 @@ it "Warning if terms mismatches IEV" do
   [.source]
   <<iev,clause="103-01-02">>
   INPUT
+  expect(File.read("test.err")).to include 'Term "automation" does not match IEV 103-01-02 "functional"'
   FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev/cache"), force: true
 end
 
 it "No warning if English term matches IEV" do
+  FileUtils.rm_f "test.err"
   FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
   FileUtils.rm_f "test_iev/cache"
   mock_open_uri('103-01-02')
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.not_to output(%r{does not match IEV 103-01-02}).to_stderr
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   = Document title
   Author
   :docfile: test.adoc
@@ -127,14 +146,16 @@ it "No warning if English term matches IEV" do
   [.source]
   <<iev,clause="103-01-02">>
   INPUT
+  expect(File.read("test.err")).not_to include "does not match IEV 103-01-02"
   FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev/cache"), force: true
 end
 
 it "No warning if French term matches IEV" do
+  FileUtils.rm_f "test.err"
   FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
   FileUtils.rm_f "test_iev/cache"
   mock_open_uri('103-01-02')
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.not_to output(%r{does not match IEV 103-01-02}).to_stderr
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
   = Document title
   Author
   :docfile: test.adoc
@@ -151,16 +172,36 @@ it "No warning if French term matches IEV" do
   [.source]
   <<iev,clause="103-01-02">>
   INPUT
+  expect(File.read("test.err")).not_to include "does not match IEV 103-01-02"
   FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev/cache"), force: true
 end
 
+=begin
 it "No warning if attributes on formatted strong or stem extraneous to Metanomra XML" do
   expect { Asciidoctor::Standoc::Converter.new(nil,nil).validate(Nokogiri::XML(<<~INPUT)) }.not_to output('found attribute "close", but no attributes allowed here').to_stderr
   <standard-document>
   <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfenced open="(" close=")"><mi>r</mi></mfenced></stem>
   </standard-document>
 INPUT
+end
+=end
+
+it "warns if id used twice" do
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+
+  [[abc]]
+  == Clause 1
 
+  [[abc]]
+  == Clause 2
+  INPUT
+  expect(File.read("test.err")).to include "Anchor abc has already been used at line"
 end
 
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.21
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.20
 - !ruby/object:Gem::Dependency
   name: iev
   requirement: !ruby/object:Gem::Requirement
@@ -290,20 +290,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: metanorma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -382,6 +368,7 @@ files:
 - lib/asciidoctor/standoc/inline.rb
 - lib/asciidoctor/standoc/isodoc.rng
 - lib/asciidoctor/standoc/lists.rb
+- lib/asciidoctor/standoc/log.rb
 - lib/asciidoctor/standoc/macros.rb
 - lib/asciidoctor/standoc/macros_plantuml.rb
 - lib/asciidoctor/standoc/ref.rb