RubyGems - metanorma-standoc - Versions diffs - 2.2.0.1 → 2.2.1 - Mend

metanorma-standoc 2.2.0.1 → 2.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

checksums.yaml +4 -4
data/lib/metanorma/standoc/base.rb +12 -0
data/lib/metanorma/standoc/blocks.rb +26 -13
data/lib/metanorma/standoc/cleanup_biblio.rb +14 -8
data/lib/metanorma/standoc/cleanup_reqt.rb +3 -136
data/lib/metanorma/standoc/front_contributor.rb +0 -10
data/lib/metanorma/standoc/reqt.rb +19 -75
data/lib/metanorma/standoc/section.rb +35 -3
data/lib/metanorma/standoc/utils.rb +9 -43
data/lib/metanorma/standoc/version.rb +1 -1
data/metanorma-standoc.gemspec +2 -2
data/spec/metanorma/biblio_spec.rb +8 -8
data/spec/metanorma/blocks_spec.rb +20 -266
data/spec/metanorma/cleanup_blocks_spec.rb +0 -168
data/spec/metanorma/macros_concept_spec.rb +1033 -0
data/spec/metanorma/macros_spec.rb +0 -1030
data/spec/metanorma/reqt_spec.rb +130 -0
data/spec/metanorma/section_spec.rb +5 -0
data/spec/vcr_cassettes/bsi16341.yml +52 -36
data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml +88 -88
data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml +10 -10
data/spec/vcr_cassettes/hide_refs.yml +65 -65
data/spec/vcr_cassettes/isobib_get_123.yml +12 -12
data/spec/vcr_cassettes/isobib_get_123_1.yml +22 -22
data/spec/vcr_cassettes/isobib_get_123_1_fr.yml +30 -30
data/spec/vcr_cassettes/isobib_get_123_2.yml +21 -21
data/spec/vcr_cassettes/isobib_get_123_2001.yml +11 -11
data/spec/vcr_cassettes/isobib_get_124.yml +11 -11
data/spec/vcr_cassettes/rfcbib_get_rfc8341.yml +34 -58
data/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml +45 -45
data/spec/vcr_cassettes/std-link.yml +11 -11
metadata +9 -7

data/spec/metanorma/blocks_spec.rb CHANGED Viewed

@@ -456,16 +456,16 @@ RSpec.describe Metanorma::Standoc do
       ====
     INPUT
     output = <<~OUTPUT
-                   #{BLANK_HDR}
-            <sections>
-                <clause id='_' inline-header='false' obligation='normative'>
-      <title>Clause</title>
-      <termnote id='_'>
-        <p id='_'>XYZ</p>
-      </termnote>
-    </clause>
-            </sections>
-            </standard-document>
+                     #{BLANK_HDR}
+              <sections>
+                  <clause id='_' inline-header='false' obligation='normative'>
+        <title>Clause</title>
+        <termnote id='_'>
+          <p id='_'>XYZ</p>
+        </termnote>
+      </clause>
+              </sections>
+              </standard-document>
     OUTPUT
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
@@ -764,16 +764,16 @@ RSpec.describe Metanorma::Standoc do
       ====
     INPUT
     output = <<~OUTPUT
