metanorma 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cebdc5e3a04db33d1bf3c0042d914f03a1e7c36ae67d625138fb1499679abdcf
-  data.tar.gz: 82f7a4b816cea046181cfd05da94ca21a52f1c12ac02d9f6f2e89ae1b07e6f60
+  metadata.gz: 12776f5bd9badbb53a16aadbc821249bb629660d3a5de20a08903bbf246e29b1
+  data.tar.gz: 9800801b680cb5d6097f58b22875c4c9e436914837a47ec56dc0765e14508493
 SHA512:
-  metadata.gz: cfa8565f3b0a55f12f0d0e8971d82c8bf619390cfc76860514dda7b1801267d7e04719161048ff7d9b16a71e238df2e24e145198229b5b5930233ae9110933ec
-  data.tar.gz: 81764ee18d5c1b36f3aacf19c0a4cf4b02cd4fb0a8979fe9d0a6733a93f4f05ddc845be35b25ec38be31d595fd04a019ae6aaf6ca33a97664519550e1abe280b
+  metadata.gz: 2ed067f52701b80fb2c246fb09b0227dd763a8e3d333bf3a13109bd44536c77f585e46386c52dd61ce206982525843b27f05b13b21585de679b42343a0bfc2d4
+  data.tar.gz: d5adad943950f178745b0288a0f11baf730b3fc84a281f30b3bba082a9d9e58135dc7f29d4ea2d31d912df100b261e8cabea33a0d8732b6dca7f747de5c88e53

data/lib/metanorma/collection_fileprocess.rb

@@ -164,10 +164,15 @@ module Metanorma
     def file_compile(file, filename, identifier)
       return if @files[identifier][:sectionsplit] == "true"
 
-      @compile.compile file.path, { format: :asciidoc, extension_keys: @format }
-        .merge(compile_options(identifier))
+      opts = {
+        format: :asciidoc,
+        extension_keys: @format,
+        output_dir: @outdir,
+      }.merge(compile_options(identifier))
+
+      @compile.compile file, opts
       @files[identifier][:outputs] = {}
-      file_compile_formats(file, filename, identifier)
+      file_compile_formats(filename, identifier)
     end
 
     def compile_options(identifier)
@@ -182,29 +187,17 @@ module Metanorma
       ret
     end
 
-    def file_compile_formats(file, filename, identifier)
+    def file_compile_formats(filename, identifier)
+      file_id = @files[identifier]
       @format.each do |e|
         ext = @compile.processor.output_formats[e]
         fn = File.basename(filename).sub(/(?<=\.)[^.]+$/, ext.to_s)
-        if /html$/.match?(ext) && @files[identifier][:sectionsplit]
-          # file_sectionsplit_copy(file, fn, identifier, ext, e)
-        else
-          FileUtils.cp file.path.sub(/\.xml$/, ".#{ext}"),
-                       File.join(@outdir, fn)
-          @files[identifier][:outputs][e] = File.join(@outdir, fn)
+        unless /html$/.match?(ext) && file_id[:sectionsplit]
+          file_id[:outputs][e] = File.join(@outdir, fn)
         end
       end
     end
 
-    def file_sectionsplit_copy(file, base, identifier, ext, format)
-      dir = file.path.sub(/\.xml$/, ".#{ext}_collection")
-      files = Dir.glob("#{dir}/*.#{ext}")
-      FileUtils.cp files, @outdir
-      cover = File.join(@outdir, base.sub(/\.html$/, ".index.html"))
-      FileUtils.cp File.join(dir, "index.html"), cover
-      @files[identifier][:outputs][format] = cover
-    end
-
     def copy_file_to_dest(fileref)
       dest = File.join(@outdir, fileref[:out_path])
       FileUtils.mkdir_p(File.dirname(dest))
@@ -223,12 +216,13 @@ module Metanorma
         else
           file, filename = targetfile(x, read: true)
           warn "\n\n\n\n\nProcess #{filename}: #{DateTime.now.strftime('%H:%M:%S')}"
-          file = update_xrefs(file, identifier, internal_refs)
-          Tempfile.open(["collection", ".xml"], encoding: "utf-8") do |f|
-            f.write(file)
-            f.close
-            file_compile(f, filename, identifier)
-          end
+          collection_xml = update_xrefs(file, identifier, internal_refs)
+          collection_filename = File.basename(filename, File.extname(filename))
+          collection_xml_path = File.join(Dir.tmpdir,
+                                          "#{collection_filename}.xml")
+          File.write collection_xml_path, collection_xml, encoding: "UTF-8"
+          file_compile(collection_xml_path, filename, identifier)
+          FileUtils.rm(collection_xml_path)
         end
       end
     end

data/lib/metanorma/compile.rb

@@ -32,7 +32,7 @@ module Metanorma
       extract(isodoc, options[:extract], options[:extract_type])
       FontistUtils.install_fonts(@processor, options) unless @fontist_installed
       @fontist_installed = true
-      process_extensions(extensions, file, isodoc, options)
+      process_extensions(filename, extensions, file, isodoc, options)
     end
 
     def require_libraries(options)
@@ -199,7 +199,7 @@ module Metanorma
     end
 
     # isodoc is Raw Metanorma XML
-    def process_extensions(extensions, file, isodoc, options)
+    def process_extensions(filename, extensions, file, isodoc, options)
       f = change_output_dir options
       xml_name = f.sub(/\.[^.]+$/, ".xml")
       presentationxml_name = f.sub(/\.[^.]+$/, ".presentation.xml")
@@ -210,7 +210,7 @@ module Metanorma
         if ext == :rxl
           relaton_export(isodoc, options.merge(relaton: outfilename))
         elsif options[:passthrough_presentation_xml] && ext == :presentation
-          FileUtils.cp f, presentationxml_name
+          FileUtils.cp filename, presentationxml_name
         elsif ext == :html && options[:sectionsplit]
           sectionsplit_convert(xml_name, isodoc, outfilename, isodoc_options)
         else

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.4.0".freeze
+  VERSION = "1.4.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor