metanorma-standoc 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d5bcdf81251b8337ccbc89b87c995e53f2899277d814e6668f20c88b4cfd2e
-  data.tar.gz: 85b27e1f408c227f92aa9912e8937867583e25dfaec0fb05b7d644dff19fd514
+  metadata.gz: 7a90c6f9dab7e41ec8a716b6dcb956b3c5066e6af6c24c4c99f6f9e7242cd490
+  data.tar.gz: 3d91ef4648f885f90e301bdc30989e9f89f4e3a07a856fd91cb90b0adbf81c1c
 SHA512:
-  metadata.gz: 51cd7259dad7810f4496001fe1013ba6e88bb0cbc033babbba19ce545c3b9210abc7fb169aefc26c850db72493e5016316c6b60fa7f712c04872ff7a0b48bfad
-  data.tar.gz: 21c1588e83613777b5e25eb412eaf0d4cdaf82b927bdb4f824751af139585c4416a40779fe243505d180ea3db97c2647f393c4d73be09b06b540adba175d8e43
+  metadata.gz: d1bfa8ed19b0ec0aaa93739d240e32f1ec312a2cf13a1ba9f4c715b056541519a75765ae794abe1bc54d0cdc89275c8b5652ba69de4c83090c709b24206f59a6
+  data.tar.gz: 999e69d048bf5b83a265153d5e08d7bfa9f23a44d08640d309cdca172a5921544d0e1fd5f1cb746a115230134ffe789725eb8ece23026309ad02f797efc1c3fc

data/.travis.yml

@@ -6,7 +6,6 @@ os:
 rvm:
 - 2.5
 - 2.4
-- 2.3
 - ruby-head
 before_install:
 - gem install bundler -v 2.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.2.0)
+    metanorma-standoc (1.2.1)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.11)
@@ -52,7 +52,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.4.0)
-    html2doc (0.8.11)
+    html2doc (0.8.12)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
@@ -65,7 +65,7 @@ GEM
     iev (0.2.2)
       nokogiri
     image_size (2.0.1)
-    isodoc (0.10.0)
+    isodoc (0.10.1)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -113,7 +113,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.4.0)
+    relaton (0.4.1)
       algoliasearch
       relaton-gb (~> 0.5.0)
       relaton-iec (~> 0.3.0)
@@ -122,35 +122,36 @@ GEM
       relaton-iso-bib (~> 0.2.0)
       relaton-itu (~> 0.2.0)
       relaton-nist (~> 0.2.0)
-    relaton-bib (0.2.1)
+    relaton-bib (0.2.3)
       addressable
       nokogiri (~> 1.8.4)
-    relaton-cli (0.2.0)
+    relaton-cli (0.2.1)
       liquid
       relaton (~> 0.4)
       thor
-    relaton-gb (0.5.0)
+    relaton-gb (0.5.1)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.2.0)
-    relaton-iec (0.3.0)
+    relaton-iec (0.3.1)
       addressable
       relaton-iso-bib (~> 0.2.0)
-    relaton-ietf (0.5.0)
+    relaton-ietf (0.5.3)
       relaton-iso-bib (~> 0.2.0)
-    relaton-iso (0.5.0)
+    relaton-iso (0.5.1)
       algoliasearch
       relaton-iec (~> 0.3.0)
       relaton-iso-bib (~> 0.2.0)
-    relaton-iso-bib (0.2.1)
+    relaton-iso-bib (0.2.3)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       relaton-bib (~> 0.2.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.2.0)
+    relaton-itu (0.2.1)
       relaton-iso-bib (~> 0.2.0)
-    relaton-nist (0.2.0)
+    relaton-nist (0.2.2)
       relaton-bib (~> 0.2.0)