-      #{BLANK_HDR}
-            <sections>
-                <clause id='_' inline-header='false' obligation='normative'>
-      <title>Clause</title>
-      <termexample id='_'>
-        <p id='_'>XYZ</p>
-      </termexample>
-    </clause>
-            </sections>
-            </standard-document>
+        #{BLANK_HDR}
+              <sections>
+                  <clause id='_' inline-header='false' obligation='normative'>
+        <title>Clause</title>
+        <termexample id='_'>
+          <p id='_'>XYZ</p>
+        </termexample>
+      </clause>
+              </sections>
+              </standard-document>
     OUTPUT
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
@@ -1616,252 +1616,6 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
-  it "processes recommendation" do
-    input = <<~"INPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [.recommendation,identifier="/ogc/recommendation/wfs/2",subject="user;developer, implementer",inherit="/ss/584/2015/level/1; /ss/584/2015/level/2",options="unnumbered",type=verification,model=ogc,tag=X,multilingual-rendering=common]
-      ====
-      I recommend this
-      ====
-    INPUT
-    output = <<~"OUTPUT"
-      #{BLANK_HDR}
-              <sections>
-         <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
-         <identifier>/ogc/recommendation/wfs/2</identifier>
-       <subject>user</subject>
-       <subject>developer, implementer</subject>
-       <inherit>/ss/584/2015/level/1</inherit>
-       <inherit>/ss/584/2015/level/2</inherit>
-         <description><p id="_">I recommend this</p>
-       </description>
-       </recommendation>
-              </sections>
-              </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-  it "processes requirement" do
-    input = <<~"INPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [[ABC]]
-      [.requirement,subsequence="A",inherit="/ss/584/2015/level/1 &amp; /ss/584/2015/level/2",number=3,keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
-      .Title
-      ====
-      I recommend this
-      . http://www.example.com[]
-      . <<ABC>>
-      ====
-    INPUT
-    output = <<~OUTPUT
-      #{BLANK_HDR}
-             <sections>
-        <requirement id="ABC" subsequence="A" number="3" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
-              <title>Title</title>
-        <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
-        <description><p id="_">I recommend this</p>
-                       <ol id='_' type='arabic'>
-                 <li>
-                   <p id='_'>
-                     <link target='http://www.example.com'/>
-                   </p>
-                 </li>
-                 <li>
-                   <p id='_'>
-                     <xref target='ABC'/>
-                   </p>
-                 </li>
-               </ol>
-      </description>
-      </requirement>
-             </sections>
-             </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-  it "processes permission" do
-    input = <<~"INPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [[ABC]]
-      [.permission,tag=X,multilingual-rendering=common]
-      ====
-      I recommend this
-      ====
-    INPUT
-    output = <<~"OUTPUT"
-                  #{BLANK_HDR}
-             <sections>
-        <permission id="ABC" tag='X' multilingual-rendering='common'>
-        <description><p id="_">I recommend this</p></description>
-      </permission>
-             </sections>
-             </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-  it "processes nested permissions" do
-    input = <<~"INPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [.permission]
-      ====
-      I permit this
-      =====
-      Example 2
-      =====
-      [.permission]
-      =====
-      I also permit this
-      . List
-      . List
-      =====
-      [requirement,type="general",identifier="/req/core/quantities-uom"]
-      ======
-      ======
-      ====
-    INPUT
-    output = <<~"OUTPUT"
-      #{BLANK_HDR}
-             <sections>
-               <permission id="_"><description><p id="_">I permit this</p>
-      <example id="_">
-        <p id="_">Example 2</p>
-      </example></description>
-      <permission id="_">
-        <description><p id="_">I also permit this</p>
-                  <ol id='_' type='arabic'>
-            <li>
-              <p id='_'>List</p>
-            </li>
-            <li>
-              <p id='_'>List</p>
-            </li>
-          </ol>
-        </description>
-      </permission>
-      <requirement id='_' type='general'>
-      <identifier>/req/core/quantities-uom</identifier>
-      </requirement>
-      </permission>
-      </sections>
-      </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-  it "processes recommendation with internal markup of structure" do
-    input = <<~"INPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [[ABC]]
-      [.recommendation,identifier="/ogc/recommendation/wfs/2",subject="user",classification="control-class:Technical;priority:P0;family:System &amp; Communications Protection,System and Communications Protocols",obligation="permission,recommendation",filename="reqt1.rq"]
-      ====
-      I recommend _this_.
-      [.specification,type="tabular",keep-with-next=true,keep-lines-together=true]
-      --
-      This is the object of the recommendation:
-      |===
-      |Object |Value
-      |Mission | Accomplished
-      |===
-      --
-      As for the measurement targets,
-      [.measurement-target]
-      --
-      The measurement target shall be measured as:
-      [stem]
-      ++++
-      r/1 = 0
-      ++++
-      --
-      [.verification]
-      --
-      The following code will be run for verification:
-      [source,CoreRoot]
-      ----
-      CoreRoot(success): HttpResponse
-      if (success)
-        recommendation(label: success-response)
-      end
-      ----
-      --
-      [.import%exclude]
-      --
-      [source,CoreRoot]
-      ----
-      success-response()
-      ----
-      --
-      [.component]
-      --
-      Hello
-      --
-      [.component,class=condition]
-      --
-      If this be thus
-      --
-      ====
-    INPUT
-    output = <<~"OUTPUT"
-         #{BLANK_HDR}
-                 <sections>
-                 <recommendation id="ABC"  obligation="permission,recommendation" filename="reqt1.rq"><identifier>/ogc/recommendation/wfs/2</identifier><subject>user</subject>
-          <classification><tag>control-class</tag><value>Technical</value></classification><classification><tag>priority</tag><value>P0</value></classification><classification><tag>family</tag><value>System &amp; Communications Protection</value></classification><classification><tag>family</tag><value>System and Communications Protocols</value></classification>
-                  <description><p id="_">I recommend <em>this</em>.</p>
-                 </description><specification exclude="false" type="tabular" keep-with-next="true" keep-lines-together="true"><p id="_">This is the object of the recommendation:</p><table id="_">  <tbody>    <tr>      <td valign="top" align="left">Object</td>      <td valign="top" align="left">Value</td>    </tr>    <tr>      <td valign="top" align="left">Mission</td>      <td valign="top" align="left">Accomplished</td>    </tr>  </tbody></table></specification><description>
-                 <p id="_">As for the measurement targets,</p>
-                 </description><measurement-target exclude="false"><p id="_">The measurement target shall be measured as:</p><formula id="_">  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfrac>
-                 <mrow>
-            <mi>r</mi>
-          </mrow>
-          <mrow>
-            <mn>1</mn>
-          </mrow>
-          </mfrac><mo>=</mo><mn>0</mn></math></stem></formula></measurement-target>
-                 <verification exclude="false"><p id="_">The following code will be run for verification:</p><sourcecode  lang="CoreRoot" id="_">CoreRoot(success): HttpResponse
-          if (success)
-            recommendation(label: success-response)
-          end</sourcecode></verification>
-                 <import exclude="true">  <sourcecode  lang="CoreRoot" id="_">success-response()</sourcecode></import>
-                 <component exclude='false' class='component'>
-        <p id='_'>Hello</p>
-      </component>
-      <component exclude='false' class='condition'>
-        <p id='_'>If this be thus</p>
-      </component>
-          </recommendation>
-                 </sections>
-                 </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
   it "processes delete change clauses" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}

data/spec/metanorma/cleanup_blocks_spec.rb CHANGED Viewed

@@ -792,174 +792,6 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
-  it "moves metadata deflist to correct location" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Clause
-      [.requirement,subsequence="A",inherit="/ss/584/2015/level/1 &amp; /ss/584/2015/level/2"]
-      ====
-      [%metadata]
-      model:: ogc
-      type:: class
-      identifier:: http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules[*req/core*]
-      subject:: Encoding of logical models
-      inherit:: urn:iso:dis:iso:19156:clause:7.2.2
-      inherit:: urn:iso:dis:iso:19156:clause:8
-      inherit:: http://www.opengis.net/doc/IS/GML/3.2/clause/2.4
-      inherit:: O&M Abstract model, OGC 10-004r3, clause D.3.4
-      inherit:: http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used
-      inherit:: <<ref2>>
-      inherit:: <<ref3>>
-      target:: http://www.example.com
-      classification:: priority:P0
-      classification:: domain:Hydrology,Groundwater
-      classification:: control-class:Technical
-      obligation:: recommendation,requirement
-      I recommend this
-      ====
-    INPUT
-    output = <<~OUTPUT
-            #{BLANK_HDR}
-            <sections>
-        <clause id='_' inline-header='false' obligation='normative'>
-          <title>Clause</title>
-          <requirement id='_' subsequence='A' obligation='recommendation,requirement' model='ogc' type='class'>
-            <identifier>http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules</identifier>
-            <subject>Encoding of logical models</subject>
-            <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
-            <inherit>urn:iso:dis:iso:19156:clause:7.2.2</inherit>
-            <inherit>urn:iso:dis:iso:19156:clause:8</inherit>
-            <inherit>http://www.opengis.net/doc/IS/GML/3.2/clause/2.4</inherit>
-            <inherit>O&amp;M Abstract model, OGC 10-004r3, clause D.3.4</inherit>
-            <inherit>http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used</inherit>
-            <inherit>
-              <xref target='ref2'/>
-            </inherit>
-            <inherit>
-              <xref target='ref3'/>
-            </inherit>
-            <classification>
-                 <tag>priority</tag>
-                 <value>P0</value>
-               </classification>
-               <classification>
-                 <tag>domain</tag>
-                 <value>Hydrology</value>
-               </classification>
-               <classification>
-                 <tag>domain</tag>
-                 <value>Groundwater</value>
-               </classification>
-               <classification>
-                 <tag>control-class</tag>
-                 <value>Technical</value>
-               </classification>
-               <classification>
-                 <tag>target</tag>
-                 <value><link target='http://www.example.com'/></value>
-               </classification>
-            <description>
-              <p id='_'>I recommend this</p>
-            </description>
-          </requirement>
-        </clause>
-      </sections>
-            </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-  it "moves inherit macros to correct location" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Clause
-      [.requirement,subsequence="A",inherit="/ss/584/2015/level/1 &amp; /ss/584/2015/level/2"]
-      .Title
-      ====
-      inherit:[A]
-      inherit:[B]
-      I recommend this
-      ====
-      [.requirement,subsequence="A",classification="X:Y"]
-      .Title
-      ====
-      inherit:[A]
-      I recommend this
-      ====
-      [.requirement,subsequence="A"]
-      .Title
-      ====
-      inherit:[A]
-      I recommend this
-      ====
-      [.requirement,subsequence="A"]
-      .Title
-      ====
-      inherit:[A]
-      ====
-      [.requirement,subsequence="A"]
-      ====
-      inherit:[A]
-      ====
-    INPUT
-    output = <<~OUTPUT
-        #{BLANK_HDR}
-        <sections>
-          <clause id='_' inline-header='false' obligation='normative'>
-            <title>Clause</title>
-            <requirement id='_' subsequence='A'>
-              <title>Title</title>
-              <inherit>A</inherit>
-              <inherit>B</inherit>
-              <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
-              <description>
-                <p id='_'> I recommend this</p>
-              </description>
-            </requirement>
-            <requirement id='_' subsequence='A'>
-              <title>Title</title>
-              <inherit>A</inherit>
-              <classification>
-                <tag>X</tag>
-                <value>Y</value>
-              </classification>
-              <description>
-                <p id='_'> I recommend this</p>
-              </description>
-            </requirement>
-            <requirement id='_' subsequence='A'>
-              <title>Title</title>
-              <inherit>A</inherit>
-              <description>
-                <p id='_'> I recommend this</p>
-              </description>
-            </requirement>
-            <requirement id='_' subsequence='A'>
-              <title>Title</title>
-                 <inherit>A</inherit>
-              </requirement>
-              <requirement id='_' subsequence='A'>
-              <inherit>A</inherit>
-            </requirement>
-          </clause>
-        </sections>
-      </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
   it "moves %beforeclause admonitions to right position" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}