metanorma-generic 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbd87f79baeb66107643bd3c6e9377853f72f3b19d17615aced5737609ea31e4
-  data.tar.gz: a1e014a6a7076b4f39c37bcb35d67fecb221ff0494ba38ce88482affb8aef854
+  metadata.gz: 2e39cd0bf72f4464ca05b5e8b31964ca9c4394fece3c6bb40cb503fd587ee158
+  data.tar.gz: 74b2cb557b05f508b7a6260ba6b0343a8841f660b6adca537ded5584e015a8f1
 SHA512:
-  metadata.gz: b26374f517b2c486fd6780a66f05357689990026dab52e88c8f8b9a1aec881653a4f23f915bf5e6944c83ae8fe943046ae42047382c3968a5b1cca11204f5a53
-  data.tar.gz: 35502f72cf8aa2f3f19848d4fe9326994f8af544531e71da3dabf61215329c164404cfd5d7fab6e72da66f43ae851272ceaf6a1d9fbf6a72fdf15552d6dcd4e6
+  metadata.gz: 378e9b3795ffad13435bd584ec35c0d1bdfb25f9be58f9436dc19257066f4d8a0698f8e30456bf8a5be87bcfb232ad0f7978194ce794c9d01998888bf1973116
+  data.tar.gz: 3a054e05fcc4dc3875935ffc39858ad77568861a8517d450171376bcb02155a697af73493edc42257e15a632cdc629be8723857417d35f0c72d54eb809bb1786

data/lib/asciidoctor/generic/converter.rb

@@ -1,13 +1,10 @@
 require "asciidoctor"
 require "asciidoctor/standoc/converter"
 require "fileutils"
+require_relative "front"
 
 module Asciidoctor
   module Generic
-
-    # A {Converter} implementation that generates RSD output, and a document
-    # schema encapsulation of the document for validation
-    #
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "generic-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/generic".freeze
@@ -28,49 +25,6 @@ module Asciidoctor
           self.class::_file || __FILE__), "..", "..", "..", loc))
       end
 
-      def default_publisher
-        configuration.organization_name_long
-      end
-
-      def org_abbrev
-        if !configuration.organization_name_long.empty? &&
-            !configuration.organization_name_short.empty? &&
-            configuration.organization_name_long !=
-            configuration.organization_name_short
-          { configuration.organization_name_long =>
-            configuration.organization_name_short }
-        else
-          super
-        end
-      end
-
-      def relaton_relations
-        Array(configuration.relations) || []
-      end
-
-      def metadata_committee(node, xml)
-        return unless node.attr("committee")
-        xml.editorialgroup do |a|
-          a.committee node.attr("committee"),
-            **attr_code(type: node.attr("committee-type"))
-          i = 2
-          while node.attr("committee_#{i}") do
-            a.committee node.attr("committee_#{i}"),
-              **attr_code(type: node.attr("committee-type_#{i}"))
-            i += 1
-          end
-        end
-      end
-
-      def metadata_status(node, xml)
-        xml.status do |s|
-          s.stage ( node.attr("status") || node.attr("docstage") ||
-                   configuration.default_stage || "published" )
-          x = node.attr("substage") and s.substage x
-          x = node.attr("iteration") and s.iteration x
-        end
-      end
-
       def docidentifier_cleanup(xmldoc)
         template = configuration.docid_template ||
           "{{ organization_name_short }} {{ docnumeric }}"
@@ -79,30 +33,15 @@ module Asciidoctor
         id.empty? and docid.remove or docid.children = id
       end
 
-      def metadata_id(node, xml)
-        xml.docidentifier **{ type:
-                              configuration.organization_name_short } do |i|
-          i << "DUMMY"
-        end
-        xml.docnumber { |i| i << node.attr("docnumber") }
-      end
-
-      def metadata_ext(node, ext)
-        super
-        Array(configuration.metadata_extensions).each do |e|
-          a = node.attr(e) and ext.send e, a
-        end
-      end
-
       def doctype(node)
         d = super
         configuration.doctypes or return d == "article" ? "standard" : d
-        default = configuration.default_doctype || Array(configuration.doctypes).dig(0) ||
-          "standard"
+        type = configuration.default_doctype ||
+          Array(configuration.doctypes).dig(0) || "standard"
         unless Array(configuration.doctypes).include? d
           @log.add("Document Attributes", nil,
-                   "#{d} is not a legal document type: reverting to '#{default}'")
-          d = default
+                   "#{d} is not a legal document type: reverting to '#{type}'")
+          d = type
         end
         d
       end
@@ -113,13 +52,13 @@ module Asciidoctor
       end
 
       def sectiontype_streamline(ret)
-        if configuration.termsdefs_titles.map(&:downcase).include? (ret)
+        if configuration&.termsdefs_titles&.map(&:downcase)&.include? (ret)
           "terms and definitions"
-        elsif configuration.symbols_titles.map(&:downcase).include? (ret)
+        elsif configuration&.symbols_titles&.map(&:downcase)&.include? (ret)
           "symbols and abbreviated terms"
-        elsif configuration.normref_titles.map(&:downcase).include? (ret)
+        elsif configuration&.normref_titles&.map(&:downcase)&.include? (ret)
           "normative references"
-        elsif configuration.bibliography_titles.map(&:downcase).include? (ret)
+        elsif configuration&.bibliography_titles&.map(&:downcase)&.include? (ret)
           "bibliography"
         else
           ret
@@ -135,9 +74,9 @@ module Asciidoctor
         File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node)&.convert(@filename + ".xml")
         html_converter(node)&.convert(@filename + ".presentation.xml", 
-                                     nil, false, "#{@filename}.html")
+                                      nil, false, "#{@filename}.html")
         doc_converter(node)&.convert(@filename + ".presentation.xml", 
-                                    nil, false, "#{@filename}.doc")
+                                     nil, false, "#{@filename}.doc")
         pdf_converter(node)&.convert(@filename + ".presentation.xml", 
                                      nil, false, "#{@filename}.pdf")
 
@@ -221,6 +160,18 @@ module Asciidoctor
         f.is_a? Hash and f[@lang] and return baselocation(f[@lang])
         super
       end
+
+      def cleanup(xmldoc)
+        super
+        empty_metadata_cleanup(xmldoc)
+        xmldoc
+      end
+
+      def empty_metadata_cleanup(xmldoc)
+        xmldoc.xpath("//bibdata/ext//*").each do |x|
+          x.remove if x.children.empty?
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/generic/front.rb

@@ -0,0 +1,103 @@
+module Asciidoctor
+  module Generic
+    class Converter < Standoc::Converter
+      def default_publisher
+        configuration.organization_name_long
+      end
+
+      def org_abbrev
+        if !configuration.organization_name_long.empty? &&
+            !configuration.organization_name_short.empty? &&
+            configuration.organization_name_long !=
+            configuration.organization_name_short
+          { configuration.organization_name_long =>
+            configuration.organization_name_short }
+        else
+          super
+        end
+      end
+
+      def relaton_relations
+        Array(configuration.relations) || []
+      end
+
+      def metadata_committee(node, xml)
+        return unless node.attr("committee")
+        xml.editorialgroup do |a|
+          a.committee node.attr("committee"),
+            **attr_code(type: node.attr("committee-type"))
+          i = 2
+          while node.attr("committee_#{i}") do
+            a.committee node.attr("committee_#{i}"),
+              **attr_code(type: node.attr("committee-type_#{i}"))
+            i += 1
+          end
+        end
+      end
+
+      def metadata_status(node, xml)
+        xml.status do |s|
+          s.stage ( node.attr("status") || node.attr("docstage") ||
+                   configuration.default_stage || "published" )
+          x = node.attr("substage") and s.substage x
+          x = node.attr("iteration") and s.iteration x
+        end
+      end
+
+      def metadata_id(node, xml)
+        xml.docidentifier **{ type:
+                              configuration.organization_name_short } do |i|
+          i << "DUMMY"
+        end
+        xml.docnumber { |i| i << node.attr("docnumber") }
+      end
+
+      def metadata_ext(node, ext)
+        super
+        if configuration.metadata_extensions.is_a? Hash
+          metadata_ext_hash(node, ext, configuration.metadata_extensions)
+        else
+          Array(configuration.metadata_extensions).each do |e|
+            a = node.attr(e) and ext.send e, a
+          end
+        end
+      end
+
+      EXT_STRUCT = %w(_output _attribute _list).freeze
+
+      def metadata_ext_hash(node, ext, hash)
+        hash.each do |k, v|
+          next if EXT_STRUCT.include?(k) || !v&.is_a?(Hash) && !node.attr(k)
+          if v&.is_a?(Hash) && v["_list"]
+            csv_split(node.attr(k)).each do |val|
+              metadata_ext_hash1(k, val, ext, v, node)
+            end
+          else
+            metadata_ext_hash1(k, node.attr(k), ext, v, node)
+          end
+        end
+      end
+
+      def metadata_ext_hash1(key, value, ext, hash, node)
+        return if hash&.is_a?(Hash) && hash["_attribute"]
+        is_hash = hash&.is_a?(Hash) &&
+            !hash.keys.reject { |n| EXT_STRUCT.include?(n) }.empty?
+        return if !is_hash && (value.nil? || value.empty?)
+        name = hash&.is_a?(Hash) ? (hash["_output"] || key) : key
+        ext.send name, **attr_code(metadata_ext_attrs(hash, node)) do |e|
+            is_hash ? metadata_ext_hash(node, e, hash) : (e << value)
+        end
+      end
+
+      def metadata_ext_attrs(hash, node)
+        return {} unless hash.is_a?(Hash)
+        ret = {}
+        hash.each do |k, v|
+          next unless v.is_a?(Hash) && v["_attribute"]
+          ret[(v["_output"] || k).to_sym] = node.attr(k)
+        end
+        ret
+      end
+    end
+  end
+end

data/lib/asciidoctor/generic/isodoc.rng

@@ -42,7 +42,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>

data/lib/isodoc/generic/metadata.rb

@@ -1,7 +1,30 @@
 require "isodoc"
+require "nokogiri"
 require_relative "init"
 require_relative "utils"
 
+class Nokogiri::XML::Node
+  TYPENAMES = {1=>'element',2=>'attribute',3=>'text',4=>'cdata',8=>'comment'}
+  def to_hash
+    ret = {kind:TYPENAMES[node_type],name:name}.tap do |h|
+      h.merge! text:text&.strip 
+      a = attribute_nodes.map(&:to_hash)
+      if element? && !a.empty?
+        h.merge! attr: a.inject({}) { |m, v| m[v[:name]] = v[:text]; m }
+      end
+      c = children.map(&:to_hash)
+      if element? && !(c&.size == 1 && c[0][:kind] == "text")
+        h.merge! kids: c.delete_if { |n| n[:kind] == "text" && n[:text].empty? }
+      end
+    end
+    ret
+  end
+end
+
+class Nokogiri::XML::Document
+  def to_hash; root.to_hash; end
+end
+
 module IsoDoc
   module Generic
 
@@ -24,20 +47,6 @@ module IsoDoc
         k._file = caller_locations.first.absolute_path
       end
 
-=begin
-       def baselocation(loc)
-        return nil if loc.nil?
-        File.expand_path(File.join(File.dirname(
-          self.class.respond_to?(:_file) ? (self.class::_file || __FILE__) :
-          __FILE__),
-        "..", "..", "..", loc))
-      end
-
-      def configuration
-        Metanorma::Generic.configuration
-      end
-=end
-
       def author(isoxml, _out)
         super
         tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
@@ -54,11 +63,29 @@ module IsoDoc
         !(Array(stages).map { |m| m.downcase }.include? status.downcase)
       end
 
-      def ext(isoxml, out)
-        Array(configuration.metadata_extensions).each do |e|
-          b = isoxml&.at(ns("//bibdata/ext/#{e}"))&.text or next
-          set(e.to_sym, b)
+      def xmlhash2hash(h)
+        ret = {}
+        return ret if h.nil? || h[:kind] != "element"
+        h[:attr].nil? or h[:attr].each { |k, v| ret["#{h[:name]}_#{k}"] = v }
+        ret[h[:name]] = h[:kids] ? xmlhash2hash_kids(h) : h[:text]
+        ret
+      end
+
+      def xmlhash2hash_kids(h)
+        c = {}
+        h[:kids].each do |n|
+          xmlhash2hash(n).each do |k1, v1|
+            c[k1] = c[k1].nil? ? v1 :
+              c[k1].is_a?(Array) ? c[k1] << v1 :
+              [c[k1], v1]
+          end
         end
+        c
+      end
+
+      def ext(isoxml, out)
+        b = isoxml&.at(ns("//bibdata/ext")) or return
+        set(:metadata_extensions, xmlhash2hash(b.to_hash)["ext"])
       end
 
       include Utils

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.7.0"
+    VERSION = "1.7.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -236,6 +236,7 @@ files:
 - lib/asciidoctor/generic/basicdoc.rng
 - lib/asciidoctor/generic/biblio.rng
 - lib/asciidoctor/generic/converter.rb
+- lib/asciidoctor/generic/front.rb
 - lib/asciidoctor/generic/generic.rng
 - lib/asciidoctor/generic/isodoc.rng
 - lib/asciidoctor/generic/reqt.rng