metanorma-standoc 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fdc800133b8aec3e4931bada3fe492a537f19c2807767b5124c8f4e39b3649b
-  data.tar.gz: ead7bf5902bd28d515fbade4cf7093e1aa88ef5a22faf179f32dae4f42c6da17
+  metadata.gz: 106a6752670de093881dbe34b54de139df3f146de2ffa569db1166734c5a4b5d
+  data.tar.gz: 3185e67d4d921ad7ab77622771fcf70209509b1808afaf651e08ee64059bb7a6
 SHA512:
-  metadata.gz: 2c51bf19c625ff3822b45ced863b8d27b231789b2d500abe68bc063b1f92be5f4f9b052bba8fc1d656386c336327ee7f08958cffefb36d12c60079a3dde725b1
-  data.tar.gz: d22b6b4f30f2cbff1b415190d12ed8c1c2d5a41d25ed5c6da7ed1d2738f5cdaa2dec58d0bb2c210ce2f2682792b4606eb48e6a47bd2f56835fee7c3b3ff2cf3c
+  metadata.gz: 343159ce51ce6952014f833e571930bf0552726d46a977fc7c0cd7809a3f9cc8f9876db85f5d8857285a038d2f57d08bc253f5a9e6a85c0429fa3db50ade2352
+  data.tar.gz: 0afdde4f04027aba0820d92765d3df52e52603b5bb12a5b2155968eea4f26f7ec25b7908f46e1adc64e728853ad9d42dd547f027f8f3de76c90cb0ae4a2837ba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.0.9)
+    metanorma-standoc (1.0.10)
       asciidoctor (~> 1.5.7)
       iev (~> 0.2.0)
       isodoc (~> 0.9.0)
@@ -36,7 +36,7 @@ GEM
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       iso-bib-item (~> 0.4.2)
-    guard (2.14.2)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -70,7 +70,7 @@ GEM
     iev (0.2.0)
       nokogiri
     image_size (2.0.0)
-    iso-bib-item (0.4.2)
+    iso-bib-item (0.4.3)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
@@ -78,7 +78,7 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.8)
+    isodoc (0.9.10)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -100,7 +100,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.0)
+    metanorma (0.3.1)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -117,7 +117,7 @@ GEM
     parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.12.1)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)

data/README.adoc

@@ -498,13 +498,14 @@ TODO: update
 
 [[cache]]
 The results of all `relaton` searches done to date, across all documents,
-are cached in the global cache file `~/.relaton-bib.pstore`,  
+are cached in the global cache file `~/.relaton/cache`,  
 so they do not need to be re-fetched each time a document is processed.
 (The web query takes a few seconds per reference.)
 
 The results of all `relaton` searches done to date in a given directory
 are stored in the same directory as the current document,
-as the file `{filename}.relaton.pstore`. The local cache overrides entries in
+by default to the file `relaton/cache`. (The filename can be overriden in
+document attributes.) The local cache overrides entries in
 the global cache, and can be manually edited. The local cache is only used
 if the `:local-cache:` or `:local-cache-only:` document attribute is set.
 
@@ -542,10 +543,12 @@ ISO and IEV references online, nor the <<cache,cache>> of `relaton` and `iev` se
 ISO and IEV references online, but do not use the <<cache,cache>> of `relaton` and `iev` searches.
 
 `:local-cache:`:: Use the local relaton and iev search caches to override the global `relaton` and `iev` search
-caches.
+caches. If a directory name is given for the attribute, that name overrides `relaton` as the
+cache name.
 
 `:local-cache-only:`:: Use the local relaton and iev search caches to the exclusion of the global `relaton` and `iev` search
-caches.
+caches. If a directory name is given for the attribute, that name overrides `relaton` as the
+cache name.
 
 `:i18nyaml:`:: Name of YAML file of internationalisation text, to use instead
 of the built-in English, French or Chinese text used to label parts of the document

data/lib/asciidoctor/standoc/base.rb

@@ -95,9 +95,8 @@ module Asciidoctor
 
       def init_bib_caches(node)
         unless (@no_isobib_cache || @no_isobib)
-          globalname = bibliocache_name(true) unless node.attr("local-cache-only")
-          localname = bibliocache_name(false) if node.attr("local-cache") ||
-            node.attr("local-cache-only")
+          globalname = global_bibliocache_name unless node.attr("local-cache-only")
+          localname = local_bibliocache_name(node.attr("local-cache") || node.attr("local-cache-only"))
           if node.attr("flush-caches")
             FileUtils.rm_f globalname unless globalname.nil?
             FileUtils.rm_f localname unless localname.nil?

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -23,7 +23,7 @@ module Asciidoctor
       def dl_table_cleanup(xmldoc)
         q = "//table/following-sibling::*[1][self::p]"
         xmldoc.xpath(q).each do |s|
-          if s.text =~ /^\s*key[^a-z]*$/i && !s.next_element.nil? && 
+          if s.text =~ /^\s*key[^a-z]*$/i && !s.next_element.nil? &&
               s.next_element.name == "dl"
             s.previous_element << s.next_element.remove
             s.remove
@@ -118,6 +118,29 @@ module Asciidoctor
           introduction = x.at("//introduction")
           preface.add_child introduction.remove if introduction
         end
+        make_abstract(x, s)
+      end
+
+      def make_abstract(x, s)
+        if x.at("//abstract[not(ancestor::bibitem)]")
+          preface = s.at("//preface") || s.add_previous_sibling("<preface/>").first
+          abstract = x.at("//abstract[not(ancestor::bibitem)]").remove
+          preface.prepend_child abstract.remove
+          bibabstract = bibabstract_location(x)
+          dupabstract = abstract.dup
+          dupabstract.traverse { |n| n.remove_attribute("id") }
+          bibabstract.next = dupabstract
+        end
+      end
+
+      def bibabstract_location(x)
+        bibabstract = x.at("//bibdata/script") || x.at("//bibdata/language") ||
+          x.at("//bibdata/contributor[not(following-sibling::contributor)]") ||
+          x.at("//bibdata/date[not(following-sibling::date)]") ||
+          x.at("//docnumber") ||
+          x.at("//bibdata/docidentifier[not(following-sibling::docidentifier)]") ||
+          x.at("//bibdata/uri[not(following-sibling::uri)]") ||
+          x.at("//bibdata/title[not(following-sibling::title)]")
       end
 
       def make_bibliography(x, s)

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -35,7 +35,7 @@ module Asciidoctor
       def xref_to_eref(x)
         x["bibitemid"] = x["target"]
         x["citeas"] = @anchors&.dig(x["target"], :xref) ||
-          warn("ISO: #{x['target']} is not a real reference!")
+          warn("#{x['target']} is not a real reference!")
         x.delete("target")
         extract_localities(x) unless x.children.empty?
       end
@@ -69,7 +69,7 @@ module Asciidoctor
       def origin_cleanup(xmldoc)
         xmldoc.xpath("//origin").each do |x|
           x["citeas"] = @anchors&.dig(x["bibitemid"], :xref) ||
-            warn("ISO: #{x['bibitemid']} is not a real reference!")
+            warn("#{x['bibitemid']} is not a real reference!")
           extract_localities(x) unless x.children.empty?
         end
       end
@@ -90,8 +90,18 @@ module Asciidoctor
         end
       end
 
-      def format_ref(ref, isopub)
-        return ref if isopub
+      def docid_prefix(prefix, docid)
+        docid = "#{prefix} #{docid}" unless omit_docid_prefix(prefix)
+        docid
+      end
+
+      def omit_docid_prefix(prefix)
+        return true if prefix.nil? || prefix.empty?
+        ["ISO", "IEC", "IEV"].include? prefix
+      end
+
+      def format_ref(ref, type, isopub)
+        return docid_prefix(type, ref) if isopub
         return "[#{ref}]" if /^\d+$/.match(ref) && !/^\[.*\]$/.match(ref)
         ref
       end
@@ -106,7 +116,7 @@ module Asciidoctor
         xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
           isopub = ref.at(ISO_PUBLISHER_XPATH)
           docid = ref.at("./docidentifier[not(@type = 'DOI')]")
-          reference = format_ref(docid.text, isopub)
+          reference = format_ref(docid.text, docid["type"], isopub)
           @anchors[ref["id"]] = { xref: reference }
         end
       end

data/lib/asciidoctor/standoc/ref.rb

@@ -194,9 +194,14 @@ module Asciidoctor
         end.join("\n")
       end
 
