metanorma-standoc 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a96726969ceffd8d3d05779e0f81db28972e6932a670cf93745a5006e881f392
-  data.tar.gz: 2d042cb06685449297536817bf622421222e0de78f285ca7c4ceab8f847127bb
+  metadata.gz: f1453d5a4693d43ed4e32a5a97d1ac72760b055c961bf9977d50f6732ffcd6b7
+  data.tar.gz: ad33298dc46235a94b759bbdd07124f30f1f0b7a233a5e0e8675c3fa8b73f725
 SHA512:
-  metadata.gz: 440f9483f3b0cfa94769d357b40a314d26068975371bf2b54c7a0689cdd2bfdd2fb1cc4c877e097666b3d6c36545c09b7e40809d80aa095a132e810de6a02ede
-  data.tar.gz: c39511c530a2530eb7ec4c430bc8917041d270f2643993609a844930415150e9b701a56ab31b550e79312f7a854205ff920e7d7e6f07acb90d995920681ee789
+  metadata.gz: 786e9ede1e35e90a2d523c17dcb623b35d9a6039e20c2808cb176bf0a54f2cfa2e83026514f672bccb9771ab863214d9a6ed4275f6b388ac9d1f31ae26f85d49
+  data.tar.gz: 2ffc403caa148b2b2248bf33bbb12284dd7331781abc173a8e858b66a8a1a212e6f23e68b7c9156ccdbab0432387400f42191c0369c070d6b4f463efbfc028e9

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -116,11 +116,11 @@ module Asciidoctor
         xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
           isopub = ref.at(ISO_PUBLISHER_XPATH)
           docid = ref.at("./docidentifier[not(@type = 'DOI')]")
-          date = ref.at("./date[@type = 'published']")
-          allparts = ref.at("./allparts")
+          #date = ref.at("./date[@type = 'published']")
+          #allparts = ref.at("./allparts")
           reference = format_ref(docid.text, isopub)
-          reference += ":#{date_range(date)}" if date
-          reference += " (all parts)" if allparts
+          #reference += ":#{date_range(date)}" if date
+          #reference += " (all parts)" if allparts
           @anchors[ref["id"]] = { xref: reference }
         end
       end
@@ -155,7 +155,7 @@ module Asciidoctor
 
       # call after xref_cleanup and origin_cleanup
       def iev_cleanup(xmldoc)
-        iev = xmldoc.at("//bibitem[docidentifier = 'IEC 60050']") || return
+        iev = xmldoc.at("//bibitem[docidentifier = 'IEC 60050:2011']") || return
         parts = linksIev2iec60050part(xmldoc)
         refsIev2iec60050part(parts, iev)
       end

data/lib/asciidoctor/standoc/ref.rb

@@ -38,12 +38,17 @@ module Asciidoctor
         ref
       end
 
+      def id_and_year(id, year)
+        return id unless year
+        "#{id}:#{year}"
+      end
+
       def isorefmatches(xml, m)
         ref = fetch_ref xml, m[:code], m[:year]
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-          t.docidentifier m[:code]
+          t.docidentifier id_and_year(m[:code], m[:year])
           m[:year] and t.date **{ type: "published" } do |d|
             set_date_range(d, m[:year])
           end
@@ -56,7 +61,7 @@ module Asciidoctor
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-          t.docidentifier m[:code]
+          t.docidentifier id_and_year(m[:code], "--")
           t.date **{ type: "published" } do |d|
             d.on "--" 
           end
@@ -82,7 +87,7 @@ module Asciidoctor
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem(**attr_code(ref_attributes(m))) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-          t.docidentifier "#{m[:code]}"
+          t.docidentifier(id_and_year(m[:code], m[:year]) + " (all parts)")
           conditional_date(t, m, noyr)
           iso_publisher(t, m[:code])
           t.note(**plaintxt) { |p| p << "ISO DATE: #{m[:fn]}" } if m.names.include?("fn") && m[:fn]

data/lib/asciidoctor/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.3".freeze
+    VERSION = "1.0.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 0.8.8"
+  spec.add_dependency "isodoc", "~> 0.9.0"
   spec.add_dependency "iev", "~> 0.2.0"