+      rubyzip
     roman-numerals (0.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -177,6 +178,7 @@ GEM
     ruby-progressbar (1.10.1)
     ruby_deep_clone (0.8.0)
     ruby_dep (1.5.0)
+    rubyzip (1.2.3)
     safe_yaml (1.0.5)
     sassc (2.0.1)
       ffi (~> 1.9)

data/appveyor.yml

@@ -4,7 +4,6 @@ environment:
   matrix:
     - RUBY_VERSION: 25
     - RUBY_VERSION: 24
-    - RUBY_VERSION: 23
     - RUBY_VERSION: _trunk
 
 matrix:

data/lib/asciidoctor/standoc/base.rb

@@ -93,8 +93,7 @@ module Asciidoctor
         @files_to_delete = []
         @filename = node.attr("docfile") ?
           node.attr("docfile").gsub(/\.adoc$/, "").gsub(%r{^.*/}, "") : ""
-        @localdir = %r{/}.match(node.attr("docfile")) ?
-          node.attr("docfile").sub(%r{/[^/]+$}, "/") : "./"
+        @localdir = Utils::localdir(node)
         @no_isobib_cache = node.attr("no-isobib-cache")
         @no_isobib = node.attr("no-isobib")
         @bibdb = nil

data/lib/asciidoctor/standoc/macros.rb

@@ -82,14 +82,15 @@ module Asciidoctor
       end
 
       def self.generate_file parent, reader
+        localdir = Utils::localdir(parent.document)
         src = reader.source
         !reader.lines.first.sub(/\s+$/, "").match /^@startuml($| )/ or
           src = "@startuml\n#{src}\n@enduml\n"
         /^@startuml (?<filename>[^\n]+)\n/ =~ src
         filename ||= parent.document.reader.lineno
-        FileUtils.mkdir_p "plantuml"
-        File.open("plantuml/#{filename}.pml", "w") { |f| f.write src }
-        system "plantuml plantuml/#{filename}.pml"
+        FileUtils.mkdir_p "#{localdir}/plantuml"
+        File.open("#{localdir}plantuml/#{filename}.pml", "w") { |f| f.write src }
+        system "plantuml #{localdir}plantuml/#{filename}.pml"
         filename
       end
 

data/lib/asciidoctor/standoc/utils.rb

@@ -17,6 +17,11 @@ module Asciidoctor
           node.nil? || node.id.nil? || node.id.empty? ? "_" + uuid : node.id
         end
 
+        def localdir(node)
+          %r{/}.match(node.attr("docfile")) ?
+          node.attr("docfile").sub(%r{/[^/]+$}, "/") : "./"
+        end
+
         def current_location(n)
           return "Line #{n.lineno}" if n.respond_to?(:lineno) &&
             !n.lineno.nil? && !n.lineno.empty?

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.2.0".freeze
+    VERSION = "1.2.1".freeze
   end
 end

data/spec/asciidoctor-standoc/isobib_cache_spec.rb

@@ -147,11 +147,6 @@ EOS
              <formattedref format="text/plain">ISO 123:1985</formattedref>
            </bibitem>
          </relation>
-         <relation type="updates">
-           <bibitem type="standard">
-             <formattedref format="text/plain">ISO 123:2001</formattedref>
-           </bibitem>
-         </relation>
          <relation type="instance">
            <bibitem type="standard">
              <fetched>#{Date.today}</fetched>
@@ -197,11 +192,6 @@ EOS
                  <formattedref format="text/plain">ISO 123:1985</formattedref>
                </bibitem>
              </relation>
-             <relation type="updates">
-               <bibitem type="standard">
-                 <formattedref format="text/plain">ISO 123:2001</formattedref>
-               </bibitem>
-             </relation>
            </bibitem>
          </relation>
          <ext>
@@ -265,11 +255,6 @@ EOS
              <formattedref format="text/plain">ISO 123:1985</formattedref>
            </bibitem>
          </relation>
-         <relation type="updates">
-           <bibitem type="standard">
-             <formattedref format="text/plain">ISO 123:2001</formattedref>
-           </bibitem>
-         </relation>
          <ext>
            <doctype>international-standard</doctype>
            <editorialgroup>
@@ -541,12 +526,15 @@ EOS
   it "fetches uncached references" do
     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,
-          "bib" => RelatonIsoBib::XMLParser.from_xml(ISO_123_DATED)
-        }
-      )
+    bibitem = RelatonIsoBib::XMLParser.from_xml ISO_123_DATED
+    bibitem.instance_variable_set :@fetched, (Date.today - 2)
+
+    db.save_entry("ISO(ISO 123:2001)", bibitem.to_xml)
+        #{
+          #"fetched" => (Date.today - 2).to_s,
+          #"bib" => RelatonIsoBib::XMLParser.from_xml(ISO_123_DATED)
+        #}
+      #)
 
     # mock_isobib_get_124
     VCR.use_cassette "isobib_get_124" do
@@ -562,8 +550,8 @@ EOS
 
     entry = db.load_entry("ISO(ISO 123:2001)")
     #expect(db.fetched("ISO(ISO 123:2001)")).to eq(Date.today.to_s)
-    expect(entry).to include("<fetched>#{Date.today.to_s}</fetched>")
-    expect(entry).to be_equivalent_to(ISO_123_DATED)
+    expect(entry).to include("<fetched>#{(Date.today - 2).to_s}</fetched>")
+    #expect(entry).to be_equivalent_to(ISO_123_DATED)
     entry = db.load_entry("ISO(ISO 124:2014)")
     #expect(db.fetched("ISO(ISO 124:2014)")).to eq(Date.today.to_s)
     expect(entry).to include("<fetched>#{Date.today.to_s}</fetched>")
@@ -578,12 +566,14 @@ EOS
     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 123",
-        {
-          "fetched" => (Date.today - 90),
-          "bib" => RelatonIsoBib::XMLParser.from_xml(ISO_123_SHORT)
-        }
-      )
+    bibitem = RelatonIsoBib::XMLParser.from_xml ISO_123_SHORT
+    bibitem.instance_variable_set :@fetched, (Date.today - 90)
+    db.save_entry("ISO 123", bibitem.to_xml)
+        #{
+          #"fetched" => (Date.today - 90),
+          #"bib" => RelatonIsoBib::XMLParser.from_xml(ISO_123_SHORT)
+        #}
+      #)
 
     # mock_isobib_get_123_undated
     VCR.use_cassette "isobib_get_123" do

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -79,7 +79,7 @@ RSpec.describe Asciidoctor::Standoc do
 
        </sections><bibliography><references id="_" obligation="informative"><title>Normative References</title>
        <bibitem id="iso123" type="standard">
-         <fetched>2019-06-16</fetched>
+         <fetched>#{Date.today}</fetched>
          <title type="title-main" format="text/plain" language="en" script="Latn">Sampling</title>
          <title type="title-intro" format="text/plain" language="en" script="Latn">Rubber latex</title>
          <title type="main" format="text/plain" language="en" script="Latn">Sampling - Rubber latex</title>
@@ -121,7 +121,7 @@ RSpec.describe Asciidoctor::Standoc do
          </relation>
          <relation type="instance">
            <bibitem type="standard">
-             <fetched>2019-06-16</fetched>
+             <fetched>#{Date.today}</fetched>
              <title type="title-main" format="text/plain" language="en" script="Latn">Sampling</title>
              <title type="title-intro" format="text/plain" language="en" script="Latn">Rubber latex</title>
              <title type="main" format="text/plain" language="en" script="Latn">Sampling - Rubber latex</title>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor