metanorma-standoc 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e95a39bfddb66aa733baf30ef52d730d91ba27bcea85511287d665481d84aae
-  data.tar.gz: 6c462647a07e2f004a1df85c343f4a2a6a53aac7e0aa3eea9a47aed46e7a5e1e
+  metadata.gz: e8fab97f6fa53dcc3ff51d52897b6b7d7c0eaad734f21cb87e41bc1c8236e333
+  data.tar.gz: f71df060df2100c4a991f08b3d9129547bf8ca7bda29e43ec17a2d24b7847c82
 SHA512:
-  metadata.gz: 392c83c6672ec4ecf4cf245649edd9be86af018bcc5f03c2206159577100224a01f6067289a85da0d2730c13706eacd8b3397ab97eb8a5069539d6d8e16985d8
-  data.tar.gz: 05af317f628941fc049c0bc9a0c470ed437eff7d76568d42ef0948434f2311661d904810b73e0ebf38e6773aa0af805e5efb3fbe27da121b7a0aff20a89c40fd
+  metadata.gz: e7ee129d2c67a72e6ec71653e3bb6a064fa16e1de9f6323b3a610802825649243e89cecb23b2f5644cb0508dfa3aa0832af74afe7421a582de6062ee2bea13f9
+  data.tar.gz: 39bfaf064020bf8e8fbf8d7c974f3661128d7331e1b3eb95779743f8d59a295d0410cbb911151c03c162338d37bdee86f9bf8e1d118ad5bee64affcf457795b0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.3.7)
+    metanorma-standoc (1.3.8)
       asciidoctor (~> 2.0.0)
       concurrent-ruby
       html2doc (~> 0.9.0)
@@ -34,7 +34,7 @@ GEM
       nokogiri (>= 1.4.3)
     faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+    ffi (1.11.2)
     formatador (0.2.5)
     gb-agencies (0.0.6)
     guard (2.16.1)
@@ -52,7 +52,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (1.0.0)
-    html2doc (0.9.1)
+    html2doc (0.9.2)
       asciimath (~> 1.0.9)
       htmlentities (~> 4.3.4)
       image_size
@@ -64,7 +64,7 @@ GEM
     iev (0.2.3)
       nokogiri (>= 1.10.4)
     image_size (2.0.2)
-    isodoc (1.0.7)
+    isodoc (1.0.8)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -83,7 +83,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.0.13)
-    metanorma (0.3.16)
+    metanorma (0.3.17)
       asciidoctor
       htmlentities
     method_source (0.9.2)
@@ -100,7 +100,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     optout (0.0.2)
-    parallel (1.18.0)
+    parallel (1.19.0)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
@@ -113,7 +113,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.5.11)
+    relaton (0.5.14)
       relaton-calconnect (~> 0.1.0)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
@@ -135,7 +135,7 @@ GEM
     relaton-iec (0.4.10)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.9)
+    relaton-ietf (0.6.10)
       relaton-bib (~> 0.3.0)
     relaton-iev (0.1.1)
       relaton (~> 0.5.0)

data/lib/asciidoctor/standoc/basicdoc.rng

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng"/>
-  <start>
-    <ref name="document"/>
-  </start>
+  <include href="biblio.rng">
+    <start>
+      <ref name="document"/>
+    </start>
+  </include>
   <define name="document">
     <element name="document">
       <optional>

data/lib/asciidoctor/standoc/biblio.rng

@@ -33,6 +33,9 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
+  <start>
+    <ref name="relaton_collection"/>
+  </start>
   <define name="status">
     <element name="status">
       <ref name="stage"/>

data/lib/asciidoctor/standoc/ref.rb

@@ -45,6 +45,7 @@ module Asciidoctor
         type, code1 = /^\[\d+\]$|^\(.+\)$/.match(code) ?
           ["metanorma", code.sub(/^\(/, "[").sub(/\)$/, "]")] :
           @bibdb&.docid_type(code) || [nil, code]
+        code1.sub!(/^nofetch\((.+)\)$/, "\\1")
         t.docidentifier code1, **attr_code(type: type)
       end
 

data/lib/asciidoctor/standoc/utils.rb

@@ -188,16 +188,27 @@ module Asciidoctor
 
       def datauri2mime(uri)
         %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
-        file = Tempfile.new(["hello", ".jpg"])
-        file.binmode
-        file.write(Base64.strict_decode64(imgdata))
-        file.rewind
-        type = MimeMagic.by_magic(file)
-        file.close
-        file.unlink 
+        type = nil
+        imgtype = "png" unless /^[a-z0-9]+$/.match imgtype
+        Tempfile.open(["imageuri", ".#{imgtype}"]) do |file|
+          type = datauri2mime1(file, imgdata)
+        end
         [type]
       end
 
+      def datauri2mime1(file, imgdata)
+        type = nil
+        begin
+          file.binmode
+          file.write(Base64.strict_decode64(imgdata))
+          file.rewind
+          type = MimeMagic.by_magic(file)
+        ensure
+          file.close!
+        end
+        type
+      end
+
       SUBCLAUSE_XPATH = "//clause[ancestor::clause or ancestor::annex or "\
         "ancestor::introduction]".freeze
     end

data/lib/asciidoctor/standoc/validate.rb

@@ -2,7 +2,6 @@ require "asciidoctor/standoc/utils"
 require_relative "./validate_section.rb"
 require "nokogiri"
 require "jing"
-require "pp"
 require "iev"
 
 module Asciidoctor
@@ -35,16 +34,22 @@ module Asciidoctor
         iev_validate(doc.root)
       end
 
-      def schema_validate(doc, filename)
-        File.open(".tmp.xml", "w:UTF-8") { |f| f.write(doc.to_xml) }
-        begin
-          errors = Jing.new(filename).validate(".tmp.xml")
-        rescue Jing::Error => e
-          abort "Jing failed with error: #{e}"
-        end
-        warn "Valid!" if errors.none?
-        errors.each do |error|
-          warn "#{error[:message]} @ #{error[:line]}:#{error[:column]}"
+      def schema_validate(doc, schema)
+        Tempfile.open(["tmp", ".xml"], :encoding => 'UTF-8') do |f|
+          begin
+            f.write(doc.to_xml) 
+            f.close
+            #File.open(".tmp.xml", "w:UTF-8") { |f| f.write(doc.to_xml) }
+            errors = Jing.new(schema).validate(f.path)
+            warn "Valid!" if errors.none?
+            errors.each do |error|
+              warn "#{error[:message]} @ #{error[:line]}:#{error[:column]}"
+            end
+          rescue Jing::Error => e
+            abort "Jing failed with error: #{e}"
+          ensure
+            f.close!
+          end
         end
       end
 

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.3.7".freeze
+    VERSION = "1.3.8".freeze
   end
 end

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -395,6 +395,81 @@ RSpec.describe Asciidoctor::Standoc do
     end
   end
 
+    it "declines to fetch individual references" do
+    VCR.use_cassette "dated_iso_ref_joint_iso_iec" do
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp( <<~"OUTPUT")
+        #{ISOBIB_BLANK_HDR}
+        [bibliography]
+        == Normative References
+
+        * [[[iso123,nofetch(ISO/IEC TR 12382:1992)]]] _Standard_
+        * [[[iso124,ISO 124:2014]]] _Standard_
+      INPUT
+        #{BLANK_HDR}
+        <sections>
+
+        </sections><bibliography><references id="_" obligation="informative">
+          <title>Normative References</title>
+        #{NORM_REF_BOILERPLATE}
+        <bibitem id='iso123'>
+               <formattedref format='application/x-isodoc+xml'>
+                 <em>Standard</em>
+               </formattedref>
+               <docidentifier>ISO/IEC TR 12382:1992</docidentifier>
+             </bibitem>
+             <bibitem id='iso124' type='standard'>
+               <fetched>#{Date.today}</fetched>
+               <title type='title-intro' format='text/plain' language='en' script='Latn'>Latex, rubber</title>
+               <title type='title-main' format='text/plain' language='en' script='Latn'>Determination of total solids content</title>
+               <title type='main' format='text/plain' language='en' script='Latn'>Latex, rubber – Determination of total solids content</title>
+               <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
+               <title type='title-main' format='text/plain' language='fr' script='Latn'>Détermination des matières solides totales</title>
+               <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc – Détermination des matières solides totales</title>
+               <uri type='src'>https://www.iso.org/standard/61884.html</uri>
+               <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
+               <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
+               <docidentifier type='ISO'>ISO 124:2014</docidentifier>
+               <docnumber>124</docnumber>
+               <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='text/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='text/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>
+                 <stage>90</stage>
+                 <substage>93</substage>
+               </status>
+               <copyright>
+                 <from>2014</from>
+                 <owner>
+                   <organization>
+                     <name>ISO</name>
+                   </organization>
+                 </owner>
+               </copyright>
+               <relation type='obsoletes'>
+                 <bibitem type='standard'>
+                   <formattedref format='text/plain'>ISO 124:2011</formattedref>
+                 </bibitem>
+               </relation>
+             </bibitem>
+        </references></bibliography></standard-document>
+OUTPUT
+    end
+    end
+
   it "processes draft ISO reference" do
     #stub_fetch_ref no_year: true, note: "The standard is in press"
 

metadata

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