metanorma 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d843209061879c8c480450a7b96dcb18316b3a548b3251ecb3e2b6c82de2a83
-  data.tar.gz: fa86d23716b90c30e67ae3a2ff591ce519e6cd93e3026acb60b02864c1d6fea8
+  metadata.gz: fbe49b657d41e2d71ea35393334a71bf9ae2392b9de90d696cb54783f3fe520e
+  data.tar.gz: 4fd60291f8196e53db4e55c3f33d6fb4705a3984f7c110ad7643997f26a2b8d1
 SHA512:
-  metadata.gz: 456219d55650a7a12c3f7d70aba2fcdf379ce7545a511c6debc26214e47ce95ccf4234e3efad70d75af6e12999868bf9ddb00681320f039c27a7a2828d835ae7
-  data.tar.gz: '081e968760169e138184897552b0489b2d1496f81b9b2ae23884b1eb81c082218b8a2a325cc7f3cc0358c72bea5a81659da5c8ae3ef9fedbe391faba5fe3f939'
+  metadata.gz: d74a51133af96c89f4c0afd0d4c0c2438865f3d8a93dd4830908fdb462df5ae40edc9c6b1a1e65b94fdb9c7923ec5bea6a9feb5e65f4637a53aba2ef499d510e
+  data.tar.gz: 9b20f7bb1c651caa048207d62bbb800808a71e377a55a7b1c0283861a5b87e4dc6c6df2b2028512cd58f99c838e3ec50d0a99a88d556e1fdaa853bbf6400ff89

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma (0.3.6)
+    metanorma (0.3.7)
       asciidoctor
 
 GEM

data/README.adoc

@@ -1,8 +1,9 @@
 = Metanorma: the standard for standards
 
 image:https://img.shields.io/gem/v/metanorma.svg["Gem Version", link="https://rubygems.org/gems/metanorma"]
-image:https://img.shields.io/travis/riboseinc/metanorma/master.svg["Build Status", link="https://travis-ci.com/riboseinc/metanorma"]
+image:https://img.shields.io/travis/riboseinc/metanorma/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma"]
 image:https://codeclimate.com/github/riboseinc/metanorma/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma"]
+image:https://ci.appveyor.com/api/projects/status/t8irmy9iq4xf1ouy?svg=true["AppVeyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma"]
 
 Metanorma is dedicated to harmonizing standard documents
 produced by different standard-setting bodies in a manner that
@@ -141,6 +142,7 @@ Usage: metanorma [options] <file>
   -w, --wrapper                    Create wrapper folder for HTML output
   -d, --data-uri-image             Encode HTML output images as data URIs
   -R, --relaton FILENAME           Export Relaton XML (bibdata) for this document to FILENAME
+      (Also triggered through -x rxl)
   -h, --help                       Show this message
 ----
 
@@ -196,15 +198,16 @@ $ metanorma -t mpfd mpfd-bpn.adoc
 $ metanorma -t mpfd -r metanorma-mpfd mpfd-bpn.adoc
 ----
 
-The `type` and `extension` options can be omitted if the corresponding metanorma directives
+The `type`, `extension` and `relaton` options can be omitted if the corresponding metanorma directives
 are included in the document as Metanorma directives; for Asciidoctor input, these take the form
-of document attributes `mn-document-class:` and `:mn-output-extensions:`, e.g.
+of document attributes `mn-document-class:`, `:mn-output-extensions:` and `:mn-relaton-output-file:`, e.g.
 
 [source,asciidoctor]
 ----
 = My ISO document
 :mn-document-class: iso
 :mn-output-extensions: html,xml,pdf
+:mn-relaton-output-file: test.xml
 
 .Foreword
 ----

data/lib/metanorma/compile.rb

@@ -29,6 +29,8 @@ module Metanorma
     def options_extract(filename, options)
       o = Metanorma::Input::Asciidoc.new.extract_metanorma_options(File.read(filename, encoding: "utf-8"))
       options[:type] ||= o[:type]&.to_sym
+      dir = filename.sub(%r(/[^/]+$), "/")
+      options[:relaton] ||= "#{dir}/#{o[:relaton]}" if o[:relaton]
       options[:extension_keys] ||= o[:extensions]&.split(/,[ ]*/)&.map(&:to_sym)
       options[:extension_keys] = nil if options[:extension_keys] == [:all]
       options[:format] ||= :asciidoc
@@ -103,11 +105,11 @@ module Metanorma
 
     def relaton_export(isodoc, options)
       return unless options[:relaton]
-    xml = Nokogiri::XML(isodoc)
-    bibdata = xml.at("//bibdata") || xml.at("//xmlns:bibdata")
-    #docid = bibdata&.at("./xmlns:docidentifier")&.text || options[:filename]
-    #outname = docid.sub(/^\s+/, "").sub(/\s+$/, "").gsub(/\s+/, "-") + ".xml"
-    File.open(options[:relaton], "w:UTF-8") { |f| f.write bibdata.to_xml }
+      xml = Nokogiri::XML(isodoc)
+      bibdata = xml.at("//bibdata") || xml.at("//xmlns:bibdata")
+      #docid = bibdata&.at("./xmlns:docidentifier")&.text || options[:filename]
+      #outname = docid.sub(/^\s+/, "").sub(/\s+$/, "").gsub(/\s+/, "-") + ".xml"
+      File.open(options[:relaton], "w:UTF-8") { |f| f.write bibdata.to_xml }
     end
 
     def process_extensions(extensions, file, isodoc, options)
@@ -116,7 +118,12 @@ module Metanorma
         isodoc_options[:datauriimage] = true if options[:datauriimage]
         file_extension = @processor.output_formats[ext]
         outfilename = options[:filename].sub(/\.[^.]+$/, ".#{file_extension}")
-        @processor.output(isodoc, outfilename, ext, isodoc_options)
+        if ext == :rxl
+          options[:relaton] = outfilename
+          relaton_export(isodoc, options)
+        else
+          @processor.output(isodoc, outfilename, ext, isodoc_options)
+        end
         if options[:wrapper] and /html$/.match file_extension
           outfilename = outfilename.sub(/\.html$/, "")
           FileUtils.mkdir_p outfilename

data/lib/metanorma/input/asciidoc.rb

@@ -19,9 +19,11 @@ module Metanorma
         headerextract = file.sub(/\n\n.*$/m, "\n")
         /\n:mn-document-class: (?<type>[^\n]+)\n/ =~ headerextract
         /\n:mn-output-extensions: (?<extensions>[^\n]+)\n/ =~ headerextract
+        /\n:mn-relaton-output-file: (?<relaton>[^\n]+)\n/ =~ headerextract
         {
           type: defined?(type) ? type : nil,
           extensions: defined?(extensions) ? extensions : nil,
+          relaton: defined?(relaton) ? relaton : nil,
         }.reject { |_, val| val.nil? }
       end
 

data/lib/metanorma/output/pdf.rb

@@ -3,7 +3,9 @@ module Metanorma
     class Pdf < Base
 
       def convert(url_path, output_path)
-        file_url = "file://#{Dir.pwd}/#{url_path}"
+        file_url = url_path
+        file_url = "file://#{url_path}" if %r{^/}.match file_url
+        file_url = "file://#{Dir.pwd}/#{url_path}" unless %r{^file://}.match file_url
         pdfjs = File.join(File.dirname(__FILE__), '../../../bin/metanorma-pdf.js')
         ENV['NODE_PATH'] ||= `npm root --quiet -g`.strip
         system "node #{pdfjs} #{file_url} #{output_path}"

data/lib/metanorma/processor.rb

@@ -13,7 +13,8 @@ module Metanorma
 
     def output_formats
       {
-        xml: "xml"
+        xml: "xml",
+        rxl: "rxl"
       }
     end
 

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor