metanorma-standoc 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1259358ae365bba52ab94c40d88b6cc9d4b1eb9b65a9f7fc8edef4bd77138e0
-  data.tar.gz: 6c348c7e3b1706287332368251d90fa277fee7e9a54a0fc0cd11e19f5464506b
+  metadata.gz: 91681e7073cc074159e4aab0c10043fd86c8cffeba1c1fef9b1db85d11894a42
+  data.tar.gz: 0b6047784c5a7ba431ddf6ddbdfd6fb6042289b0947eaa15563a5c3d9e731fba
 SHA512:
-  metadata.gz: 602f12339e31a98c061ce7dc46d9fad6888b18e962942f110ebeea86f6739311b093578dbc8886a795bfcd01de790c40c134072449ff1e701779f2e29139a743
-  data.tar.gz: 39b93eb600aa0f18e21982174fc204eb36a9f28ae7e1e3b5a4a78ddfa9a05a440e6e3d6b94cdf7824dbd71b62880a193d5c88028ecd78d074c7c9361961966f6
+  metadata.gz: 68dcf12b8ba888e074970b6cea1918ec8223dd9ae5297a3bac0f337bed63731a8bf1579028915dfa07ce0ec7924677c603c81427b3bccb99640b07f2e148da19
+  data.tar.gz: 89458b82d0111581cc81a9cb19ad1c6dcecbdf64916c958e729d4a59424ab61f5c4ab9b7ac73ecbcab242e1e41624e28335bf94edcd7dd50dc80a6f74fd1245e

data/lib/metanorma/standoc/base.rb

@@ -160,8 +160,11 @@ module Metanorma
       end
 
       def clean_abort(msg, file = nil)
-        file and
-          File.open("#{@filename}.xml.abort", "w:UTF-8") { |f| f.write(file) }
+        if file
+          doc = file.to_xml(encoding: "UTF-8", indent: 2,
+                            save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+          File.open("#{@filename}.xml.abort", "w:UTF-8") { |f| f.write(doc) }
+        end
         clean_exit
         abort(msg)
       end

data/lib/metanorma/standoc/converter.rb

@@ -1,18 +1,17 @@
 require "asciidoctor"
-require "metanorma/util"
-require "metanorma/standoc/version"
-require "metanorma/standoc/base"
-require "metanorma/standoc/front"
-require "metanorma/standoc/lists"
-require "metanorma/standoc/ref"
-require "metanorma/standoc/inline"
-require "metanorma/standoc/blocks"
-require "metanorma/standoc/section"
-require "metanorma/standoc/table"
-require "metanorma/standoc/validate"
-require "metanorma/standoc/utils"
-require "metanorma/standoc/cleanup"
-require "metanorma/standoc/reqt"
+require_relative "version"
+require_relative "base"
+require_relative "front"
+require_relative "lists"
+require_relative "ref"
+require_relative "inline"
+require_relative "blocks"
+require_relative "section"
+require_relative "table"
+require_relative "validate"
+require_relative "utils"
+require_relative "cleanup"
+require_relative "reqt"
 require_relative "./macros"
 
 module Metanorma

data/lib/metanorma/standoc/validate.rb

@@ -5,7 +5,6 @@ require "nokogiri"
 require "jing"
 require "iev"
 require "pngcheck"
-require "png"
 
 module Metanorma
   module Standoc
@@ -55,7 +54,8 @@ module Metanorma
         table_validate(doc)
         requirement_validate(doc)
         image_validate(doc)
-        @fatalerror.empty? or clean_abort(@fatalerror.join("\n"), doc.to_xml)
+        @fatalerror.empty? or
+          clean_abort(@fatalerror.join("\n"), doc)
       end
 
       def norm_ref_validate(doc)
@@ -108,7 +108,7 @@ module Metanorma
         Tempfile.open(["tmp", ".xml"], encoding: "UTF-8") do |f|
           schema_validate1(f, doc, schema)
         rescue Jing::Error => e
-          clean_abort("Jing failed with error: #{e}", doc.to_xml)
+          clean_abort("Jing failed with error: #{e}", doc)
         ensure
           f.close!
         end
@@ -159,17 +159,46 @@ module Metanorma
       end
 
       def image_validate(doc)
+        image_exists(doc)
+        png_validate(doc)
+      end
+
+      def image_exists(doc)
+        doc.xpath("//image").each do |i|
+          Metanorma::Utils::url?(i["src"]) and next
+          Metanorma::Utils::datauri?(i["src"]) and next
+          expand_path(i["src"]) and next
+          @log.add("Images", i.parent,
+                   "Image not found: #{i['src']}")
+          @fatalerror << "Image not found: #{i['src']}"
+        end
+      end
+
+      def expand_path(loc)
+        relative_path = File.join(@localdir, loc)
+        [loc, relative_path].detect do |p|
+          File.exist?(p) ? p : nil
+        end
+      end
+
+      def png_validate(doc)
         doc.xpath("//image[@mimetype = 'image/png']").each do |i|
-          d = Metanorma::Utils::datauri(i["src"], @localdir)
-          png_validate1(i, Base64.strict_decode64(d.sub(/^.+?base64,/, "")))
+          Metanorma::Utils::url?(i["src"]) and next
+          decoded = if Metanorma::Utils::datauri?(i["src"])
+                      Metanorma::Utils::decode_datauri(i["src"])[:data]
+                    else
+                      path = expand_path(i["src"]) or next
+                      File.binread(path)
+                    end
+          png_validate1(i, decoded)
         end
       end
 
       def png_validate1(img, buffer)
         PngCheck.check_buffer(buffer)
       rescue PngCheck::CorruptPngError => e
-        @log.add("Images", img.parent, "Corrupt PNG image")
-        @fatalerror << "Exception #{e.message}"
+        @log.add("Images", img.parent,
+                 "Corrupt PNG image detected: #{e.message}")
       end
 
       def validate(doc)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.2.2".freeze
+    VERSION = "2.2.3".freeze
   end
 end

data/lib/metanorma-standoc.rb

@@ -3,6 +3,7 @@ require_relative "isodoc/pdf_convert"
 require_relative "metanorma/standoc/converter"
 require_relative "metanorma/standoc/version"
 require "asciidoctor/extensions"
+require "metanorma"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/standoc"

data/metanorma-standoc.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
   spec.add_dependency "isodoc", "~> 2.2.3"
+  spec.add_dependency "metanorma"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-lutaml"
   spec.add_dependency "ruby-jing"
@@ -37,7 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "latexmath"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "mn-requirements", "~> 0.1.3"
-  spec.add_dependency "png"
   spec.add_dependency "pngcheck"
   spec.add_dependency "relaton-cli", "~> 1.13.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"

data/spec/metanorma/validate_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "relaton_iec"
 require "fileutils"
 
 RSpec.describe Metanorma::Standoc do
@@ -783,34 +782,51 @@ RSpec.describe Metanorma::Standoc do
       .not_to include "Symbol reference in `symbol[xyz]` missing:"
   end
 
-  it "warns and aborts if corrupt PNG" do
+  it "warns if corrupt PNG" do
     FileUtils.rm_f "test.xml"
     FileUtils.rm_f "test.err"
-    begin
-      input = <<~INPUT
-        = Document title
-        Author
-        :docfile: test.adoc
-        :no-pdf:
 
-        == Clause
-        image::spec/assets/corrupt.png[]
+    input = <<~INPUT
+      = Document title
+      Author
+      :docfile: test.adoc
+      :no-pdf:
 
-      INPUT
-      expect do
-        Asciidoctor.convert(input, *OPTIONS)
-      end.to raise_error(SystemExit)
-    rescue SystemExit, RuntimeError
-    end
-    warn File.read("test.err")
+      == Clause
+      image::spec/assets/corrupt.png[]
+
+    INPUT
+    Asciidoctor.convert(input, *OPTIONS)
     expect(File.read("test.err"))
       .to include "Corrupt PNG image"
-    expect(File.exist?("test.xml")).to be false
+    expect(File.exist?("test.xml")).to be true
+  end
+
+  it "does not warn if not corrupt PNG" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+
+    input = <<~INPUT
+      = Document title
+      Author
+      :docfile: test.adoc
+      :no-pdf:
+
+      == Clause
+      image::spec/assets/correct.png[]
+
+    INPUT
+
+    Asciidoctor.convert(input, *OPTIONS)
+    expect(File.read("test.err"))
+      .not_to include "Corrupt PNG image"
+    expect(File.exist?("test.xml")).to be true
   end
 
-  it "does not warn and abort if not corrupt PNG" do
+  it "warns and aborts if images does not exist" do
     FileUtils.rm_f "test.xml"
     FileUtils.rm_f "test.err"
+
     begin
       input = <<~INPUT
         = Document title
@@ -819,16 +835,19 @@ RSpec.describe Metanorma::Standoc do
         :no-pdf:
 
         == Clause
-        image::spec/assets/correct.png[]
+        image::spec/assets/nonexistent.png[]
 
       INPUT
+
       expect do
         Asciidoctor.convert(input, *OPTIONS)
-      end.not_to raise_error
-    rescue SystemExit, RuntimeError
+      end.to raise_error(SystemExit)
+    rescue SystemExit
     end
+
+    warn File.read("test.err")
     expect(File.read("test.err"))
-      .not_to include "Corrupt PNG image"
-    expect(File.exist?("test.xml")).to be true
+      .to include "Image not found"
+    expect(File.exist?("test.xml")).to be false
   end
 end

data/spec/spec_helper.rb

@@ -20,7 +20,6 @@ require "asciidoctor"
 require "metanorma-standoc"
 require "rspec/matchers"
 require "equivalent-xml"
-require "metanorma"
 require "metanorma/standoc"
 require "rexml/document"