stepmod-utils 0.3.2 → 0.3.8

data/lib/stepmod/utils/bibdata.rb

@@ -1,8 +1,6 @@
 module Stepmod
   module Utils
-
     class Bibdata
-
       DOCNUMBER = 10303
 
       attr_accessor *%w(
@@ -15,23 +13,25 @@ module Stepmod
         # module, resource, application_protocol, business_object_model
         @type = document.name
 
-        raise 'UnknownFileError' unless %w(module resource application_protocol business_object_model).include?(@type)
+        raise "UnknownFileError" unless %w(module resource
+                                           application_protocol business_object_model).include?(@type)
 
-        @doctype = document['status']
-        @part = document['part']
-        @title_en = document['title'] ||
-          document['name'].gsub('_', ' ').capitalize.gsub('2d','2D').gsub('3d','3D')
-        @title_fr = document['name.french']
-        @version = document['version']
-        @language = document['language']
+        @doctype = document["status"]
+        @part = document["part"]
+        @title_en = document["title"] ||
+          document["name"].gsub("_", " ").capitalize.gsub("2d", "2D").gsub("3d",
+                                                                           "3D")
+        @title_fr = document["name.french"]
+        @version = document["version"]
+        @language = document["language"]
 
         # Some publication.year contains month...
-        @pub_year = document['publication.year'].split('-').first
-        @pub_date = document['publication.date']
+        @pub_year = document["publication.year"].split("-").first
+        @pub_date = document["publication.date"]
 
         # puts to_mn_adoc
 
-        return self
+        self
         # <module
         #    name="security_classification"
         #    name.french="Classification des s&#233;curit&#233;s"
@@ -54,28 +54,27 @@ module Stepmod
         #    rcs.revision="$Revision: 1.26 $"
         #   development.folder="dvlp"
         # >
-
       end
 
       def docid
         no_date = case doctype
-        when "IS"
-          "ISO #{DOCNUMBER}-#{part}"
-        when "WD"
-          "ISO/WD #{DOCNUMBER}-#{part}"
-        when "CD"
-          "ISO/CD #{DOCNUMBER}-#{part}"
-        when "DIS"
-          "ISO/DIS #{DOCNUMBER}-#{part}"
-        when "FDIS"
-          "ISO/FDIS #{DOCNUMBER}-#{part}"
-        when "TS"
-          "ISO/TS #{DOCNUMBER}-#{part}"
-        when "CD-TS"
-          "ISO/CD TS #{DOCNUMBER}-#{part}"
-        else
-          "UNKNOWN DOCTYPE: (#{doctype})"
-        end
+                  when "IS"
+                    "ISO #{DOCNUMBER}-#{part}"
+                  when "WD"
+                    "ISO/WD #{DOCNUMBER}-#{part}"
+                  when "CD"
+                    "ISO/CD #{DOCNUMBER}-#{part}"
+                  when "DIS"
+                    "ISO/DIS #{DOCNUMBER}-#{part}"
+                  when "FDIS"
+                    "ISO/FDIS #{DOCNUMBER}-#{part}"
+                  when "TS"
+                    "ISO/TS #{DOCNUMBER}-#{part}"
+                  when "CD-TS"
+                    "ISO/CD TS #{DOCNUMBER}-#{part}"
+                  else
+                    "UNKNOWN DOCTYPE: (#{doctype})"
+                  end
 
         if pub_year
           "#{no_date}:#{pub_year}"
@@ -106,7 +105,7 @@ module Stepmod
       end
 
       def anchor
-        docid.gsub('/', '-').gsub(' ', '_').gsub(':', '_')
+        docid.gsub("/", "-").gsub(" ", "_").gsub(":", "_")
       end
 
       def to_mn_adoc
@@ -116,9 +115,6 @@ module Stepmod
           "* [[[#{anchor},#{docid}]]]"
         end
       end
-
     end
-
   end
 end
-

data/lib/stepmod/utils/cleaner.rb

@@ -1,11 +1,11 @@
-require 'reverse_adoc/cleaner'
+require "reverse_adoc/cleaner"
 
 module Stepmod
   module Utils
     class Cleaner < ReverseAdoc::Cleaner
       def tidy(string)
-        super.gsub(/^ +/, '')
+        super.gsub(/^ +/, "")
       end
     end
   end
-end
+end

data/lib/stepmod/utils/concept.rb

@@ -1,58 +1,114 @@
+require "glossarist"
+
 module Stepmod
   module Utils
-
-    class Concept
+    class Concept < Glossarist::LocalizedConcept
       attr_accessor *%w(
-        designation
-        definition
-        reference_anchor
         reference_clause
-        examples
-        notes
-        synonym
+        reference_anchor
         converted_definition
         file_path
       )
 
-      def initialize(options)
-        options.each_pair do |k, v|
-          send("#{k}=", v)
+      class << self
+        def parse(definition_xml, reference_anchor:, reference_clause:, file_path:, language_code: "en")
+          converted_definition = Stepmod::Utils::StepmodDefinitionConverter.convert(
+            definition_xml,
+            {
+              # We don't want examples and notes
+              no_notes_examples: true,
+              reference_anchor: reference_anchor,
+            },
+          )
+
+          return nil if converted_definition.nil? || converted_definition.strip.empty?
+
+          if definition_xml.name == "ext_description"
+            converted_definition = <<~TEXT
+              #{converted_definition}
+
+              NOTE: This term is incompletely defined in this document.
+              Reference <<#{reference_anchor}>> for the complete definition.
+            TEXT
+          end
+          # https://github.com/metanorma/stepmod-utils/issues/86
+          if definition_xml.name == "definition"
+            designation = definition_designation(definition_xml)
+            definition = definition_xml_definition(definition_xml,
+                                                   reference_anchor)
+            converted_definition = definition_xml_converted_definition(
+              designation, definition
+            ).strip
+          end
+          new(
+            designations: [designation],
+            definition: definition,
+            converted_definition: converted_definition,
+            id: "#{reference_anchor}.#{reference_clause}",
+            reference_anchor: reference_anchor,
+            reference_clause: reference_clause,
+            file_path: file_path,
+            language_code: language_code,
+          )
         end
-      end
 
-      def self.parse(definition_xml, reference_anchor:, reference_clause:, file_path:)
-        converted_definition = Stepmod::Utils::StepmodDefinitionConverter
-                                  .convert(definition_xml, { reference_anchor: reference_anchor })
+        def definition_designation(definition_xml)
+          alts = definition_xml.xpath(".//def/p").map(&:text)
+          {
+            accepted: definition_xml.xpath(".//term").first&.text,
+            alt: alts,
+          }
+        end
 
-        return nil if converted_definition.nil? || converted_definition.strip.empty?
+        def definition_xml_definition(definition_xml, reference_anchor)
+          text_nodes = definition_xml
+            .xpath(".//def")
+            .first
+            .children
+            .reject { |n| n.name == "p" }
+          wrapper = "<def>#{text_nodes.map(&:to_s).join}</def>"
+          Stepmod::Utils::Converters::Def
+            .new
+            .convert(
+              Nokogiri::XML(wrapper).root,
+              {
+                # We don't want examples and notes
+                no_notes_examples: true,
+                reference_anchor: reference_anchor,
+              },
+            )
+        end
 
-        if definition_xml.name == 'uof' || definition_xml.name == 'ext_description'
-          converted_definition = <<~TEXT
-            #{converted_definition.split("\n")[0..3].join("\n")}
+        def definition_xml_converted_definition(designation, definition)
+          if designation[:alt].length.positive?
+            alt_notation = "alt:[#{designation[:alt].map(&:strip).join(',')}]"
+          end
+          result = <<~TEXT
+            === #{designation[:accepted]}
+          TEXT
+          if alt_notation
+            result += <<~TEXT
 
-            NOTE: This term is incompletely defined in this document.
-            Reference <<#{reference_anchor}>> for the complete definition.
+              #{alt_notation}
+            TEXT
+          end
+          <<~TEXT
+            #{result}
+            #{definition}
           TEXT
         end
-        new(
-          converted_definition: converted_definition,
-          reference_anchor: reference_anchor,
-          reference_clause: reference_clause,
-          file_path: file_path
-        )
       end
 
       def to_mn_adoc
         <<~TEXT
-          // STEPmod path: #{file_path}
+          // STEPmod path:#{!file_path.empty? ? " #{file_path}" : ''}
           #{converted_definition}
 
           [.source]
-          <<#{reference_anchor}#{reference_clause ? ",clause=" + reference_clause : ""}>>
+          <<#{reference_anchor}#{reference_clause ? ",clause=#{reference_clause}" : ''}>>
 
         TEXT
       end
-
     end
   end
 end

data/lib/stepmod/utils/converters/a.rb

@@ -8,17 +8,17 @@ module Stepmod
       class A < ReverseAdoc::Converters::Base
         def convert(node, state = {})
           name  = treat_children(node, state)
-          href  = node['href']
+          href  = node["href"]
           title = extract_title(node)
-          id = node['id'] || node['name']
+          id = node["id"] || node["name"]
 
           id = id&.gsub(/\s/, "")&.gsub(/__+/, "_")
 
-          if /^_Toc\d+$|^_GoBack$/.match id
+          if /^_Toc\d+$|^_GoBack$/.match? id
             ""
           elsif !id.nil? && !id.empty?
             "[[#{id}]]"
-          elsif href.to_s.start_with?('#')
+          elsif href.to_s.start_with?("#")
             href = href.sub(/^#/, "").gsub(/\s/, "").gsub(/__+/, "_")
             if name.empty?
               "<<#{href}>>"
@@ -29,16 +29,13 @@ module Stepmod
             name
           else
             name = title if name.empty?
-            href = "link:#{href}" unless href.to_s =~ URI::DEFAULT_PARSER.make_regexp
+            href = "link:#{href}" unless href.to_s&.match?(URI::DEFAULT_PARSER.make_regexp)
             link = "#{href}[#{name}]"
             # link.prepend(' ')
-            link = " #{link}"
-            link
+            " #{link}"
+
           end
         end
-
-        private
-
       end
 
       ReverseAdoc::Converters.register :a, A.new

data/lib/stepmod/utils/converters/blockquote.rb

@@ -5,14 +5,14 @@ module Stepmod
     module Converters
       class Blockquote < ReverseAdoc::Converters::Base
         def convert(node, state = {})
-          id = node['id']
+          id = node["id"]
           anchor = id ? "[[#{id}]]\n" : ""
-          cite = node['cite']
+          cite = node["cite"]
           attrs = cite ? "[quote, #{cite}]\n" : ""
           content = treat_children(node, state).strip
           content = ReverseAdoc.cleaner.remove_newlines(content)
-          #"\n\n> " << content.lines.to_a.join('> ') << "\n\n"
-          "\n\n#{attrs}____\n" << content.lines.to_a.join('') << "\n____\n\n"
+          # "\n\n> " << content.lines.to_a.join('> ') << "\n\n"
+          "\n\n#{attrs}____\n" << content.lines.to_a.join("") << "\n____\n\n"
         end
       end
 

data/lib/stepmod/utils/converters/br.rb

@@ -4,7 +4,7 @@ module Stepmod
   module Utils
     module Converters
       class Br < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
+        def convert(_node, _state = {})
           " +\n"
         end
       end

data/lib/stepmod/utils/converters/bypass.rb

@@ -16,66 +16,66 @@ module Stepmod
       ReverseAdoc::Converters.register :thead,    Bypass.new
       ReverseAdoc::Converters.register :tbody,    Bypass.new
       ReverseAdoc::Converters.register :tfoot,    Bypass.new
-      ReverseAdoc::Converters.register :abbr,    Bypass.new
+      ReverseAdoc::Converters.register :abbr, Bypass.new
       ReverseAdoc::Converters.register :acronym,    Bypass.new
       ReverseAdoc::Converters.register :address,    Bypass.new
-      ReverseAdoc::Converters.register :applet,    Bypass.new
-      ReverseAdoc::Converters.register :map,    Bypass.new
-      ReverseAdoc::Converters.register :area,    Bypass.new
+      ReverseAdoc::Converters.register :applet, Bypass.new
+      ReverseAdoc::Converters.register :map, Bypass.new
+      ReverseAdoc::Converters.register :area, Bypass.new
       ReverseAdoc::Converters.register :bdi,    Bypass.new
       ReverseAdoc::Converters.register :bdo,    Bypass.new
       ReverseAdoc::Converters.register :big,    Bypass.new
       ReverseAdoc::Converters.register :button,    Bypass.new
       ReverseAdoc::Converters.register :canvas,    Bypass.new
-      ReverseAdoc::Converters.register :data,    Bypass.new
-      ReverseAdoc::Converters.register :datalist,    Bypass.new
+      ReverseAdoc::Converters.register :data, Bypass.new
+      ReverseAdoc::Converters.register :datalist, Bypass.new
       ReverseAdoc::Converters.register :del,    Bypass.new
       ReverseAdoc::Converters.register :ins,    Bypass.new
       ReverseAdoc::Converters.register :dfn,    Bypass.new
-      ReverseAdoc::Converters.register :dialog,    Bypass.new
-      ReverseAdoc::Converters.register :embed,    Bypass.new
-      ReverseAdoc::Converters.register :fieldset,    Bypass.new
-      ReverseAdoc::Converters.register :font,    Bypass.new
-      ReverseAdoc::Converters.register :footer,    Bypass.new
-      ReverseAdoc::Converters.register :form,    Bypass.new
-      ReverseAdoc::Converters.register :frame,    Bypass.new
-      ReverseAdoc::Converters.register :frameset,    Bypass.new
+      ReverseAdoc::Converters.register :dialog, Bypass.new
+      ReverseAdoc::Converters.register :embed, Bypass.new
+      ReverseAdoc::Converters.register :fieldset, Bypass.new
+      ReverseAdoc::Converters.register :font, Bypass.new
+      ReverseAdoc::Converters.register :footer, Bypass.new
+      ReverseAdoc::Converters.register :form, Bypass.new
+      ReverseAdoc::Converters.register :frame, Bypass.new
+      ReverseAdoc::Converters.register :frameset, Bypass.new
       ReverseAdoc::Converters.register :header,    Bypass.new
       ReverseAdoc::Converters.register :iframe,    Bypass.new
       ReverseAdoc::Converters.register :input,    Bypass.new
       ReverseAdoc::Converters.register :label,    Bypass.new
-      ReverseAdoc::Converters.register :legend,    Bypass.new
+      ReverseAdoc::Converters.register :legend, Bypass.new
       ReverseAdoc::Converters.register :main,    Bypass.new
       ReverseAdoc::Converters.register :menu,    Bypass.new
-      ReverseAdoc::Converters.register :menulist,    Bypass.new
-      ReverseAdoc::Converters.register :meter,    Bypass.new
-      ReverseAdoc::Converters.register :nav,    Bypass.new
+      ReverseAdoc::Converters.register :menulist, Bypass.new
+      ReverseAdoc::Converters.register :meter, Bypass.new
+      ReverseAdoc::Converters.register :nav, Bypass.new
       ReverseAdoc::Converters.register :noframes,    Bypass.new
       ReverseAdoc::Converters.register :noscript,    Bypass.new
-      ReverseAdoc::Converters.register :object,    Bypass.new
-      ReverseAdoc::Converters.register :optgroup,    Bypass.new
+      ReverseAdoc::Converters.register :object, Bypass.new
+      ReverseAdoc::Converters.register :optgroup, Bypass.new
       ReverseAdoc::Converters.register :option,    Bypass.new
       ReverseAdoc::Converters.register :output,    Bypass.new
-      ReverseAdoc::Converters.register :param,    Bypass.new
-      ReverseAdoc::Converters.register :picture,    Bypass.new
-      ReverseAdoc::Converters.register :progress,    Bypass.new
-      ReverseAdoc::Converters.register :ruby,    Bypass.new
+      ReverseAdoc::Converters.register :param, Bypass.new
+      ReverseAdoc::Converters.register :picture, Bypass.new
+      ReverseAdoc::Converters.register :progress, Bypass.new
+      ReverseAdoc::Converters.register :ruby, Bypass.new
       ReverseAdoc::Converters.register :rt,    Bypass.new
       ReverseAdoc::Converters.register :rp,    Bypass.new
-      ReverseAdoc::Converters.register :s,    Bypass.new
-      ReverseAdoc::Converters.register :select,    Bypass.new
-      ReverseAdoc::Converters.register :small,    Bypass.new
-      ReverseAdoc::Converters.register :span,    Bypass.new
-      ReverseAdoc::Converters.register :strike,    Bypass.new
+      ReverseAdoc::Converters.register :s, Bypass.new
+      ReverseAdoc::Converters.register :select, Bypass.new
+      ReverseAdoc::Converters.register :small, Bypass.new
+      ReverseAdoc::Converters.register :span, Bypass.new
+      ReverseAdoc::Converters.register :strike, Bypass.new
       ReverseAdoc::Converters.register :details,    Bypass.new
       ReverseAdoc::Converters.register :section,    Bypass.new
       ReverseAdoc::Converters.register :summary,    Bypass.new
-      ReverseAdoc::Converters.register :svg,    Bypass.new
+      ReverseAdoc::Converters.register :svg, Bypass.new
       ReverseAdoc::Converters.register :template,    Bypass.new
       ReverseAdoc::Converters.register :textarea,    Bypass.new
-      ReverseAdoc::Converters.register :track,    Bypass.new
-      ReverseAdoc::Converters.register :u,    Bypass.new
-      ReverseAdoc::Converters.register :wbr,    Bypass.new
+      ReverseAdoc::Converters.register :track, Bypass.new
+      ReverseAdoc::Converters.register :u, Bypass.new
+      ReverseAdoc::Converters.register :wbr, Bypass.new
     end
   end
 end

data/lib/stepmod/utils/converters/clause_ref.rb

@@ -5,7 +5,7 @@ module Stepmod
     module Converters
       class ClauseRef < ReverseAdoc::Converters::Base
         def convert(node, _state = {})
-          " term:[#{normalized_ref(node['linkend'])}] "
+          " {{#{normalized_ref(node['linkend'])}}} "
         end
 
         private
@@ -13,10 +13,10 @@ module Stepmod
         def normalized_ref(ref)
           return unless ref || ref.empty?
 
-          ref.to_s.split(':').last.squeeze(' ').strip
+          ref.to_s.split(":").last.squeeze(" ").strip
         end
       end
       ReverseAdoc::Converters.register :clause_ref, ClauseRef.new
     end
   end
-end
+end

data/lib/stepmod/utils/converters/code.rb

@@ -4,7 +4,7 @@ module Stepmod
   module Utils
     module Converters
       class Code < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
+        def convert(node, _state = {})
           "`#{node.text}`"
         end
       end

data/lib/stepmod/utils/converters/comment.rb

@@ -4,8 +4,10 @@ module Stepmod
   module Utils
     module Converters
       class Comment < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
-          comment = node.text.strip.split("\n").map{|line| "// #{line}"}.join("\n")
+        def convert(node, _state = {})
+          comment = node.text.strip.split("\n").map do |line|
+            "\n// #{line}"
+          end.join("\n")
           "#{comment}\n"
         end
       end
@@ -13,4 +15,4 @@ module Stepmod
       ReverseAdoc::Converters.register :comment, Comment.new
     end
   end
-end
+end

data/lib/stepmod/utils/converters/dd.rb

@@ -4,7 +4,7 @@ module Stepmod
   module Utils
     module Converters
       class Dd < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
+        def convert(node, _state = {})
           "#{node.text}\n"
         end
 
@@ -12,4 +12,4 @@ module Stepmod
       end
     end
   end
-end
+end

data/lib/stepmod/utils/converters/def.rb

@@ -1,4 +1,3 @@
-
 module Stepmod
   module Utils
     module Converters
@@ -12,24 +11,30 @@ module Stepmod
 
         def treat_children(node, state)
           converted = node.children.each_with_object({}) do |child, res|
-                        content = treat(child, state).strip
-                        next if content.empty?
+            content = treat(child, state)
+            next if content.strip.empty?
 
-                        res[child] = content
-                      end
+            res[child] = content
+          end
           previous = nil
-          result = ''
-          converted.each.with_index do |(child, content), i|
-            if block_tag?(child, previous)
-              result += "\n\n"
-            elsif comment_tag?(child, previous)
-              result += "\n"
-            else
-              result += ' '
-            end
+          result = ""
+
+          converted.each.with_index do |(child, content), _i|
+            result += if block_tag?(child, previous)
+                        "\n\n"
+                      elsif comment_tag?(child, previous)
+                        "\n"
+                      else
+                        " "
+                      end
             result += content
             previous = child
           end
+
+          # Remove double newlines for every line
+          result = result.gsub(/\n\n+/, "\n\n")
+          result = result.squeeze(" ")
+
           result.strip
         end
 
@@ -39,31 +44,34 @@ module Stepmod
         end
 
         def comment_tag?(child, previous)
-          child.name == 'comment' || (previous && previous.name === 'comment')
+          child.name == "comment" || (previous && previous.name === "comment")
         end
 
         def additional_block(node)
           # Treat first `p` tag as an `alt` block, metanorma/stepmod-utils#9
           first_child_tag = node
-                              .children
-                              .find { |n| n.is_a?(Nokogiri::XML::Element) }
+            .children
+            .find { |n| n.is_a?(Nokogiri::XML::Element) }
           return unless can_transform_to_alt?(first_child_tag)
 
           result = Stepmod::Utils::Converters::Synonym
-                    .new
-                    .convert(first_child_tag)
+            .new
+            .convert(first_child_tag)
+
           first_child_tag.remove
           "#{result}\n\n"
         end
 
         # metanorma/stepmod-utils#18 when para is the only text doe snot transform it
         def can_transform_to_alt?(first_child_tag)
-          return false unless first_child_tag&.name == 'p' &&
-                                defined?(Stepmod::Utils::Converters::Synonym)
+          return false unless first_child_tag&.name == "p" &&
+            defined?(Stepmod::Utils::Converters::Synonym)
 
           next_sibling = first_child_tag.next
           while next_sibling
-            return true if !next_sibling.text.to_s.strip.empty? && %w[p text].include?(next_sibling.name)
+            return true if !next_sibling.text.to_s.strip.empty? && %w[p
+                                                                      text].include?(next_sibling.name)
+
             next_sibling = next_sibling.next
           end
           false

data/lib/stepmod/utils/converters/drop.rb

@@ -4,8 +4,8 @@ module Stepmod
   module Utils
     module Converters
       class Drop < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
-          ''
+        def convert(_node, _state = {})
+          ""
         end
       end
 

data/lib/stepmod/utils/converters/dt.rb

@@ -4,7 +4,7 @@ module Stepmod
   module Utils
     module Converters
       class Dt < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
+        def convert(node, _state = {})
           return "\n\n{blank}::" if node.text.strip.length.zero?
 
           "\n\n#{node.text}:: "
@@ -14,4 +14,4 @@ module Stepmod
       end
     end
   end
-end
+end

data/lib/stepmod/utils/converters/em.rb

@@ -15,7 +15,7 @@ module Stepmod
       end
 
       ReverseAdoc::Converters.register :em, Em.new
-      ReverseAdoc::Converters.register :cite,  Em.new
+      ReverseAdoc::Converters.register :cite, Em.new
     end
   end
 end

data/lib/stepmod/utils/converters/em_express_description.rb

@@ -16,7 +16,7 @@ module Stepmod
 
       ReverseAdoc::Converters.register :em, Em.new
       ReverseAdoc::Converters.register :i,  Em.new
-      ReverseAdoc::Converters.register :cite,  Em.new
+      ReverseAdoc::Converters.register :cite, Em.new
     end
   end
 end