asciidoctor-iso 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ed4e5fbc863973f1ba6574f497bbc29f7e7512f8f3289d508482eb2910da16c
-  data.tar.gz: c3c2fa81e796ca9b7a5476252e1bd8758769390ce56fb269d3aa39d2f71daf7a
+  metadata.gz: fb1e34c74de1fc1690bc277c1a0deaa90e165dec375664f043c1427b3a053c98
+  data.tar.gz: 164743809557dba029c72bc607fdbade46a0ca3e2c848db55ec037362251fa3a
 SHA512:
-  metadata.gz: 2d4c27a6911320c11976fe46f2c2bd20789921534c1617324d7fcad6c804d467540fd1242a5e61ef482f71a1b882ea019838a92ca014dad03ce504c37422fae7
-  data.tar.gz: 44287b9e26b88050045c7b5f03d6e95c8629ad10309eeafe391c18dace5f33bfa2bff626f83e872da415030a384e91240f6c7276a28334f9719474557284db65
+  metadata.gz: e0e418454bf54ba9af399448241afbe8cb0aad8c558f668a8535cdaeeffc86a37b9dc4ac50eec8160a174cbc7cb479cef7c19576a2878cd56250db39c255f573
+  data.tar.gz: b170a8f58c5507c2e71573371940f2f19c7c4379713984482db90afaffce6e76f4b476f193e998c135a00da23d153145e3d0ed286786fbdd489f0123e4c0eeaa

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    asciidoctor-iso (0.9.0)
+    asciidoctor-iso (0.9.2)
       asciidoctor (~> 1.5.7)
       iso-bib-item (~> 0.1.6)
-      isobib (~> 0.1.6)
+      isobib (~> 0.1.8)
       isodoc (>= 0.8)
       ruby-jing
 
@@ -106,11 +106,11 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     image_size (2.0.0)
-    iso-bib-item (0.1.8)
+    iso-bib-item (0.1.9)
       duplicate
       isoics (~> 0.1.6)
       nokogiri
-    isobib (0.1.7)
+    isobib (0.1.8)
       algoliasearch
       iso-bib-item (~> 0.1.2)
     isodoc (0.8)
@@ -135,11 +135,11 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.2.2)
+    metanorma (0.2.4)
       asciidoctor-csand (>= 0.3.0)
       asciidoctor-csd (>= 0.4.0)
       asciidoctor-gb (>= 0.3.0)
-      asciidoctor-iso (>= 0.9.0)
+      asciidoctor-iso (>= 0.9.1)
       asciidoctor-m3d (>= 0.3.1)
       asciidoctor-rfc (>= 0.9.0)
       asciidoctor-rsd (>= 0.3.0)
@@ -228,7 +228,7 @@ DEPENDENCIES
   equivalent-xml (~> 0.6)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
-  metanorma
+  metanorma (~> 0.2.4)
   rake (~> 12.0)
   rspec (~> 3.6)
   rubocop (~> 0.50)

data/README.adoc

@@ -564,6 +564,10 @@ items are not looked up via `isobib`, and the `isobib` caches are not used.
 If the document attribute `:no-isobib-cache:` is set, the reference details for
 items are still looked up via `isobib`, but the `isobib` caches are not used.
 
+Any entry in the cache that corresponds to an undated ISO reference fetches its details
+from the latest available entry on the ISO web site. If the entry is more than 60
+days old, it is refetched.
+
 == Document Attributes
 
 The gem relies on Asciidoctor document attributes to provide necessary

data/asciidoctor-iso.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", ">= 0.8"
-  spec.add_dependency "isobib", "~> 0.1.6"
+  spec.add_dependency "isobib", "~> 0.1.8"
   spec.add_dependency "iso-bib-item", "~> 0.1.6"
 
   spec.add_development_dependency "bundler", "~> 1.15"
@@ -43,5 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma"
+  spec.add_development_dependency "metanorma", "~> 0.2.4"
 end

data/lib/asciidoctor/iso/base.rb

@@ -71,8 +71,8 @@ module Asciidoctor
         @filename = node.attr("docfile") ?
           node.attr("docfile").gsub(/\.adoc$/, "").gsub(%r{^.*/}, "") : ""
         @no_isobib_cache = node.attr("no-isobib-cache")
-        @bibliodb = open_cache_biblio(node, true)
-        @local_bibliodb = node.attr("local-cache") ?
+        @bibdb = open_cache_biblio(node, true)
+        @local_bibdb = node.attr("local-cache") ?
           open_cache_biblio(node, false) : nil
       end
 
@@ -106,8 +106,8 @@ module Asciidoctor
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</iso-standard>"
-        save_cache_biblio(@bibliodb, true)
-        save_cache_biblio(@local_bibliodb, false)
+        save_cache_biblio(@bibdb, true)
+        save_cache_biblio(@local_bibdb, false)
         textcleanup(result.flatten * "\n")
       end
 

data/lib/asciidoctor/iso/cleanup.rb

@@ -161,7 +161,8 @@ module Asciidoctor
 
       def termdocsource_cleanup(xmldoc)
         f = xmldoc.at("//preface | //sections")
-        xmldoc.xpath("//terms/termdocsource").each do |s|
+        xmldoc.xpath("//terms/termdocsource | "\
+                     "//clause/termdocsource").each do |s|
           f.previous = s.remove
         end
       end

data/lib/asciidoctor/iso/ref.rb

@@ -87,18 +87,31 @@ module Asciidoctor
         ret
       end
 
-      def fetch_ref1(code, year, opts)
+      # => , because the hash is imported from JSON
+      def new_bibcache_entry(code, year, opts)
+        { "fetched" => Date.today, 
+          "bib" => Isobib::IsoBibliography.get(code, year, opts) }
+      end
+
+      # if cached reference is undated, expire it after 60 days
+      def is_valid_bibcache_entry?(x, year)
+        x && x.is_a?(Hash) && x&.has_key?("bib") && x&.has_key?("fetched") &&
+          (year || Date.today - Date.iso8601(x["fetched"]) < 60)
+      end
+
+      def check_bibliocache(code, year, opts)
         id = iso_id(code, year, opts[:all_parts])
-        return nil if @bibliodb.nil? # signals we will not be using isobib
-        @bibliodb[id] = Isobib::IsoBibliography.isobib_get(code, year, opts) unless @bibliodb[id]
-        @local_bibliodb[id] = @bibliodb[id] if !@local_bibliodb.nil? &&
-          !@local_bibliodb[id]
-        return @local_bibliodb[id] unless @local_bibliodb.nil?
-        @bibliodb[id]
+        return nil if @bibdb.nil? # signals we will not be using isobib
+        @bibdb[id] = nil unless is_valid_bibcache_entry?(@bibdb[id], year)
+        @bibdb[id] ||= new_bibcache_entry(code, year, opts)
+        @local_bibdb[id] = @bibdb[id] if !@local_bibdb.nil? &&
+          !is_valid_bibcache_entry?(@local_bibdb[id], year)
+        return @local_bibdb[id]["bib"] unless @local_bibdb.nil?
+        @bibdb[id]["bib"]
       end
 
       def fetch_ref(xml, code, year, **opts)
-        hit = fetch_ref1(code, year, opts)
+        hit = check_bibliocache(code, year, opts)
         return nil if hit.nil?
         xml.parent.add_child(hit)
         xml

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.9.1".freeze
+    VERSION = "0.9.3".freeze
   end
 end

data/lib/metanorma/iso/processor.rb

@@ -11,11 +11,11 @@ module Metanorma
       end
 
       def output_formats
-        {
+        super.merge(
           html: "html",
           html_alt: "alt.html",
           doc: "doc"
-        }
+        )
       end
 
       def version
@@ -34,6 +34,8 @@ module Metanorma
           IsoDoc::Iso::HtmlConvert.new(options.merge(alt: true)).convert(outname, isodoc_node)
         when :doc
           IsoDoc::Iso::WordConvert.new(options).convert(outname, isodoc_node)
+        else
+          super
         end
       end
 

data/spec/asciidoctor-iso/isobib_cache_spec.rb

@@ -2,6 +2,41 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::ISO 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>
+</bibitem>
+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>
+</bibitem>
+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>
+</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>  <source type="src">https://www.iso.org/standard/23281.html</source>  <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>  <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>  <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>        <abbreviation></abbreviation>      </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      <docidentifier>ISO 123:1985</docidentifier>    </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      <docidentifier>ISO 123:2001</docidentifier>    </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>  <source type="src">https://www.iso.org/standard/23281.html</source>  <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>  <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>  <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>        <abbreviation></abbreviation>      </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      <docidentifier>ISO 123:1985</docidentifier>    </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      <docidentifier>ISO 123:2001</docidentifier>    </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>  <source type="src">https://www.iso.org/standard/61884.html</source>  <source type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</source>  <source type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</source>  <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>        <abbreviation></abbreviation>      </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 124:2011</formattedref>      <docidentifier>ISO 124:2011</docidentifier>    </bibitem>  </relation></bibitem>
+EOS
+
+
   it "does not activate biblio caches if isobib disabled" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
     system "rm -f test.relaton.json"
@@ -10,7 +45,7 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Normative References
 
-      * [[[iso123,ISO 123]]] _Standard_
+      * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
     expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be false
     expect(File.exist?("test.relaton.json")).to be false
@@ -23,12 +58,13 @@ RSpec.describe Asciidoctor::ISO do
   it "does not activate biblio caches if isobib caching disabled" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
     system "rm -f test.relaton.json"
+    mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{ISOBIB_BLANK_HDR}
       [bibliography]
       == Normative References
 
-      * [[[iso123,ISO 123]]] _Standard_
+      * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
     expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be false
     expect(File.exist?("test.relaton.json")).to be false
@@ -39,19 +75,24 @@ RSpec.describe Asciidoctor::ISO do
 
   it "flushes biblio caches" do
     system "cp ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system "echo 'XXX' > ~/.relaton-bib.json"
+
+    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
+      f.write "XXX"
+    end
+
+    mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{FLUSH_CACHE_ISOBIB_BLANK_HDR}
       [bibliography]
       == Normative References
 
-      * [[[iso123,ISO 123]]] _Standard_
+      * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
     expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
-    json = File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8")
-    expect(json).to be_equivalent_to <<~"OUTPUT"
-    {"ISO 123":"<bibitem type=\\"international-standard\\" id=\\"ISO123\\">\\n  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Rubber latex -- Sampling</title>\\n  <title format=\\"text/plain\\" language=\\"fr\\" script=\\"Latn\\">Latex de caoutchouc -- ?chantillonnage</title>\\n  <source type=\\"src\\">https://www.iso.org/standard/23281.html</source>\\n  <source type=\\"obp\\">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>\\n  <source type=\\"rss\\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>\\n  <docidentifier>ISO 123</docidentifier>\\n  <date type=\\"published\\">\\n    <on>2001</on>\\n  </date>\\n  <contributor>\\n    <role type=\\"publisher\\"/>\\n    <organization>\\n      <name>International Organization for Standardization</name>\\n      <abbreviation>ISO</abbreviation>\\n      <uri>www.iso.org</uri>\\n    </organization>\\n  </contributor>\\n  <edition>3</edition>\\n  <language>en</language>\\n  <language>fr</language>\\n  <script>Latn</script>\\n  <status>Published</status>\\n  <copyright>\\n    <from>2001</from>\\n    <owner>\\n      <organization>\\n        <name>ISO</name>\\n        <abbreviation></abbreviation>\\n      </organization>\\n    </owner>\\n  </copyright>\\n  <relation type=\\"obsoletes\\">\\n    <bibitem>\\n      <formattedref>ISO 123:1985</formattedref>\\n      <docidentifier>ISO 123:1985</docidentifier>\\n    </bibitem>\\n  </relation>\\n  <relation type=\\"updates\\">\\n    <bibitem>\\n      <formattedref>ISO 123:2001</formattedref>\\n      <docidentifier>ISO 123:2001</docidentifier>\\n    </bibitem>\\n  </relation>\\n</bibitem>"}
-    OUTPUT
+
+    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
+    expect(json["ISO 123:2001"]["fetched"]).to eq(Date.today.to_s)
+    expect(json["ISO 123:2001"]["bib"]).to be_equivalent_to(ISOBIB_123_DATED)
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
@@ -61,104 +102,220 @@ RSpec.describe Asciidoctor::ISO do
   it "activates global cache" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
     system "rm -f test.relaton.json"
+    mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{CACHED_ISOBIB_BLANK_HDR}
       [bibliography]
       == Normative References
 
-      * [[[iso123,ISO 123]]] _Standard_
+      * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
     expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
     expect(File.exist?("test.relaton.json")).to be false
 
-    json = File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8")
-    expect(json).to match(%r{"ISO 123"})
+    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
+    expect(json).to have_key("ISO 123:2001")
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
   end
 
-    it "activates local cache" do
+  it "activates local cache" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
     system "rm -f test.relaton.json"
+    mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{LOCAL_CACHED_ISOBIB_BLANK_HDR}
       [bibliography]
       == Normative References
 
-      * [[[iso123,ISO 123]]] _Standard_
+      * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
     expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
     expect(File.exist?("test.relaton.json")).to be true
 
-    json = File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8")
-    expect(json).to match(%r{"ISO 123"})
-    json = File.read("test.relaton.json", encoding: "utf-8")
-    expect(json).to match(%r{"ISO 123"})
+    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
+    expect(json).to have_key("ISO 123:2001")
+
+    json = JSON.parse(File.read("test.relaton.json", encoding: "utf-8"))
+    expect(json).to have_key("ISO 123:2001")
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
   end
 
+
   it "fetches uncached references" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system %q(echo '{"ISO 123":"<bibitem type=\\"international-standard\\" id=\\"ISO123\\">  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Rubber latex -- Sampling</title><docidentifier>ISO 123</docidentifier></bibitem>"}' > ~/.relaton-bib.json)
+
+    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
+      f.write({
+        "ISO 123:2001": {
+          "fetched": Date.today.to_s,
+          "bib": ISO_123_SHORT
+        }
+      }.to_json)
+    end
+
+    mock_isobib_get_124
 
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{CACHED_ISOBIB_BLANK_HDR}
       [bibliography]
       == Normative References
 
-      * [[[iso123,ISO 123]]] _Standard_
-      * [[[iso124,ISO 124]]] _Standard_
+      * [[[iso123,ISO 123:2001]]] _Standard_
+      * [[[iso124,ISO 124:2014]]] _Standard_
     INPUT
 
-    json = File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8")
-    expect(json).to be_equivalent_to <<~"OUTPUT"
-{"ISO 123":"<bibitem type=\\"international-standard\\" id=\\"ISO123\\">  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Rubber latex -- Sampling</title><docidentifier>ISO 123</docidentifier></bibitem>","ISO 124":"<bibitem type=\\"international-standard\\" id=\\"ISO124\\">\\n  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Latex, rubber -- Determination of total solids content</title>\\n  <title format=\\"text/plain\\" language=\\"fr\\" script=\\"Latn\\">Latex de caoutchouc -- Détermination des matières solides totales</title>\\n  <source type=\\"src\\">https://www.iso.org/standard/61884.html</source>\\n  <source type=\\"obp\\">https://www.iso.org/obp/ui/#!iso:std:61884:en</source>\\n  <source type=\\"rss\\">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</source>\\n  <docidentifier>ISO 124</docidentifier>\\n  <date type=\\"published\\">\\n    <on>2014</on>\\n  </date>\\n  <contributor>\\n    <role type=\\"publisher\\"/>\\n    <organization>\\n      <name>International Organization for Standardization</name>\\n      <abbreviation>ISO</abbreviation>\\n      <uri>www.iso.org</uri>\\n    </organization>\\n  </contributor>\\n  <edition>7</edition>\\n  <language>en</language>\\n  <language>fr</language>\\n  <script>Latn</script>\\n  <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>\\n  <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>\\n  <status>Published</status>\\n  <copyright>\\n    <from>2014</from>\\n    <owner>\\n      <organization>\\n        <name>ISO</name>\\n        <abbreviation></abbreviation>\\n      </organization>\\n    </owner>\\n  </copyright>\\n  <relation type=\\"obsoletes\\">\\n    <bibitem>\\n      <formattedref>ISO 124:2011</formattedref>\\n      <docidentifier>ISO 124:2011</docidentifier>\\n    </bibitem>\\n  </relation>\\n</bibitem>"}
-	OUTPUT
+    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
+    expect(json["ISO 123:2001"]["fetched"]).to eq(Date.today.to_s)
+    expect(json["ISO 124:2014"]["fetched"]).to eq(Date.today.to_s)
+    expect(json["ISO 123:2001"]["bib"]).to be_equivalent_to(ISO_123_SHORT)
+    expect(json["ISO 124:2014"]["bib"]).to be_equivalent_to(ISOBIB_124_DATED)
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
   end
 
-
-  it "prioritises local over global cache values" do
+  it "expires stale undated references" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system "rm test.relaton.json"
-    system %q(echo '{"ISO 123":"<bibitem type=\\"international-standard\\" id=\\"ISO123\\">  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Rubber latex -- Sampling</title><docidentifier>ISO 123</docidentifier></bibitem>", "ISO 124":"<bibitem type=\\"international-standard\\" id=\\"ISO124\\">  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Latex, rubber -- Determination of total solids content</docidentifier></bibitem>"}' > ~/.relaton-bib.json)
-    system %q(echo '{"ISO 124":"<bibitem type=\\"international-standard\\" id=\\"ISO124\\">  <title format=\\"text/plain\\" language=\\"fr\\" script=\\"Latn\\">Latex de caoutchouc -- Détermination des matières solides totales</title><docidentifier>ISO 124</docidentifier></bibitem>"}' > test.relaton.json)
 
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{LOCAL_CACHED_ISOBIB_BLANK_HDR}
+    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
+      f.write({
+        "ISO 123": {
+          "fetched": (Date.today - 90).to_s,
+          "bib": ISO_123_SHORT
+        }
+      }.to_json)
+    end
+
+    mock_isobib_get_123_undated
+
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+      #{CACHED_ISOBIB_BLANK_HDR}
       [bibliography]
       == Normative References
 
       * [[[iso123,ISO 123]]] _Standard_
-      * [[[iso124,ISO 124]]] _Standard_
     INPUT
-     #{BLANK_HDR}
-       <sections>
-         
-       </sections><bibliography><references id="_" obligation="informative">
-         <title>Normative References</title>
-         <bibitem type="international-standard" id="iso123">  <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title><docidentifier>ISO 123</docidentifier></bibitem>
-         <bibitem type="international-standard" id="iso124">  <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Détermination des matières solides totales</title><docidentifier>ISO 124</docidentifier></bibitem>
-       </references></bibliography>
-       </iso-standard>
-    OUTPUT
-
-    json = File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8")
-    expect(json).to be_equivalent_to <<~"OUTPUT"
-{"ISO 123":"<bibitem type=\\"international-standard\\" id=\\"ISO123\\">  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Rubber latex -- Sampling</title><docidentifier>ISO 123</docidentifier></bibitem>","ISO 124":"<bibitem type=\\"international-standard\\" id=\\"ISO124\\">  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Latex, rubber -- Determination of total solids content</docidentifier></bibitem>"}
-OUTPUT
-    json = File.read("test.relaton.json", encoding: "utf-8")
-    expect(json).to be_equivalent_to <<~"OUTPUT"
-{"ISO 124":"<bibitem type=\\"international-standard\\" id=\\"ISO124\\">  <title format=\\"text/plain\\" language=\\"fr\\" script=\\"Latn\\">Latex de caoutchouc -- Détermination des matières solides totales</title><docidentifier>ISO 124</docidentifier></bibitem>","ISO 123":"<bibitem type=\\"international-standard\\" id=\\"ISO123\\">  <title format=\\"text/plain\\" language=\\"en\\" script=\\"Latn\\">Rubber latex -- Sampling</title><docidentifier>ISO 123</docidentifier></bibitem>"}
-OUTPUT
+
+    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
+    expect(json["ISO 123"]["fetched"]).to eq(Date.today.to_s)
+    expect(json["ISO 123"]["bib"]).to be_equivalent_to(ISOBIB_123_UNDATED)
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
-end
+  end
+
+  it "does not expire stale dated references" do
+    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
+
+    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
+      f.write({
+        "ISO 123:2001": {
+          "fetched": (Date.today - 90).to_s,
+          "bib": ISO_123_SHORT
+        }
+      }.to_json)
+    end
+
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+      #{CACHED_ISOBIB_BLANK_HDR}
+      [bibliography]
+      == Normative References
+
+      * [[[iso123,ISO 123:2001]]] _Standard_
+    INPUT
+
+    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
+    expect(json["ISO 123:2001"]["fetched"]).to eq((Date.today - 90).to_s)
+    expect(json["ISO 123:2001"]["bib"]).to be_equivalent_to(ISO_123_SHORT)
+
+    system "rm ~/.relaton-bib.json"
+    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+  end
+
+  it "prioritises local over global cache values" do
+    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
+    system "rm test.relaton.json"
+
+    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
+      f.write({
+        "ISO 123:2001": {
+          "fetched": Date.today.to_s,
+          "bib": ISO_123_SHORT
+        },
+        "ISO 124": {
+          "fetched": Date.today.to_s,
+          "bib": ISO_124_SHORT
+        }
+      }.to_json)
+    end
+
+    File.open("test.relaton.json", "w") do |f|
+      f.write({
+        "ISO 124": {
+          "fetched": Date.today.to_s,
+          "bib": ISO_124_SHORT_ALT
+        }
+      }.to_json)
+    end
+
+    input = <<~EOS
+#{LOCAL_CACHED_ISOBIB_BLANK_HDR}
+  [bibliography]
+  == Normative References
+
+  * [[[iso123,ISO 123:2001]]] _Standard_
+  * [[[iso124,ISO 124]]] _Standard_
+EOS
+
+    output = <<~EOS
+#{BLANK_HDR}
+<sections>
+</sections>
+<bibliography>
+<references id="_" obligation="informative">
+ <title>Normative References</title>
+ #{ISO_123_SHORT}
+ #{ISO_124_SHORT_ALT}
+</references></bibliography>
+</iso-standard>
+EOS
+
+    expect(strip_guid(Asciidoctor.convert(input, backend: :iso, header_footer: true))).to be_equivalent_to(output)
+
+    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
+
+    expect(json["ISO 123:2001"]["fetched"]).to eq(Date.today.to_s)
+    expect(json["ISO 124"]["fetched"]).to eq(Date.today.to_s)
+    expect(json["ISO 123:2001"]["bib"]).to be_equivalent_to(ISO_123_SHORT)
+    expect(json["ISO 124"]["bib"]).to be_equivalent_to(ISO_124_SHORT)
+
+    json_local = JSON.parse(File.read("test.relaton.json", encoding: "utf-8"))
+
+    expect(json_local["ISO 123:2001"]["fetched"]).to eq(Date.today.to_s)
+    expect(json_local["ISO 124"]["fetched"]).to eq(Date.today.to_s)
+    expect(json_local["ISO 123:2001"]["bib"]).to be_equivalent_to(ISO_123_SHORT)
+    expect(json_local["ISO 124"]["bib"]).to be_equivalent_to(ISO_124_SHORT_ALT)
+
+    system "rm ~/.relaton-bib.json"
+    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+  end
+
+private
+
+  def mock_isobib_get_123
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", "2001", {}).and_return(ISOBIB_123_DATED)
+  end
+
+  def mock_isobib_get_123_undated
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}).and_return(ISOBIB_123_UNDATED)
+  end
+
+  def mock_isobib_get_124
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}).and_return(ISOBIB_124_DATED)
+  end
 
 end

data/spec/asciidoctor-iso/refs_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe Asciidoctor::ISO do
 
 
   it "fetches simple ISO reference" do
-    #stub_fetch_ref
+    mock_isobib_get_123
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ISOBIB_BLANK_HDR}
       [bibliography]
@@ -75,125 +75,58 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative">
-        <title>Normative References</title>
-        <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>
-        <source type="src">https://www.iso.org/standard/23281.html</source>
-        <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>
-        <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>
-        <docidentifier>ISO 123</docidentifier>
-        <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>
-              <abbreviation/>
-            </organization>
-          </owner>
-        </copyright>
-        <relation type="obsoletes">
-          <bibitem>
-            <formattedref>ISO 123:1985</formattedref>
-            <docidentifier>ISO 123:1985</docidentifier>
-          </bibitem>
-        </relation>
-        <relation type="updates">
-          <bibitem>
-            <formattedref>ISO 123:2001</formattedref>
-            <docidentifier>ISO 123:2001</docidentifier>
-          </bibitem>
-        </relation>
-        <ics>
-          <code>83.040.10</code>
-          <text>Latex and raw rubber</text>
-        </ics>
-        <relation type="instance">
-  <bibitem type="international-standard">
-    <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>
-    <source type="src">https://www.iso.org/standard/23281.html</source>
-    <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>
-    <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>
-    <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>
-          <abbreviation/>
-        </organization>
-      </owner>
-    </copyright>
-    <relation type="obsoletes">
-      <bibitem>
-        <formattedref>ISO 123:1985</formattedref>
-        <docidentifier>ISO 123:1985</docidentifier>
-      </bibitem>
-    </relation>
-    <relation type="updates">
-      <bibitem>
-        <formattedref>ISO 123:2001</formattedref>
-        <docidentifier>ISO 123:2001</docidentifier>
-      </bibitem>
-    </relation>
-    <ics>
-      <code>83.040.10</code>
-      <text>Latex and raw rubber</text>
-    </ics>
-  </bibitem>
-</relation>
-      </bibitem>
-      </references>
-      </bibliography>
-      </iso-standard>
+             </sections><bibliography><references id="_" obligation="informative">
+         <title>Normative References</title>
+         <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>
+         <source type="src">https://www.iso.org/standard/23281.html</source>
+         <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>
+         <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>
+         <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>
+               <abbreviation/>
+             </organization>
+           </owner>
+         </copyright>
+         <relation type="obsoletes">
+           <bibitem>
+             <formattedref>ISO 123:1985</formattedref>
+             <docidentifier>ISO 123:1985</docidentifier>
+           </bibitem>
+         </relation>
+         <relation type="updates">
+           <bibitem>
+             <formattedref>ISO 123:2001</formattedref>
+             <docidentifier>ISO 123:2001</docidentifier>
+           </bibitem>
+         </relation>
+       </bibitem>
+       </references></bibliography>
+       </iso-standard>
     OUTPUT
   end
 
-    it "fetches simple ISO reference" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system "rm -f test.relation.json"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-      #{CACHED_ISOBIB_BLANK_HDR}
-      [bibliography]
-      == Normative References
-
-      * [[[iso123,ISO 123]]] _Standard_
-    INPUT
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
-    end
-
-
   it "processes simple IEC reference" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
@@ -224,8 +157,8 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes dated ISO reference and joint ISO/IEC references" do
-    #stub_fetch_ref
-
+    mock_isobib_get_iec12382
+    mock_isobib_get_124
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ISOBIB_BLANK_HDR}
       [bibliography]
@@ -318,7 +251,6 @@ RSpec.describe Asciidoctor::ISO do
          <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>
@@ -543,4 +475,131 @@ RSpec.describe Asciidoctor::ISO do
       </iso-standard>
     OUTPUT
   end
+
+  private
+
+      private
+
+    def mock_isobib_get_123
+      expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}) do
+        <<~"OUTPUT"
+        <bibitem type=\"international-standard\" id=\"ISO123\">\n  <title format=\"text/plain\" language=\"en\" script=\"Latn\">Rubber latex -- Sampling</title>\n  <title format=\"text/plain\" language=\"fr\" script=\"Latn\">Latex de caoutchouc -- ?chantillonnage</title>\n  <source type=\"src\">https://www.iso.org/standard/23281.html</source>\n  <source type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>\n  <source type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>\n  <docidentifier>ISO 123</docidentifier>\n  <date type=\"published\">\n    <on>2001</on>\n  </date>\n  <contributor>\n    <role type=\"publisher\"/>\n    <organization>\n      <name>International Organization for Standardization</name>\n      <abbreviation>ISO</abbreviation>\n      <uri>www.iso.org</uri>\n    </organization>\n  </contributor>\n  <edition>3</edition>\n  <language>en</language>\n  <language>fr</language>\n  <script>Latn</script>\n  <status>Published</status>\n  <copyright>\n    <from>2001</from>\n    <owner>\n      <organization>\n        <name>ISO</name>\n        <abbreviation></abbreviation>\n      </organization>\n    </owner>\n  </copyright>\n  <relation type=\"obsoletes\">\n    <bibitem>\n      <formattedref>ISO 123:1985</formattedref>\n      <docidentifier>ISO 123:1985</docidentifier>\n    </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem>\n      <formattedref>ISO 123:2001</formattedref>\n      <docidentifier>ISO 123:2001</docidentifier>\n    </bibitem>\n  </relation>\n</bibitem>
+        OUTPUT
+      end
+    end
+
+    def mock_isobib_get_124
+      expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}) do
+        <<~"OUTPUT"
+                 <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>
+         <source type="src">https://www.iso.org/standard/61884.html</source>
+         <source type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</source>
+         <source type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</source>
+         <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>
+         <status>Published</status>
+         <copyright>
+           <from>2014</from>
+           <owner>
+             <organization>
+               <name>ISO</name>
+               <abbreviation/>
+             </organization>
+           </owner>
+         </copyright>
+         <relation type="obsoletes">
+           <bibitem>
+             <formattedref>ISO 124:2011</formattedref>
+             <docidentifier>ISO 124:2011</docidentifier>
+           </bibitem>
+         </relation>
+        <ics>
+          <code>83.040.10</code>
+          <text>Latex and raw rubber</text>
+        </ics>
+      </bibitem>
+        OUTPUT
+      end
+    end
+
+    def mock_isobib_get_iec12382
+      expect(Isobib::IsoBibliography).to receive(:get).with("ISO/IEC TR 12382", "1992", {}) do
+      <<~"OUTPUT"
+      <bibitem type="international-standard" id="iso123">
+         <title format="text/plain" language="en" script="Latn">Permuted index of the vocabulary of information technology</title>
+         <title format="text/plain" language="fr" script="Latn">Index permuté du vocabulaire des technologies de l'information</title>
+         <source type="src">https://www.iso.org/standard/21071.html</source>
+         <source type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</source>
+         <source type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</source>
+         <docidentifier>ISO/IEC 12382</docidentifier>
+         <date type="published">
+           <on>1992</on>
+         </date>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+             <abbreviation>ISO</abbreviation>
+             <uri>www.iso.org</uri>
+           </organization>
+         </contributor>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Electrotechnical Commission</name>
+             <abbreviation>IEC</abbreviation>
+             <uri>www.iec.ch</uri>
+           </organization>
+         </contributor>
+         <edition>2</edition>
+         <language>en</language>
+         <language>fr</language>
+         <script>Latn</script>
+         <abstract format="plain" language="en" script="Latn">Contains a permuted index of all terms included in the parts 1 - 28 of ISO 2382. If any of these parts has been revised, the present TR refers to the revision.</abstract>
+         <status>Published</status>
+         <copyright>
+           <from>1992</from>
+           <owner>
+             <organization>
+               <name>ISO/IEC</name>
+               <abbreviation/>
+             </organization>
+           </owner>
+         </copyright>
+         <relation type="updates">
+           <bibitem>
+             <formattedref>ISO/IEC TR 12382:1992</formattedref>
+             <docidentifier>ISO/IEC TR 12382:1992</docidentifier>
+           </bibitem>
+         </relation>
+        <ics>
+          <code>35.020</code>
+          <text>Information technology (IT) in general</text>
+        </ics>
+        <ics>
+          <code>01.040.35</code>
+          <text>Information technology (Vocabularies)</text>
+        </ics>
+       </bibitem>
+OUTPUT
+    end
+end
+
 end

data/spec/examples/rice.adoc

@@ -14,7 +14,7 @@
 :title-main-fr: Spécification et méthodes d'essai
 :title-part-fr: Riz
 :doctype: international-standard
-:docstage: 30
+:docstage: 60
 :docsubstage: 92
 :draft: 
 :technical-committee-number: 34

data/spec/examples/rice.preview.html

@@ -1854,7 +1854,7 @@ end</code></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2018-06-02 22:16:39 AEST
+Last updated 2018-06-27 19:39:11 AEST
 </div>
 </div>
 <script type="text/x-mathjax-config">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-iso
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: iso-bib-item
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +224,16 @@ dependencies:
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.4
 description: |
   asciidoctor-iso lets you write ISO standards in AsciiDoc syntax.