-  spec.add_dependency "relaton", "~> 0.1.3"
+  spec.add_dependency "relaton", "~> 0.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug"
@@ -43,5 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.2.6"
-  spec.add_development_dependency "isobib", "~> 0.2.0"
+  spec.add_development_dependency "isobib", "~> 0.3.0"
 end

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -189,7 +189,7 @@ r = 1 %</stem>
         <title>Normative References</title>
         <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
-         <docidentifier>ISO 216</docidentifier>
+         <docidentifier>ISO 216:2001</docidentifier>
          <date type="published">
            <on>2001</on>
          </date>
@@ -652,7 +652,7 @@ r = 1 %</stem>
         <title>Normative References</title>
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123</docidentifier>
+         <docidentifier>ISO 123:--</docidentifier>
          <date type="published">
            <on>--</on>
          </date>
@@ -852,9 +852,9 @@ r = 1 %</stem>
        </termsource>
        </term></terms></sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
-         <bibitem type="international-standard" id="IEC60050-102">
+         <bibitem type="international-standard" id="IEC60050-102-2011">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
-         <docidentifier>IEC 60050-102</docidentifier>
+         <docidentifier>IEC 60050-102:2011</docidentifier>
          <date type="published">
            <on>2011</on>
          </date>
@@ -882,9 +882,9 @@ r = 1 %</stem>
              </organization>
            </owner>
          </copyright>
-       </bibitem><bibitem type="international-standard" id="IEC60050-103">
+       </bibitem><bibitem type="international-standard" id="IEC60050-103-2011">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
-         <docidentifier>IEC 60050-103</docidentifier>
+         <docidentifier>IEC 60050-103:2011</docidentifier>
          <date type="published">
            <on>2011</on>
          </date>

data/spec/asciidoctor-standoc/isobib_cache_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Asciidoctor::Standoc do
   ISO_123_SHORT = <<~EOS
 <bibitem type="international-standard" id="ISO123">
   <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>
-  <docidentifier>ISO 123</docidentifier>
+  <docidentifier type="ISO">ISO 123</docidentifier>
   <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>
   <status>Published</status>
 </bibitem>
@@ -15,7 +15,7 @@ EOS
   ISO_124_SHORT = <<~EOS
 <bibitem type="international-standard" id="ISO124">
   <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content</title>
-  <docidentifier>ISO 124</docidentifier>
+  <docidentifier type="ISO">ISO 124</docidentifier>
   <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>
   <status>Published</status>
 </bibitem>
@@ -24,23 +24,23 @@ EOS
   ISO_124_SHORT_ALT = <<~EOS
 <bibitem type="international-standard" id="ISO124">
   <title format="text/plain" language="en" script="Latn">Latex, rubber -- Replacement</title>
-  <docidentifier>ISO 124</docidentifier>
+  <docidentifier type="ISO">ISO 124</docidentifier>
   <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>
   <status>Published</status>
 </bibitem>
 EOS
 
-  ISOBIB_123_DATED = <<~EOS
-<bibitem type="international-standard" id="ISO123">  <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>  <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- ?chantillonnage</title>  <uri type="src">https://www.iso.org/standard/23281.html</uri>  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>  <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>  <docidentifier>ISO 123</docidentifier>  <date type="published">    <on>2001</on>  </date>  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>  <edition>3</edition>  <language>en</language>  <language>fr</language>  <script>Latn</script>  <status>Published</status>  <copyright>    <from>2001</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      </bibitem>  </relation></bibitem>
+  ISO_123_DATED = <<~EOS
+<bibitem type="international-standard" id="ISO123-2001">  <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>  <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- ?chantillonnage</title>  <uri type="src">https://www.iso.org/standard/23281.html</uri>  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>  <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>  <docidentifier type="ISO">ISO 123:2001</docidentifier>  <date type="published">    <on>2001</on>  </date>  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>  <edition>3</edition>  <language>en</language>  <language>fr</language>  <script>Latn</script>  <status>Published</status>  <copyright>    <from>2001</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      </bibitem>  </relation></bibitem>
 EOS
 
-  ISOBIB_123_UNDATED = <<~EOS
-<bibitem type="international-standard" id="ISO123">  <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>  <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- ?chantillonnage</title>  <uri type="src">https://www.iso.org/standard/23281.html</uri>  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>  <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>  <docidentifier>ISO 123</docidentifier>  <date type="published">    <on>2001</on>  </date>  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>  <edition>3</edition>  <language>en</language>  <language>fr</language>  <script>Latn</script>  <status>Published</status>  <copyright>    <from>2001</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      </bibitem>  </relation></bibitem>
+  ISO_123_UNDATED = <<~EOS
+<bibitem type="international-standard" id="ISO123">  <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>  <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- ?chantillonnage</title>  <uri type="src">https://www.iso.org/standard/23281.html</uri>  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>  <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>  <docidentifier type="ISO">ISO 123</docidentifier>  <date type="published">    <on>2001</on>  </date>  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>  <edition>3</edition>  <language>en</language>  <language>fr</language>  <script>Latn</script>  <status>Published</status>  <copyright>    <from>2001</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      </bibitem>  </relation></bibitem>
 EOS
 
 
-  ISOBIB_124_DATED = <<~EOS
-<bibitem type="international-standard" id="ISO124">  <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content</title>  <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Détermination des matières solides totales</title>  <uri type="src">https://www.iso.org/standard/61884.html</uri>  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>  <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>  <docidentifier>ISO 124</docidentifier>  <date type="published">    <on>2014</on>  </date>  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>  <edition>7</edition>  <language>en</language>  <language>fr</language>  <script>Latn</script>  <abstract format="plain" language="en" script="Latn">ISO 124:2014 specifies methods for the determination of the total solids content of natural rubber field and concentrated latices and synthetic rubber latex. These methods are not necessarily suitable for latex from natural sources other than the Hevea brasiliensis, for vulcanized latex, for compounded latex, or for artificial dispersions of rubber.</abstract>  <abstract format="plain" language="fr" script="Latn">L'ISO 124:2014 spécifie des méthodes pour la détermination des matières solides totales dans le latex de plantation, le latex de concentré de caoutchouc naturel et le latex de caoutchouc synthétique. Ces méthodes ne conviennent pas nécessairement au latex d'origine naturelle autre que celui de l'Hevea brasiliensis, au latex vulcanisé, aux mélanges de latex, ou aux dispersions artificielles de caoutchouc.</abstract>  <status>Published</status>  <copyright>    <from>2014</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 124:2011</formattedref>      </bibitem>  </relation></bibitem>
+  ISO_124_DATED = <<~EOS
+<bibitem type="international-standard" id="ISO124-2014">  <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content</title>  <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Détermination des matières solides totales</title>  <uri type="src">https://www.iso.org/standard/61884.html</uri>  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>  <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>  <docidentifier type="ISO">ISO 124:2014</docidentifier>  <date type="published">    <on>2014</on>  </date>  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>  <edition>7</edition>  <language>en</language>  <language>fr</language>  <script>Latn</script>  <abstract format="plain" language="en" script="Latn">ISO 124:2014 specifies methods for the determination of the total solids content of natural rubber field and concentrated latices and synthetic rubber latex. These methods are not necessarily suitable for latex from natural sources other than the Hevea brasiliensis, for vulcanized latex, for compounded latex, or for artificial dispersions of rubber.</abstract>  <abstract format="plain" language="fr" script="Latn">L'ISO 124:2014 spécifie des méthodes pour la détermination des matières solides totales dans le latex de plantation, le latex de concentré de caoutchouc naturel et le latex de caoutchouc synthétique. Ces méthodes ne conviennent pas nécessairement au latex d'origine naturelle autre que celui de l'Hevea brasiliensis, au latex vulcanisé, aux mélanges de latex, ou aux dispersions artificielles de caoutchouc.</abstract>  <status>Published</status>  <copyright>    <from>2014</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 124:2011</formattedref>      </bibitem>  </relation></bibitem>
 EOS
 
   it "does not activate biblio caches if isobib disabled" do