-      def bibliocache_name(global)
-        global ?  "#{Dir.home}/.relaton-bib.pstore" :
-          "#{@filename}.relaton.pstore"
+      def global_bibliocache_name
+        "#{Dir.home}/.relaton/cache"
+      end
+
+      def local_bibliocache_name(cachename)
+        return nil if cachename.nil?
+        cachename = "relaton" if cachename.empty?
+        "#{cachename}/cache"
       end
 
       def ievcache_name(global)

data/lib/asciidoctor/standoc/section.rb

@@ -56,6 +56,8 @@ module Asciidoctor
             elsif @biblio then bibliography_parse(a, xml, node)
             elsif node.attr("style") == "bibliography" && node.level == 1
               bibliography_parse(a, xml, node)
+            elsif node.attr("style") == "abstract" 
+              abstract_parse(a, xml, node)
             elsif node.attr("style") == "appendix" && node.level == 1
               annex_parse(a, xml, node)
             else
@@ -75,6 +77,12 @@ module Asciidoctor
                              end
       end
 
+      def abstract_parse(attrs, xml, node)
+        xml.abstract **attr_code(attrs) do |xml_section|
+          xml_section << node.content
+        end
+      end
+
       def clause_parse(attrs, xml, node)
         attrs["inline-header".to_sym] = node.option? "inline-header"
         attrs[:level] = node.attr("level")

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.9".freeze
+    VERSION = "1.0.10".freeze
   end
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -155,7 +155,7 @@ RSpec.describe Asciidoctor::Standoc do
   end
 
   it "processes complex metadata" do
-    expect(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).sub(%r{</bibdata>.*$}m, "</bibdata>")).to be_equivalent_to <<~'OUTPUT'
       = Document title
       Author
       :docfile: test.adoc
@@ -173,6 +173,12 @@ RSpec.describe Asciidoctor::Standoc do
       :pdf-uri: D
       :doc-uri: E
       :relaton-uri: F
+
+      [abstract]
+      == Abstract
+      This is the abstract of the document
+
+      This is the second paragraph of the abstract of the document.
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <standard-document xmlns="http://riboseinc.com/isoxml">
@@ -223,6 +229,8 @@ RSpec.describe Asciidoctor::Standoc do
          </contributor>
          <language>el</language>
          <script>Grek</script>
+         <abstract><p id="_">This is the abstract of the document</p>
+<p id="_">This is the second paragraph of the abstract of the document.</p></abstract>
          <status format="plain">published</status>
          <copyright>
            <from>2018</from>
@@ -252,8 +260,6 @@ RSpec.describe Asciidoctor::Standoc do
            <technical-committee/>
          </editorialgroup>
        </bibdata>
-       <sections/>
-       </standard-document>
     OUTPUT
   end
 

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -808,10 +808,10 @@ r = 1 %</stem>
 
   it "separates IEV citations by top-level clause" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
     FileUtils.rm_rf File.expand_path("~/.iev.pstore1")
     FileUtils.mv File.expand_path("~/.iev.pstore"), File.expand_path("~/.iev.pstore1"), force: true
-    FileUtils.rm_rf "test.relaton.pstore"
+    FileUtils.rm_rf "relaton/cache"
     FileUtils.rm_rf "test.iev.pstore"
     # mock_iecbib_get_iec60050_102_01
     # mock_iecbib_get_iec60050_103_01
@@ -961,8 +961,8 @@ r = 1 %</stem>
     end
     FileUtils.rm_rf File.expand_path("~/.iev.pstore")
     FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev.pstore"), force: true
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
   private

data/spec/asciidoctor-standoc/isobib_cache_spec.rb

@@ -4,6 +4,15 @@ require "fileutils"
 
 RSpec.describe Asciidoctor::Standoc do
 
+  IETF_123_SHORT = <<~EOS
+<bibitem type="international-standard" id="IETF123">
+  <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>
+  <docidentifier type="IETF">RFC 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>
+EOS
+
   ISO_123_SHORT = <<~EOS
 <bibitem type="international-standard" id="ISO123">
   <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>
@@ -58,10 +67,10 @@ EOS
 
   it "does not activate biblio caches if isobib disabled" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
     FileUtils.rm_rf File.expand_path("~/.iev.pstore1")
     FileUtils.mv File.expand_path("~/.iev.pstore"), File.expand_path("~/.iev.pstore1"), force: true
-    FileUtils.rm_rf "test.relaton.pstore"
+    FileUtils.rm_rf "relaton/cache"
     FileUtils.rm_rf "test.iev.pstore"
     Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
       #{ASCIIDOC_BLANK_HDR}
@@ -70,23 +79,23 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be false
+    expect(File.exist?("#{Dir.home}/.relaton/cache")).to be false
     expect(File.exist?("#{Dir.home}/.iev.pstore")).to be false
-    expect(File.exist?("test.relaton.pstore")).to be false
+    expect(File.exist?("relaton/cache")).to be false
     expect(File.exist?("test.iev.pstore")).to be false
 
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
     FileUtils.rm_rf File.expand_path("~/.iev.pstore")
     FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev.pstore"), force: true
   end
 
   it "does not activate biblio caches if isobib caching disabled" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
     FileUtils.rm_rf File.expand_path("~/.iev.pstore1")
     FileUtils.mv File.expand_path("~/.iev.pstore"), File.expand_path("~/.iev.pstore1"), force: true
-    FileUtils.rm_rf "test.relaton.pstore"
+    FileUtils.rm_rf "relaton/cache"
     FileUtils.rm_rf "test.iev.pstore"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
@@ -96,19 +105,19 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be false
+    expect(File.exist?("#{Dir.home}/.relaton/cache")).to be false
     expect(File.exist?("#{Dir.home}/.iev.pstore")).to be false
-    expect(File.exist?("test.relaton.pstore")).to be false
+    expect(File.exist?("relaton/cache")).to be false
     expect(File.exist?("test.iev.pstore")).to be false
 
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
     FileUtils.rm_rf File.expand_path("~/.iev.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
     FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev.pstore"), force: true
   end
 
   it "flushes biblio caches" do
-    relaton_bib_file  = File.expand_path("~/.relaton-bib.pstore")
+    relaton_bib_file  = File.expand_path("~/.relaton/cache")
     relaton_bib_file1 = File.expand_path("~/.relaton-bib.pstore1")
     iev_file          = File.expand_path("~/.iev.pstore")
     iev_file1         = File.expand_path("~/.iev.pstore1")
@@ -117,7 +126,7 @@ EOS
     FileUtils.rm_rf iev_file1 if File.exist? iev_file1
     FileUtils.mv iev_file, iev_file1 if File.exist? iev_file
 
-    File.open("#{Dir.home}/.relaton-bib.pstore", "w") { |f| f.write "XXX" }
+    File.open("#{Dir.home}/.relaton/cache", "w") { |f| f.write "XXX" }
     FileUtils.rm_rf File.expand_path("~/.iev.pstore")
 
     # mock_isobib_get_123
@@ -130,23 +139,23 @@ EOS
         * [[[iso123,ISO 123:2001]]] _Standard_
       INPUT
     end
-    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be true
+    expect(File.exist?("#{Dir.home}/.relaton/cache")).to be true
     expect(File.exist?("#{Dir.home}/.iev.pstore")).to be true
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
+    db = Relaton::Db.new "#{Dir.home}/.relaton/cache", nil
     entry = db.load_entry("ISO(ISO 123:2001)")
     expect(db.fetched("ISO(ISO 123:2001)")).to eq(Date.today.to_s)
     expect(entry).to be_equivalent_to(ISO_123_DATED)
 
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
     FileUtils.rm_rf File.expand_path("~/.iev.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
     FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev.pstore"), force: true
   end
 
   it "does not fetch references for ISO references in preparation" do
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
-    FileUtils.rm_f "test.relaton.pstore"
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_rf "relaton/cache"
     Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
       #{CACHED_ISOBIB_BLANK_HDR}
       [bibliography]
@@ -154,40 +163,71 @@ EOS
 
       * [[[iso123,ISO 123:--]]] footnote:[The standard is in press] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be true
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
+    expect(File.exist?("#{Dir.home}/.relaton/cache")).to be true
+    db = Relaton::Db.new "#{Dir.home}/.relaton/cache", nil
     entry = db.load_entry("ISO(ISO 123:--)")
     expect(entry).to be nil
 
-    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
-  it "activates global cache" do
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
-    FileUtils.rm_f "test.relaton.pstore"
+  it "inserts prefixes to fetched reference identifiers other than ISO IEC" do
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_rf "relaton/cache"
     mock_isobib_get_123
-    Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+    mock_ietfbib_get_123
+    out = Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
       #{CACHED_ISOBIB_BLANK_HDR}
+      
+      <<iso123>>
+      <<ietf123>>
+
       [bibliography]
       == Normative References
 
       * [[[iso123,ISO 123:2001]]] _Standard_
+      * [[[ietf123,RFC 123]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be true
-    expect(File.exist?("test.relaton.pstore")).to be false
+      expect(out).to include '<eref type="inline" bibitemid="iso123" citeas="ISO 123:2001"/>'
+      expect(out).to include '<eref type="inline" bibitemid="ietf123" citeas="IETF RFC 123"/>'
+  end
+
+  it "activates global cache" do
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_rf "relaton/cache"
+        VCR.use_cassette "isobib_get_123" do
+      Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+        #{CACHED_ISOBIB_BLANK_HDR}
+        [bibliography]
+        == Normative References
+
+        * [[[iso123,ISO 123:2001]]] _Standard_
+      INPUT
+    end
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
+    #mock_isobib_get_123
+    #Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+      ##{CACHED_ISOBIB_BLANK_HDR}
+      #[bibliography]
+      #== Normative References
+#
+      #* [[[iso123,ISO 123:2001]]] _Standard_
+    #INPUT
+    expect(File.exist?("#{Dir.home}/.relaton/cache")).to be true
+    expect(File.exist?("relaton/cache")).to be false
+
+    db = Relaton::Db.new "#{Dir.home}/.relaton/cache", nil
     entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
-    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
   it "activates local cache" do
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
-    FileUtils.rm_f "test.relaton.pstore"
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_rf "relaton/cache"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
       #{LOCAL_CACHED_ISOBIB_BLANK_HDR}
@@ -196,27 +236,54 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be true
-    expect(File.exist?("test.relaton.pstore")).to be true
+    expect(File.exist?("#{Dir.home}/.relaton/cache")).to be true
+    expect(File.exist?("relaton/cache")).to be true
+
+    db = Relaton::Db.new "#{Dir.home}/.relaton/cache", nil
+    entry = db.load_entry("ISO(ISO 123:2001)")
+    expect(entry).to_not be nil
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
+    db = Relaton::Db.new "relaton/cache", nil
     entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
-    db = Relaton::Db.new "test.relaton.pstore", nil
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
+  end
+
+  it "renames local cache" do
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_rf "test/cache"
+    mock_isobib_get_123
+    Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :local-cache: test
+
+      [bibliography]
+      == Normative References
+
+      * [[[iso123,ISO 123:2001]]] _Standard_
+    INPUT
+    expect(File.exist?("test/cache")).to be true
+
+    db = Relaton::Db.new "test/cache", nil
     entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
-    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
   it "activates only local cache" do
-    relaton_bib_file  = File.expand_path("~/.relaton-bib.pstore")
+    relaton_bib_file  = File.expand_path("~/.relaton/cache")
     relaton_bib_file1 = File.expand_path("~/.relaton-bib.pstore1")
     FileUtils.rm_rf relaton_bib_file1 if File.exist? relaton_bib_file1
     FileUtils.mv(relaton_bib_file, relaton_bib_file1, force: true) if File.exist? relaton_bib_file
-    FileUtils.rm_rf "test.relaton.pstore"
+    FileUtils.rm_rf "relaton/cache"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
       #{LOCAL_ONLY_CACHED_ISOBIB_BLANK_HDR}
@@ -225,19 +292,19 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be false
-    expect(File.exist?("test.relaton.pstore")).to be true
+    expect(File.exist?("#{Dir.home}/.relaton/cache")).to be false
+    expect(File.exist?("relaton/cache")).to be true
 
-    db = Relaton::Db.new "test.relaton.pstore", nil
+    db = Relaton::Db.new "relaton/cache", nil
     entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
   it "fetches uncached references" do
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    db = Relaton::Db.new "#{Dir.home}/.relaton/cache", nil
     db.save_entry("ISO(ISO 123:2001)",
         {
           "fetched" => Date.today.to_s,
@@ -264,16 +331,15 @@ EOS
     expect(db.fetched("ISO(ISO 124:2014)")).to eq(Date.today.to_s)
     expect(entry).to be_equivalent_to(ISO_124_DATED)
 
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
   it "expires stale undated references" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
 
-        db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
+        db = Relaton::Db.new "#{Dir.home}/.relaton/cache", nil
         db.save_entry("ISO 123",
         {
           "fetched" => (Date.today - 90),
@@ -296,18 +362,18 @@ EOS
     expect(db.fetched("ISO(ISO 123)")).to eq(Date.today.to_s)
     expect(entry).to be_equivalent_to(ISO_123_UNDATED)
 
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
   it "does not expire stale dated references" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
 
     bibitem = IsoBibItem::XMLParser.from_xml ISO_123_DATED
     bibitem.instance_variable_set :@fetched, (Date.today - 90)
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
+    db = Relaton::Db.new "#{Dir.home}/.relaton/cache", nil
     db.save_entry("ISO(ISO 123:2001)", bibitem.to_xml)
     #   {
     #     "fetched" => (Date.today - 90),
@@ -327,16 +393,16 @@ EOS
     expect(db.fetched("ISO(ISO 123:2001)")).to eq((Date.today - 90).to_s)
     # expect(entry).to be_equivalent_to(ISO_123_DATED) It can't be true since fetched date is changed
 
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
   it "prioritises local over global cache values" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
-    FileUtils.rm_rf "test.relaton.pstore"
+    FileUtils.mv File.expand_path("~/.relaton/cache"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_rf "relaton/cache"
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
+    db = Relaton::Db.new "#{Dir.home}/.relaton/cache", nil
     db.save_entry("ISO(ISO 123:2001)", IsoBibItem::XMLParser.from_xml(ISO_123_DATED).to_xml)
       #   {
       #     "fetched" => Date.today,
@@ -350,7 +416,7 @@ EOS
       #   }
       # )
 
-    localdb = Relaton::Db.new "test.relaton.pstore", nil
+    localdb = Relaton::Db.new "relaton/cache", nil
     localdb.save_entry("ISO(ISO 124)", IsoBibItem::XMLParser.from_xml(ISO_124_SHORT_ALT).to_xml)
       #   {
       #     "fetched" => Date.today,
@@ -388,8 +454,8 @@ EOS
     expect(localdb.load_entry("ISO(ISO 123:2001)")).to be_equivalent_to(ISO_123_DATED)
     expect(localdb.load_entry("ISO(ISO 124)")).to be_equivalent_to(ISO_124_SHORT_ALT)
 
-    FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore")
-    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.rm_rf File.expand_path("~/.relaton/cache")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton/cache"), force: true
   end
 
 private
@@ -406,4 +472,8 @@ private
     expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}).and_return(IsoBibItem::XMLParser.from_xml(ISO_124_DATED))
   end
 
+  def mock_ietfbib_get_123
+    expect(IETFBib::RfcBibliography).to receive(:get).with("RFC 123", nil, {}).and_return(IsoBibItem::XMLParser.from_xml(IETF_123_SHORT))
+  end
+
 end

data/spec/asciidoctor-standoc/section_spec.rb

@@ -2,12 +2,17 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc do
   it "processes sections" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).sub(/^.*<preface/m, "<preface")).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
       .Foreword
 
       Text
 
+      [abstract]
+      == Abstract
+
+      Text
+
       == Introduction
 
       === Introduction Subsection
@@ -52,8 +57,9 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Bibliography Subsection
     INPUT
-            #{BLANK_HDR}
-       <preface><foreword obligation="informative">
+       <preface><abstract id="_">
+         <p id="_">Text</p>
+       </abstract><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">Text</p>
        </foreword><introduction id="_" obligation="informative">
@@ -113,12 +119,17 @@ RSpec.describe Asciidoctor::Standoc do
   end
 
   it "processes sections with title attributes" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).sub(/^.*<preface/m, "<preface")).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
       .Foreword
 
       Text
 
+      [abstract]
+      == Περίληψη
+
+      Text
+
       [heading=introduction]
       == Εισαγωγή
 
@@ -161,8 +172,9 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Bibliography Subsection
     INPUT
-            #{BLANK_HDR}
-       <preface>     
+       <preface><abstract id="_">
+         <p id="_">Text</p>
+       </abstract>
        <foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">Text</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor