metanorma-standoc 2.2.2 → 2.2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1259358ae365bba52ab94c40d88b6cc9d4b1eb9b65a9f7fc8edef4bd77138e0
-  data.tar.gz: 6c348c7e3b1706287332368251d90fa277fee7e9a54a0fc0cd11e19f5464506b
+  metadata.gz: '0268c3ff4369ed762e3b37515adf258a24a51561802243c9e054428b09351570'
+  data.tar.gz: d9d652832d3a7ac866d3c4e1f47ee3fc1a9cb803658864278b0cefaa7f23ec68
 SHA512:
-  metadata.gz: 602f12339e31a98c061ce7dc46d9fad6888b18e962942f110ebeea86f6739311b093578dbc8886a795bfcd01de790c40c134072449ff1e701779f2e29139a743
-  data.tar.gz: 39b93eb600aa0f18e21982174fc204eb36a9f28ae7e1e3b5a4a78ddfa9a05a440e6e3d6b94cdf7824dbd71b62880a193d5c88028ecd78d074c7c9361961966f6
+  metadata.gz: ff1f0b3266523dfb2b67c2b1e888af2136970815da0caebd6f906168aa5b3083bad1c1d0c50d66b27d6faa7a35fcaf7608f1191bd35043b69c76b60b33bb3ee9
+  data.tar.gz: a94108f4584720b053727a46f6c9e9c634927543e9efcd0fab5633edcffebb8dee147f9231f978caac6ce65330f4e4d983c5dddeb49ffbfbee02f8a06aa01fbc

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

@@ -55,7 +55,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 +109,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
@@ -161,6 +162,7 @@ module Metanorma
       def image_validate(doc)
         doc.xpath("//image[@mimetype = 'image/png']").each do |i|
           d = Metanorma::Utils::datauri(i["src"], @localdir)
+          # d.chars.to_a.each_slice(80).to_a.map { |s| s.join }.each { |s| warn s }
           png_validate1(i, Base64.strict_decode64(d.sub(/^.+?base64,/, "")))
         end
       end

data/lib/metanorma/standoc/version.rb

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

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"

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"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.3
+- !ruby/object:Gem::Dependency
+  name: metanorma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma-plugin-datastruct
   requirement: !ruby/object:Gem::Requirement