@@ -109,9 +109,9 @@ EOS
     expect(File.exist?("#{Dir.home}/.iev.pstore")).to be true
 
     db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
-    entry = db.load_entry("ISO 123:2001")
+    entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry["fetched"].to_s).to eq(Date.today.to_s)
-    expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_DATED)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_DATED)
 
     system "rm ~/.relaton-bib.pstore"
     system "rm ~/.iev.pstore"
@@ -134,7 +134,7 @@ EOS
     expect(File.exist?("test.relaton.pstore")).to be false
 
     db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
-    entry = db.load_entry("ISO 123:2001")
+    entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
     system "rm ~/.relaton-bib.pstore"
@@ -156,11 +156,11 @@ EOS
     expect(File.exist?("test.relaton.pstore")).to be true
 
     db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
-    entry = db.load_entry("ISO 123:2001")
+    entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
     db = Relaton::Db.new "test.relaton.pstore", nil
-    entry = db.load_entry("ISO 123:2001")
+    entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
     system "rm ~/.relaton-bib.pstore"
@@ -171,10 +171,10 @@ EOS
   it "fetches uncached references" do
     system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
     db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
-    db.save_entry("ISO 123:2001",
+    db.save_entry("ISO(ISO 123:2001)",
         {
           "fetched" => Date.today.to_s,
-          "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
+          "bib" => IsoBibItem.from_xml(ISO_123_DATED)
         }
       )
 
@@ -189,12 +189,12 @@ EOS
       * [[[iso124,ISO 124:2014]]] _Standard_
     INPUT
 
-    entry = db.load_entry("ISO 123:2001")
+    entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry["fetched"].to_s).to eq(Date.today.to_s)
-    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
-    entry = db.load_entry("ISO 124:2014")
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_DATED)
+    entry = db.load_entry("ISO(ISO 124:2014)")
     expect(entry["fetched"].to_s).to eq(Date.today.to_s)
-    expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_124_DATED)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_124_DATED)
 
     system "rm ~/.relaton-bib.pstore"
     system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
@@ -221,9 +221,9 @@ EOS
       * [[[iso123,ISO 123]]] _Standard_
     INPUT
 
-        entry = db.load_entry("ISO 123")
+        entry = db.load_entry("ISO(ISO 123)")
             expect(entry["fetched"].to_s).to eq(Date.today.to_s)
-    expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_UNDATED)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_UNDATED)
 
     system "rm ~/.relaton-bib.pstore"
     system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
@@ -233,10 +233,10 @@ EOS
     system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
 
             db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
-            db.save_entry("ISO 123:2001",
+            db.save_entry("ISO(ISO 123:2001)",
         {
           "fetched" => (Date.today - 90),
-          "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
+          "bib" => IsoBibItem.from_xml(ISO_123_DATED)
         }
       )
 
@@ -248,9 +248,9 @@ EOS
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
 
-            entry = db.load_entry("ISO 123:2001")
+            entry = db.load_entry("ISO(ISO 123:2001)")
             expect(entry["fetched"].to_s).to eq((Date.today - 90).to_s)
-    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_DATED)
 
     system "rm ~/.relaton-bib.pstore"
     system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
@@ -261,13 +261,13 @@ EOS
     system "rm test.relaton.pstore"
 
     db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
-    db.save_entry("ISO 123:2001",
+    db.save_entry("ISO(ISO 123:2001)",
         {
           "fetched" => Date.today,
-          "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
+          "bib" => IsoBibItem.from_xml(ISO_123_DATED)
         }
       )
-    db.save_entry("ISO 124",
+    db.save_entry("ISO(ISO 124)",
         {
           "fetched" => Date.today,
           "bib" => IsoBibItem.from_xml(ISO_124_SHORT)
@@ -275,7 +275,7 @@ EOS
       )
 
     localdb = Relaton::Db.new "test.relaton.pstore", nil
-    localdb.save_entry("ISO 124",
+    localdb.save_entry("ISO(ISO 124)",
         {
           "fetched" => Date.today,
           "bib" => IsoBibItem.from_xml(ISO_124_SHORT_ALT)
@@ -287,7 +287,7 @@ EOS
 [bibliography]
 == Normative References
 
-* [[[ISO123,ISO 123:2001]]] _Standard_
+* [[[ISO123-2001,ISO 123:2001]]] _Standard_
 * [[[ISO124,ISO 124]]] _Standard_
 EOS
 
@@ -298,7 +298,7 @@ EOS
 <bibliography>
 <references id="_" obligation="informative">
  <title>Normative References</title>
- #{ISO_123_SHORT}
+ #{ISO_123_DATED}
  #{ISO_124_SHORT_ALT}
 </references></bibliography>
 </standard-document>
@@ -306,10 +306,10 @@ EOS
 
     expect(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))).to be_equivalent_to(output)
 
-    expect(db.load_entry("ISO 123:2001")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
-    expect(db.load_entry("ISO 124")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT)
-    expect(localdb.load_entry("ISO 123:2001")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
-    expect(localdb.load_entry("ISO 124")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT_ALT)
+    expect(db.load_entry("ISO(ISO 123:2001)")["bib"].to_xml).to be_equivalent_to(ISO_123_DATED)
+    expect(db.load_entry("ISO(ISO 124)")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT)
+    expect(localdb.load_entry("ISO(ISO 123:2001)")["bib"].to_xml).to be_equivalent_to(ISO_123_DATED)
+    expect(localdb.load_entry("ISO(ISO 124)")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT_ALT)
 
     system "rm ~/.relaton-bib.pstore"
     system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
@@ -318,15 +318,15 @@ EOS
 private
 
   def mock_isobib_get_123
-    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", "2001", {}).and_return(IsoBibItem.from_xml(ISOBIB_123_DATED))
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", "2001", {}).and_return(IsoBibItem.from_xml(ISO_123_DATED))
   end
 
   def mock_isobib_get_123_undated
-    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}).and_return(IsoBibItem.from_xml(ISOBIB_123_UNDATED))
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}).and_return(IsoBibItem.from_xml(ISO_123_UNDATED))
   end
 
   def mock_isobib_get_124
-    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}).and_return(IsoBibItem.from_xml(ISOBIB_124_DATED))
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}).and_return(IsoBibItem.from_xml(ISO_124_DATED))
   end
 
 end

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe Asciidoctor::Standoc do
         <title>Normative References</title>
         <bibitem id="iso123" type="standard">
           <title format="text/plain">Standard</title>
-  <docidentifier>ISO 123</docidentifier>
+  <docidentifier>ISO 123:1066-1067</docidentifier>
   <date type="published">
     <from>1066</from>
     <to>1067</to>
@@ -288,7 +288,7 @@ RSpec.describe Asciidoctor::Standoc do
          <title>Normative References</title>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123</docidentifier>
+         <docidentifier>ISO 123:--</docidentifier>
          <date type="published">
            <on>--</on>
          </date>
@@ -322,7 +322,7 @@ RSpec.describe Asciidoctor::Standoc do
         <title>Normative References</title>
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123</docidentifier>
+         <docidentifier>ISO 123:1066 (all parts)</docidentifier>
          <date type="published">
            <on>1066</on>
          </date>
@@ -347,7 +347,7 @@ RSpec.describe Asciidoctor::Standoc do
       [bibliography]
       == Normative References
 
-      * [[[iso123,IETF RFC 8341]]], _Standard_
+      * [[[iso123,IETF(RFC 8341)]]], _Standard_
 
       == Clause 4
 
@@ -358,7 +358,7 @@ RSpec.describe Asciidoctor::Standoc do
 <clause id="_" inline-header="false" obligation="normative">
   <title>Clause 4</title>
   <p id="_">
-  <eref type="inline" bibitemid="iso123" citeas="RFC 8341:2018"/>
+  <eref type="inline" bibitemid="iso123" citeas="RFC 8341"/>
 </p>
 </clause>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: iev
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: |
   metanorma-standoc realises standards following the Metanorma standoc model