metanorma 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b51503237da3dfd54719591c47f599bca877d414528c4cf9a69abdb19aec9e9
-  data.tar.gz: 1588206551663889040f94194789cee7f2fb9b095775591a08f7b613ce59fbfe
+  metadata.gz: 315077d28cfe3e052808e9890d2f3c3f571b7350788e6d6423be1746e5559ef4
+  data.tar.gz: f8a9c7d3055af8a687fe8df52b725b1fadbceb8920bef8ea449af5cde0aafb6a
 SHA512:
-  metadata.gz: 6f7dd77c9a6bf129594e3bfdabc1626bcb4c58a9b68454b09e1d216f7c9e43d4ebce62ce980ed762e0ad3e9f5c3c3456b9473fe7b1670e13bdc7c2d286edc1ec
-  data.tar.gz: 9c4125021226bdd561436e37e2fbacd4bd3c3bfa48845607282dd7ce3b4789e218e2aaa835364de7268c684bbf667e5267a6224db5a4c268fce180136b835391
+  metadata.gz: ab023b366ca20c7d4fe3785e00698d2ccd868c0d119b0df74a5ba52e11f4bd69b884b18fea2b820838708c3bae5516be911c9e82de8302b6ade8cf52c99c36b4
+  data.tar.gz: 3f3520b67f58296be755b0e8b2b9cfb0e98611e214f73e131e1eccde7b74dfd611db1f476cee84d5071f6ef0c1b7b801ed9874e7261697b52fb7bf288282c57d

data/.gitignore

@@ -16,3 +16,6 @@
 
 # rspec failure tracking
 .rspec_status
+.rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
+Gemfile.lock
+relaton/

data/lib/metanorma/compile.rb

@@ -4,8 +4,12 @@ require "htmlentities"
 
 module Metanorma
   class Compile
+    # @return [Array<String>]
+    attr_reader :errors
+
     def initialize
       @registry = Metanorma::Registry.instance
+      @errors = []
     end
 
     def compile(filename, options = {})
@@ -89,14 +93,22 @@ module Metanorma
     end
 
     def get_extensions(options)
-      options[:extension_keys] ||= @processor.output_formats.inject([]) do |memo, (k, _)|
-        memo << k; memo
+      options[:extension_keys] ||= @processor.output_formats.reduce([]) do |memo, (k, _)|
+        memo << k
       end
-      extensions = options[:extension_keys].inject([]) do |memo, e|
-        @processor.output_formats[e] and memo << e or
-          Util.log("[metanorma] Error: #{e} format is not supported for this standard.", :error)
-        memo
+      extensions = options[:extension_keys].reduce([]) do |memo, e|
+        if @processor.output_formats[e]
+          memo << e
+        else
+          message = "[metanorma] Error: #{e} format is not supported for this standard."
+          @errors << message
+          Util.log(message, :error)
+          memo
+        end
       end
+      if !extensions.include?(:presentation) and extensions.any? { |e| @processor.use_presentation_xml(e) }
+        extensions << :presentation
+        end
       extensions
     end
 
@@ -195,10 +207,35 @@ module Metanorma
       end
     end
 
+    # dependency ordering
+    def sort_extensions_execution(ext)
+       case ext
+       when :xml then 0
+       when :rxl then 1
+       when :presentation then 2
+       else
+         99
+       end
+    end
+
+    def wrap_html(options, file_extension, outfilename)
+      if options[:wrapper] and /html$/.match file_extension
+          outfilename = outfilename.sub(/\.html$/, "")
+          FileUtils.mkdir_p outfilename
+          FileUtils.mv "#{outfilename}.html", outfilename
+          FileUtils.mv "#{outfilename}_images", outfilename, force: true
+        end
+    end
+
+    # isodoc is Raw Metanorma XML
     def process_extensions(extensions, file, isodoc, options)
-      extensions.each do |ext|
-        isodoc_options = @processor.extract_options(file)
-        isodoc_options[:datauriimage] = true if options[:datauriimage]
+      xml_name = options[:filename].sub(/\.[^.]+$/, ".xml")
+      presentationxml_name = options[:filename].sub(/\.[^.]+$/, ".presentation.xml")
+      isodoc_options = @processor.extract_options(file)
+      isodoc_options[:datauriimage] = true if options[:datauriimage]
+      extensions.sort do |a, b|
+        sort_extensions_execution(a) <=> sort_extensions_execution(b)
+      end.each do |ext|
         file_extension = @processor.output_formats[ext]
         outfilename = options[:filename].sub(/\.[^.]+$/, ".#{file_extension}")
         if ext == :rxl
@@ -206,17 +243,15 @@ module Metanorma
           relaton_export(isodoc, options)
         else
           begin
-          @processor.output(isodoc, outfilename, ext, isodoc_options)
+            #require "byebug"; byebug
+            @processor.use_presentation_xml(ext) ?
+              @processor.output(nil, presentationxml_name, outfilename, ext, isodoc_options) :
+              @processor.output(isodoc, xml_name, outfilename, ext, isodoc_options)
           rescue StandardError => e  
             puts e.message
           end
         end
-        if options[:wrapper] and /html$/.match file_extension
-          outfilename = outfilename.sub(/\.html$/, "")
-          FileUtils.mkdir_p outfilename
-          FileUtils.mv "#{outfilename}.html", outfilename
-          FileUtils.mv "#{outfilename}_images", outfilename, force: true
-        end
+        wrap_html(options, file_extension, outfilename)
       end
     end
   end

data/lib/metanorma/processor.rb

@@ -15,6 +15,7 @@ module Metanorma
     def output_formats
       {
         xml: "xml",
+        presentation: "presentation.xml",
         rxl: "rxl"
       }
     end
@@ -23,7 +24,15 @@ module Metanorma
       raise "This is an abstract class!"
     end
 
-    def output(isodoc_node, outname, format, options={})
+    def use_presentation_xml(ext)
+      case ext
+      when :html, :doc, :pdf then true
+      else
+        false
+      end
+    end
+
+    def output(isodoc_node, inname, outname, format, options={})
       File.open(outname, "w:UTF-8") { |f| f.write(isodoc_node) }
     end
 

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/metanorma.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug", "~> 10.0"
   spec.add_development_dependency "rspec-command", "~> 1.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "metanorma-iso", "~> 1.3"
+  spec.add_development_dependency "metanorma-iso", "~> 1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -202,7 +202,7 @@ homepage: https://github.com/metanorma/metanorma
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,9 +217,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create
   any standard document type supported by Metanorma.