stepmod-utils 0.3.5 → 0.3.7

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

@@ -4,10 +4,10 @@ module Stepmod
   module Utils
     module Converters
       class PassThrough < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
+        def convert(node, _state = {})
           node.to_s
         end
       end
     end
   end
-end
+end

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

@@ -13,4 +13,4 @@ module Stepmod
       ReverseAdoc::Converters.register :q, Q.new
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ module Stepmod
     module Converters
       class Schema < ReverseAdoc::Converters::Base
         def convert(node, state = {})
-          state = state.merge(schema_name: node['name'])
+          state = state.merge(schema_name: node["name"])
           <<~TEMPLATE
             (*"#{node['name']}"
             #{treat_children(node, state).strip}

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'stepmod/utils/converters/em'
+require "stepmod/utils/converters/em"
 
 module Stepmod
   module Utils

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

@@ -3,8 +3,8 @@ module Stepmod
     module Converters
       class StepmodExtDescription < ReverseAdoc::Converters::Base
         def convert(node, state = {})
-          state = state.merge(schema_name: node['linkend'])
-          linkend = node['linkend'].split('.')
+          state = state.merge(schema_name: node["linkend"])
+          linkend = node["linkend"].split(".")
 
           # We only want ENTITY entries, not their attributes
           # https://github.com/metanorma/iso-10303-2/issues/36#issuecomment-841300092
@@ -32,13 +32,14 @@ module Stepmod
           <<~TEMPLATE
             === #{linkend.last}
 
-            #{domain ? "domain:[" + domain + "]" : ""}
+            #{domain ? "domain:[#{domain}]" : ''}
 
             #{child_text}
           TEMPLATE
         end
       end
-      ReverseAdoc::Converters.register :ext_description, StepmodExtDescription.new
+      ReverseAdoc::Converters.register :ext_description,
+                                       StepmodExtDescription.new
     end
   end
 end

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

@@ -4,14 +4,15 @@ module Stepmod
   module Utils
     module Converters
       class Strong < ReverseAdoc::Converters::Base
-        BLANK_CHARS = "{blank}".freeze
+        BLANK_CHARS = "{blank}"
 
         def convert(node, state = {})
           content = treat_children(node, state.merge(already_strong: true))
           if content.strip.empty? || state[:already_strong]
             content
           else
-            handle_express_escape_seq(node, "#{content[/^\s*/]}*#{content.strip}*#{content[/\s*$/]}")
+            handle_express_escape_seq(node,
+                                      "#{content[/^\s*/]}*#{content.strip}*#{content[/\s*$/]}")
           end
         end
 
@@ -30,7 +31,7 @@ module Stepmod
 
         def braces_sibling?(sibling, end_of_text = false)
           match = end_of_text ? /\($/ : /^\)/
-          sibling && sibling.text? && sibling.text =~ match
+          sibling&.text? && sibling.text =~ match
         end
       end
 
@@ -38,4 +39,4 @@ module Stepmod
       ReverseAdoc::Converters.register :b,      Strong.new
     end
   end
-end
+end

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

@@ -6,7 +6,7 @@ module Stepmod
       class Sub < ReverseAdoc::Converters::Base
         def convert(node, state = {})
           content = treat_children(node, state)
-          return stem_notation(content) if node.parent.name == 'eqn'
+          return stem_notation(content) if node.parent.name == "eqn"
 
           "#{content[/^\s*/]}~#{content.strip}~#{content[/\s*$/]}"
         end
@@ -21,4 +21,4 @@ module Stepmod
       ReverseAdoc::Converters.register :sub, Sub.new
     end
   end
-end
+end

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

@@ -6,7 +6,7 @@ module Stepmod
       class Sup < ReverseAdoc::Converters::Base
         def convert(node, state = {})
           content = treat_children(node, state)
-          return stem_notation(content) if node.parent.name == 'eqn'
+          return stem_notation(content) if node.parent.name == "eqn"
 
           "#{content[/^\s*/]}^#{content.strip}^#{content[/\s*$/]}"
         end
@@ -19,4 +19,4 @@ module Stepmod
       ReverseAdoc::Converters.register :sup, Sup.new
     end
   end
-end
+end

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

@@ -4,7 +4,7 @@ module Stepmod
   module Utils
     module Converters
       class Synonym < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
+        def convert(node, _state = {})
           "alt:[#{node.text.strip}]"
         end
       end
@@ -12,4 +12,4 @@ module Stepmod
       ReverseAdoc::Converters.register :synonym, Synonym.new
     end
   end
-end
+end

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

@@ -5,12 +5,13 @@ module Stepmod
     module Converters
       class Table < ReverseAdoc::Converters::Base
         def convert(node, state = {})
-          id = node['id']
+          id = node["id"]
           anchor = id ? "[[#{id}]]\n" : ""
-          title = node['caption'].to_s
+          title = node["caption"].to_s
           title = ".#{title}\n" unless title.empty?
           attrs = style(node)
-          "\n\n#{anchor}#{attrs}#{title}|===\n#{treat_children(node, state)}\n|===\n"
+          "\n\n#{anchor}#{attrs}#{title}|===\n#{treat_children(node,
+                                                               state)}\n|===\n"
         end
 
         def frame(node)
@@ -23,8 +24,6 @@ module Stepmod
             "frame=sides"
           when "box", "border"
             "frame=all"
-          else
-            nil
           end
         end
 
@@ -38,13 +37,11 @@ module Stepmod
             "rules=cols"
           when "none"
             "rules=none"
-          else
-            nil
           end
         end
 
         def style(node)
-          width = "width=#{node['width']}" if node['width']
+          width = "width=#{node['width']}" if node["width"]
           attrs = []
           frame_attr = frame(node)
           rules_attr = rules(node)
@@ -52,6 +49,7 @@ module Stepmod
           attrs += frame_attr if frame_attr
           attrs += rules_attr if rules_attr
           return "" if attrs.empty?
+
           "[#{attrs.join(',')}]\n"
         end
       end
@@ -59,4 +57,4 @@ module Stepmod
       ReverseAdoc::Converters.register :table, Table.new
     end
   end
-end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'stepmod/utils/converters/synonym'
+require "stepmod/utils/converters/synonym"
 
 module Stepmod
   module Utils
@@ -8,22 +8,31 @@ module Stepmod
       class Term < ReverseAdoc::Converters::Base
         def convert(node, state = {})
           first_child = node.children.find do |child|
-                          child.name == 'text' && !child.text.to_s.strip.empty?
-                        end
+            child.name == "text" && !child.text.to_s.strip.empty?
+          end
           unless first_child &&
-                  node.text.split(';').length == 2 &&
-                  defined?(Stepmod::Utils::Converters::Synonym)
-            return "=== #{treat_children(node, state).strip}"
+              node.text.split(";").length == 2 &&
+              defined?(Stepmod::Utils::Converters::Synonym)
+            return "=== #{treat_acronym(treat_children(node, state).strip)}"
           end
 
-          term_def, alt = node.text.split(';')
+          term_def, alt = node.text.split(";")
           alt_xml = Nokogiri::XML::Text.new(alt, Nokogiri::XML::Document.new)
           converted_alt = Stepmod::Utils::Converters::Synonym.new.convert(alt_xml)
-          "=== #{term_def}\n\n#{converted_alt}"
+          "=== #{treat_acronym(term_def)}\n\n#{converted_alt}"
+        end
+
+        private
+
+        def treat_acronym(term_def)
+          return term_def if term_def !~ /.+\(.+?\)$/
+
+          _, term_text, term_acronym = term_def.match(/(.+?)(\(.+\))$/).to_a
+          "#{term_text}\nalt:[#{term_acronym.gsub(/\(|\)/, '')}]"
         end
       end
 
       ReverseAdoc::Converters.register :term, Term.new
     end
   end
-end
+end

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

@@ -16,14 +16,14 @@ module Stepmod
 
         def treat_empty(node, state)
           parent = node.parent.name.to_sym
-          if [:ol, :ul].include?(parent)  # Otherwise the identation is broken
-            ''
+          if %i[ol ul].include?(parent) # Otherwise the identation is broken
+            ""
           elsif state[:tdsinglepara]
-            ''
-          elsif node.text == ' '          # Regular whitespace text node
-            ' '
+            ""
+          elsif node.text == " "          # Regular whitespace text node
+            " "
           else
-            ''
+            ""
           end
         end
 
@@ -34,9 +34,7 @@ module Stepmod
           text = remove_border_newlines(text)
 
           text = preserve_keychars_within_backticks(text)
-          text = preserve_tags(text)
-
-          text
+          preserve_tags(text)
         end
 
         def preserve_nbsp(text)
@@ -44,20 +42,20 @@ module Stepmod
         end
 
         def preserve_tags(text)
-          text.gsub(/[<>]/, '>' => '\>', '<' => '\<')
+          text.gsub(/[<>]/, ">" => '\>', "<" => '\<')
         end
 
         def remove_border_newlines(text)
-          text.gsub(/\A\n+/, '').gsub(/\n+\z/, '')
+          text.gsub(/\A\n+/, "").gsub(/\n+\z/, "")
         end
 
         def remove_inner_newlines(text)
-          text.tr("\n\t", ' ').squeeze(' ')
+          text.tr("\n\t", " ").squeeze(" ")
         end
 
         def preserve_keychars_within_backticks(text)
           text.gsub(/`.*?`/) do |match|
-            match.gsub('\_', '_').gsub('\*', '*')
+            match.gsub('\_', "_").gsub('\*', "*")
           end
         end
       end

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

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'stepmod/utils/converters/synonym'
+require "stepmod/utils/converters/synonym"
 
 module Stepmod
   module Utils
     module Converters
       class Uof < ReverseAdoc::Converters::Base
-        def convert(node, state = {})
-
+        def convert(_node, _state = {})
           # WARNING: <uof> tag content is deprecated
-          return ""
+          ""
 
           #
           # <<~TEXT

data/lib/stepmod/utils/html_to_asciimath.rb

@@ -6,7 +6,7 @@ module Stepmod
 
         to_asciimath = Nokogiri::HTML.fragment(input, "UTF-8")
 
-        to_asciimath.css('i').each do |math_element|
+        to_asciimath.css("i").each do |math_element|
           # puts "HTML MATH!!  #{math_element.to_xml}"
           # puts "HTML MATH!!  #{math_element.text}"
           decoded = text_to_asciimath(math_element.text)
@@ -21,7 +21,7 @@ module Stepmod
           end
         end
 
-        to_asciimath.css('sub').each do |math_element|
+        to_asciimath.css("sub").each do |math_element|
           case math_element.text.length
           when 0
             math_element.remove
@@ -30,7 +30,7 @@ module Stepmod
           end
         end
 
-        to_asciimath.css('sup').each do |math_element|
+        to_asciimath.css("sup").each do |math_element|
           case math_element.text.length
           when 0
             math_element.remove
@@ -39,14 +39,14 @@ module Stepmod
           end
         end
 
-        to_asciimath.css('ol').each do |element|
-          element.css('li').each do |li|
+        to_asciimath.css("ol").each do |element|
+          element.css("li").each do |li|
             li.replace ". #{li.text}"
           end
         end
 
-        to_asciimath.css('ul').each do |element|
-          element.css('li').each do |li|
+        to_asciimath.css("ul").each do |element|
+          element.css("li").each do |li|
             li.replace "* #{li.text}"
           end
         end
@@ -57,7 +57,8 @@ module Stepmod
         end
 
         html_entities_to_stem(
-          to_asciimath.children.to_s.gsub(/\]stem:\[/, '').gsub(/<\/?[uo]l>/, '')
+          to_asciimath.children.to_s.gsub(/\]stem:\[/, "").gsub(/<\/?[uo]l>/,
+                                                                ""),
         )
       end
 
@@ -66,91 +67,91 @@ module Stepmod
       end
 
       def html_entities_to_asciimath(x)
-        x.gsub("&alpha;", "alpha").
-          gsub("&beta;", "beta").
-          gsub("&gamma;", "gamma").
-          gsub("&Gamma;", "Gamma").
-          gsub("&delta;", "delta").
-          gsub("&Delta;", "Delta").
-          gsub("&epsilon;", "epsilon").
-          gsub("&varepsilon;", "varepsilon").
-          gsub("&zeta;", "zeta").
-          gsub("&eta;", "eta").
-          gsub("&theta;", "theta").
-          gsub("&Theta;", "Theta").
-          gsub("&vartheta;", "vartheta").
-          gsub("&iota;", "iota").
-          gsub("&kappa;", "kappa").
-          gsub("&lambda;", "lambda").
-          gsub("&Lambda;", "Lambda").
-          gsub("&mu;", "mu").
-          gsub("&nu;", "nu").
-          gsub("&xi;", "xi").
-          gsub("&Xi;", "Xi").
-          gsub("&pi;", "pi").
-          gsub("&Pi;", "Pi").
-          gsub("&rho;", "rho").
-          gsub("&beta;", "beta").
-          gsub("&sigma;", "sigma").
-          gsub("&Sigma;", "Sigma").
-          gsub("&tau;", "tau").
-          gsub("&upsilon;", "upsilon").
-          gsub("&phi;", "phi").
-          gsub("&Phi;", "Phi").
-          gsub("&varphi;", "varphi").
-          gsub("&chi;", "chi").
-          gsub("&psi;", "psi").
-          gsub("&Psi;", "Psi").
-          gsub("&omega;", "omega")
-          gsub("&#967", "χ").
-          gsub("&#215", "×").
-          gsub("&#931", "Σ").
-          gsub("&#961", "ρ").
-          gsub("&#963", "σ").
-          gsub("&#955", "λ").
-          gsub("&#964", "τ").
-          gsub("&#8706", "∂").
-          gsub("&#8804", "≤").
-          gsub("&#8805", "≥")
+        x.gsub("&alpha;", "alpha")
+          .gsub("&beta;", "beta")
+          .gsub("&gamma;", "gamma")
+          .gsub("&Gamma;", "Gamma")
+          .gsub("&delta;", "delta")
+          .gsub("&Delta;", "Delta")
+          .gsub("&epsilon;", "epsilon")
+          .gsub("&varepsilon;", "varepsilon")
+          .gsub("&zeta;", "zeta")
+          .gsub("&eta;", "eta")
+          .gsub("&theta;", "theta")
+          .gsub("&Theta;", "Theta")
+          .gsub("&vartheta;", "vartheta")
+          .gsub("&iota;", "iota")
+          .gsub("&kappa;", "kappa")
+          .gsub("&lambda;", "lambda")
+          .gsub("&Lambda;", "Lambda")
+          .gsub("&mu;", "mu")
+          .gsub("&nu;", "nu")
+          .gsub("&xi;", "xi")
+          .gsub("&Xi;", "Xi")
+          .gsub("&pi;", "pi")
+          .gsub("&Pi;", "Pi")
+          .gsub("&rho;", "rho")
+          .gsub("&beta;", "beta")
+          .gsub("&sigma;", "sigma")
+          .gsub("&Sigma;", "Sigma")
+          .gsub("&tau;", "tau")
+          .gsub("&upsilon;", "upsilon")
+          .gsub("&phi;", "phi")
+          .gsub("&Phi;", "Phi")
+          .gsub("&varphi;", "varphi")
+          .gsub("&chi;", "chi")
+          .gsub("&psi;", "psi")
+          .gsub("&Psi;", "Psi")
+          .gsub("&omega;", "omega")
+          .gsub("&#967", "χ")
+          .gsub("&#215", "×")
+          .gsub("&#931", "Σ")
+          .gsub("&#961", "ρ")
+          .gsub("&#963", "σ")
+          .gsub("&#955", "λ")
+          .gsub("&#964", "τ")
+          .gsub("&#8706", "∂")
+          .gsub("&#8804", "≤")
+          .gsub("&#8805", "≥")
       end
 
       def html_entities_to_stem(x)
-        x.gsub("&alpha;", "stem:[alpha]").
-          gsub("&beta;", "stem:[beta]").
-          gsub("&gamma;", "stem:[gamma]").
-          gsub("&Gamma;", "stem:[Gamma]").
-          gsub("&delta;", "stem:[delta]").
-          gsub("&Delta;", "stem:[Delta]").
-          gsub("&epsilon;", "stem:[epsilon]").
-          gsub("&varepsilon;", "stem:[varepsilon]").
-          gsub("&zeta;", "stem:[zeta]").
-          gsub("&eta;", "stem:[eta]").
-          gsub("&theta;", "stem:[theta]").
-          gsub("&Theta;", "stem:[Theta]").
-          gsub("&vartheta;", "stem:[vartheta]").
-          gsub("&iota;", "stem:[iota]").
-          gsub("&kappa;", "stem:[kappa]").
-          gsub("&lambda;", "stem:[lambda]").
-          gsub("&Lambda;", "stem:[Lambda]").
-          gsub("&mu;", "stem:[mu]").
-          gsub("&nu;", "stem:[nu]").
-          gsub("&xi;", "stem:[xi]").
-          gsub("&Xi;", "stem:[Xi]").
-          gsub("&pi;", "stem:[pi]").
-          gsub("&Pi;", "stem:[Pi]").
-          gsub("&rho;", "stem:[rho]").
-          gsub("&beta;", "stem:[beta]").
-          gsub("&sigma;", "stem:[sigma]").
-          gsub("&Sigma;", "stem:[Sigma]").
-          gsub("&tau;", "stem:[tau]").
-          gsub("&upsilon;", "stem:[upsilon]").
-          gsub("&phi;", "stem:[phi]").
-          gsub("&Phi;", "stem:[Phi]").
-          gsub("&varphi;", "stem:[varphi]").
-          gsub("&chi;", "stem:[chi]").
-          gsub("&psi;", "stem:[psi]").
-          gsub("&Psi;", "stem:[Psi]").
-          gsub("&omega;", "stem:[omega]")
+        x.gsub("&alpha;", "stem:[alpha]")
+          .gsub("&beta;", "stem:[beta]")
+          .gsub("&gamma;", "stem:[gamma]")
+          .gsub("&Gamma;", "stem:[Gamma]")
+          .gsub("&delta;", "stem:[delta]")
+          .gsub("&Delta;", "stem:[Delta]")
+          .gsub("&epsilon;", "stem:[epsilon]")
+          .gsub("&varepsilon;", "stem:[varepsilon]")
+          .gsub("&zeta;", "stem:[zeta]")
+          .gsub("&eta;", "stem:[eta]")
+          .gsub("&theta;", "stem:[theta]")
+          .gsub("&Theta;", "stem:[Theta]")
+          .gsub("&vartheta;", "stem:[vartheta]")
+          .gsub("&iota;", "stem:[iota]")
+          .gsub("&kappa;", "stem:[kappa]")
+          .gsub("&lambda;", "stem:[lambda]")
+          .gsub("&Lambda;", "stem:[Lambda]")
+          .gsub("&mu;", "stem:[mu]")
+          .gsub("&nu;", "stem:[nu]")
+          .gsub("&xi;", "stem:[xi]")
+          .gsub("&Xi;", "stem:[Xi]")
+          .gsub("&pi;", "stem:[pi]")
+          .gsub("&Pi;", "stem:[Pi]")
+          .gsub("&rho;", "stem:[rho]")
+          .gsub("&beta;", "stem:[beta]")
+          .gsub("&sigma;", "stem:[sigma]")
+          .gsub("&Sigma;", "stem:[Sigma]")
+          .gsub("&tau;", "stem:[tau]")
+          .gsub("&upsilon;", "stem:[upsilon]")
+          .gsub("&phi;", "stem:[phi]")
+          .gsub("&Phi;", "stem:[Phi]")
+          .gsub("&varphi;", "stem:[varphi]")
+          .gsub("&chi;", "stem:[chi]")
+          .gsub("&psi;", "stem:[psi]")
+          .gsub("&Psi;", "stem:[Psi]")
+          .gsub("&omega;", "stem:[omega]")
       end
     end
   end