stepmod-utils 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1ca04eb804cf7cb565a9b06ad4fbe5ff0296ff98efbc67dc743c2b6880f483f
-  data.tar.gz: c41e79f4e23ead8b393262fc27314834c54648f9e9e94b876528792746b5347a
+  metadata.gz: 3b84fbdfaf0322f4f207043d9f7f8034a58539f33c030846c593f6c3cac8b7c8
+  data.tar.gz: 8689dceb2e71c4401732e5e5e1c522be9bca434de6014f2054e54ef85e3e9845
 SHA512:
-  metadata.gz: c668c4ed4ac6cee1ed1b9a496b6cd0d5a4db58110500fa2250f9adf7b6c6a655a22ee9a449ccf0fd8b99e425203a9ab208b2e4808d68d84a9d010c6dfc95f53f
-  data.tar.gz: c629c54854070a73b5766105efab6d737752b19ba3123b9e514f575124de7ff2561151a8c727650c8324aec2a018fa5c5820681cd829e28ffd9e647e48a711bc
+  metadata.gz: ebc46e61ce576382b898913fc348ba473e52fb23a7fb65677ac6436a93d5bfcf1a9208e64f3d25c38a0e57eac7718384589dabfebac2925deb3fb6e39ba4d529
+  data.tar.gz: d075afeb2933647f9b6fc2fe32a32f2dcf49f4a7dc0ed12fa750f4ae4f02aac115a5e08581bacd68869a14c3c02fc3a4c794e0676bd6dc2dae02411398fd385c

data/.rubocop.yml

@@ -10,4 +10,4 @@ Style/MultilineMethodCallIndentation:
   EnforcedStyle: aligned
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.1

data/Gemfile

@@ -5,7 +5,10 @@ source "https://rubygems.org"
 gemspec
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem "concurrent-ruby", "~> 1.1"
+gem "concurrent-ruby"
 gem "pry"
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "rubocop-performance"
+gem "rubocop-rails"

data/exe/stepmod-convert-express-description

@@ -11,7 +11,7 @@ $:.unshift File.expand_path("../../lib", bin_file)
 require "bundler/setup"
 require "stepmod/utils/smrl_description_converter"
 
-Coradoc::Input::HTML.config.unknown_tags = :bypass
+Coradoc::Input::Html.config.unknown_tags = :bypass
 
 input_content = ARGF.read
 

data/exe/stepmod-convert-express-resource

@@ -11,7 +11,7 @@ $:.unshift File.expand_path("../../lib", bin_file)
 require "bundler/setup"
 require "stepmod/utils/smrl_resource_converter"
 
-Coradoc::Input::HTML.config.unknown_tags = :bypass
+Coradoc::Input::Html.config.unknown_tags = :bypass
 
 input_content = ARGF.read
 

data/lib/stepmod/utils/cleaner.rb

@@ -2,13 +2,13 @@ require "coradoc/input/html/cleaner"
 
 module Stepmod
   module Utils
-    class Cleaner < Coradoc::Input::HTML::Cleaner
+    class Cleaner < Coradoc::Input::Html::Cleaner
       def tidy(string)
         super
           .gsub(/^ +/, "")
           .gsub(/\*\s([,.])/, '*\1') # remove space between * and comma or dot.
       end
-  
+
       # Find non-asterisk content that is enclosed by two or
       # more asterisks. Ensure that only one whitespace occurs
       # in the border area.
@@ -23,7 +23,8 @@ module Stepmod
         result = string.dup
         patterns.each do |pattern, value|
           result = result.gsub(pattern) do |match|
-            preserve_border_whitespaces(match, default_border: Coradoc::Input::HTML.config.tag_border) do
+            preserve_border_whitespaces(match,
+                                        default_border: Coradoc::Input::Html.config.tag_border) do
               match.strip.sub(" #{value}", value).sub("#{value} ", value)
             end
           end

data/lib/stepmod/utils/concept.rb

@@ -3,16 +3,17 @@ require "glossarist"
 module Stepmod
   module Utils
     class Concept < Glossarist::LocalizedConcept
-      attr_accessor *%w(
+      CUSTOM_ATTRIBUTES = %w(
         reference_clause
         reference_anchor
         converted_definition
         file_path
         schema
         part
-        domain
         document
-      )
+      ).freeze
+
+      attr_accessor(*CUSTOM_ATTRIBUTES)
 
       # TODO: converted_definition is not supposed to be an attribute, it is
       # supposed to be a method!
@@ -45,14 +46,20 @@ file_path:, language_code: "eng")
           # TODO: `designations:` should include the `alt:[...]` terms here,
           # they are now only included in definition_xml_converted_definition.
           new(
-            designations: designation,
-            definition: [definition],
+            data: Glossarist::ConceptData.new(
+              {
+                terms: designation,
+                definition: [
+                  Glossarist::DetailedDefinition.new({ content: definition }),
+                ],
+                language_code: language_code,
+              },
+            ),
             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
 
@@ -80,7 +87,9 @@ file_path:, language_code: "eng")
             designations << { "designation" => alt, "type" => "expression" }
           end
 
-          designations
+          designations.map do |des|
+            Glossarist::Designation::Base.from_yaml(des.to_yaml)
+          end
         end
 
         def definition_xml_definition(definition_xml, reference_anchor)
@@ -106,24 +115,19 @@ file_path:, language_code: "eng")
         end
 
         def definition_xml_converted_definition(designation, definition)
-          accepted_designation = designation.select do |des|
-            des["normative_status"] == "preferred"
-          end
-
-          alt_designations = designation.reject do |des|
-            des["normative_status"] == "preferred"
-          end
+          accepted_designation = designation.select(&:preferred?)
+          alt_designations = designation.reject(&:preferred?)
 
           if alt_designations.length.positive?
             alt_designations_text = alt_designations.map do |d|
-              d["designation"].strip
+              d.designation.strip
             end.join(",")
 
             alt_notation = "alt:[#{alt_designations_text}]"
           end
 
           result = <<~TEXT
-            === #{accepted_designation.map { |d| d['designation'].strip }.join(',')}
+            === #{accepted_designation.map { |d| d.designation.strip }.join(',')}
           TEXT
 
           if alt_notation
@@ -140,6 +144,14 @@ file_path:, language_code: "eng")
         end
       end
 
+      def initialize(hash = {})
+        super(hash)
+
+        CUSTOM_ATTRIBUTES.each do |attr|
+          public_send("#{attr}=", hash[attr] || hash[attr.to_sym])
+        end
+      end
+
       def to_h
         super.merge({
           "domain" => domain,
@@ -149,9 +161,13 @@ file_path:, language_code: "eng")
         }.compact)
       end
 
+      def domain
+        data.domain
+      end
+
       def to_mn_adoc
         <<~TEXT
-          // STEPmod path:#{file_path.empty? ? '' : " #{file_path}"}
+          // STEPmod path:#{file_path.to_s.empty? ? '' : " #{file_path}"}
           #{converted_definition}
 
           [.source]

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

@@ -41,7 +41,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :a, A.new
+      Coradoc::Input::Html::Converters.register :a, A.new
     end
   end
 end

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

@@ -16,7 +16,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :arm, Arm.new
+      Coradoc::Input::Html::Converters.register :arm, Arm.new
     end
   end
 end

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

@@ -1,10 +1,10 @@
-require 'coradoc'
-require 'coradoc/input/html'
+require "coradoc"
+require "coradoc/input/html"
 
 module Stepmod
   module Utils
     module Converters
-      class Base < Coradoc::Input::HTML::Converters::Base
+      class Base < Coradoc::Input::Html::Converters::Base
       end
     end
   end

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

@@ -16,7 +16,7 @@ module Stepmod
           ref.to_s.split(":").last.squeeze(" ").strip
         end
       end
-      Coradoc::Input::HTML::Converters.register :clause_ref, ClauseRef.new
+      Coradoc::Input::Html::Converters.register :clause_ref, ClauseRef.new
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :comment, Comment.new
+      Coradoc::Input::Html::Converters.register :comment, Comment.new
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Stepmod
           "#{node.text}\n"
         end
 
-        Coradoc::Input::HTML::Converters.register :dd, Dd.new
+        Coradoc::Input::Html::Converters.register :dd, Dd.new
       end
     end
   end

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

@@ -78,8 +78,8 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :def, Def.new
-      Coradoc::Input::HTML::Converters.register :description, Def.new
+      Coradoc::Input::Html::Converters.register :def, Def.new
+      Coradoc::Input::Html::Converters.register :description, Def.new
     end
   end
 end

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

@@ -16,7 +16,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :definition, Definition.new
+      Coradoc::Input::Html::Converters.register :definition, Definition.new
     end
   end
 end

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

@@ -16,7 +16,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :description, Description.new
+      Coradoc::Input::Html::Converters.register :description, Description.new
     end
   end
 end

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

@@ -24,7 +24,7 @@ module Stepmod
           node
         end
 
-        Coradoc::Input::HTML::Converters.register :dl, Dl.new
+        Coradoc::Input::Html::Converters.register :dl, Dl.new
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Stepmod
           "\n\n#{node.text}:: "
         end
 
-        Coradoc::Input::HTML::Converters.register :dt, Dt.new
+        Coradoc::Input::Html::Converters.register :dt, Dt.new
       end
     end
   end

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

@@ -14,8 +14,8 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :em, Em.new
-      Coradoc::Input::HTML::Converters.register :cite, Em.new
+      Coradoc::Input::Html::Converters.register :em, Em.new
+      Coradoc::Input::Html::Converters.register :cite, Em.new
     end
   end
 end

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

@@ -8,6 +8,10 @@ module Stepmod
           italic_converted(node, state)
         end
 
+        def to_coradoc(node, state = {})
+          italic_converted(node, state)
+        end
+
         private
 
         def italic_converted(node, state)
@@ -44,7 +48,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :i,  Em.new
+      Coradoc::Input::Html::Converters.register :i, Em.new
     end
   end
 end

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

@@ -123,8 +123,8 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :eqn, Eqn.new
-      Coradoc::Input::HTML::Converters.register :bigeqn, Eqn.new
+      Coradoc::Input::Html::Converters.register :eqn, Eqn.new
+      Coradoc::Input::Html::Converters.register :bigeqn, Eqn.new
     end
   end
 end

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

@@ -19,7 +19,7 @@ module Stepmod
           TEMPLATE
         end
       end
-      Coradoc::Input::HTML::Converters.register :example, Example.new
+      Coradoc::Input::Html::Converters.register :example, Example.new
     end
   end
 end

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

@@ -19,7 +19,8 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :express_figure, ExpressFigure.new
+      Coradoc::Input::Html::Converters.register :express_figure,
+                                                ExpressFigure.new
     end
   end
 end

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

@@ -49,7 +49,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register "express-g", ExpressG.new
+      Coradoc::Input::Html::Converters.register "express-g", ExpressG.new
     end
   end
 end

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

@@ -14,7 +14,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :express_note, ExpressNote.new
+      Coradoc::Input::Html::Converters.register :express_note, ExpressNote.new
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Stepmod
           " *#{node['linkend'].to_s.split('.').last}* "
         end
       end
-      Coradoc::Input::HTML::Converters.register :express_ref, ExpressRef.new
+      Coradoc::Input::Html::Converters.register :express_ref, ExpressRef.new
     end
   end
 end

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

@@ -7,7 +7,8 @@ module Stepmod
           "<<express:#{parts.join('.').strip},#{parts.last.strip}>>"
         end
       end
-      Coradoc::Input::HTML::Converters.register :express_ref, ExpressRefExpressDescription.new
+      Coradoc::Input::Html::Converters.register :express_ref,
+                                                ExpressRefExpressDescription.new
     end
   end
 end

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

@@ -14,7 +14,8 @@ module Stepmod
           TEMPLATE
         end
       end
-      Coradoc::Input::HTML::Converters.register :ext_description, ExtDescription.new
+      Coradoc::Input::Html::Converters.register :ext_description,
+                                                ExtDescription.new
     end
   end
 end

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

@@ -8,7 +8,8 @@ module Stepmod
           treat_children(node, state)
         end
       end
-      Coradoc::Input::HTML::Converters.register :ext_descriptions, ExtDescriptions.new
+      Coradoc::Input::Html::Converters.register :ext_descriptions,
+                                                ExtDescriptions.new
     end
   end
 end

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

@@ -5,7 +5,7 @@ require "coradoc/input/html/converters/figure"
 module Stepmod
   module Utils
     module Converters
-      class Figure < Coradoc::Input::HTML::Converters::Figure
+      class Figure < Coradoc::Input::Html::Converters::Figure
         def self.pattern(state, id)
           if state[:schema_and_entity].nil?
             raise StandardError.new("[figure]: no state given, #{id}")
@@ -43,7 +43,7 @@ module Stepmod
       end
 
       # This replaces the converter
-      Coradoc::Input::HTML::Converters.register :figure, Figure.new
+      Coradoc::Input::Html::Converters.register :figure, Figure.new
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :fund_cons, FundCons.new
+      Coradoc::Input::Html::Converters.register :fund_cons, FundCons.new
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :introduction, Introduction.new
+      Coradoc::Input::Html::Converters.register :introduction, Introduction.new
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Stepmod
   module Utils
     module Converters
-      class Li < Coradoc::Input::HTML::Converters::Li
+      class Li < Coradoc::Input::Html::Converters::Li
         def to_coradoc(node, state = {})
           li = super
           li.content = li.content.map do |content|
@@ -14,7 +14,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :li, Li.new
+      Coradoc::Input::Html::Converters.register :li, Li.new
     end
   end
 end

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

@@ -86,7 +86,7 @@ module Stepmod
           /.*?\s*\(?\d+\)?/.match(text)
         end
       end
-      Coradoc::Input::HTML::Converters.register :module_ref, ModuleRef.new
+      Coradoc::Input::Html::Converters.register :module_ref, ModuleRef.new
     end
   end
 end

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

@@ -45,8 +45,8 @@ module Stepmod
           # puts "[module_ref] #{result}"
         end
       end
-      Coradoc::Input::HTML::Converters.register :module_ref,
-                                       ModuleRefExpressDescription.new
+      Coradoc::Input::Html::Converters.register :module_ref,
+                                                ModuleRefExpressDescription.new
     end
   end
 end

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

@@ -19,7 +19,7 @@ module Stepmod
           TEMPLATE
         end
       end
-      Coradoc::Input::HTML::Converters.register :note, Note.new
+      Coradoc::Input::Html::Converters.register :note, Note.new
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Stepmod
   module Utils
     module Converters
-      class Ol < Coradoc::Input::HTML::Converters::Ol
+      class Ol < Coradoc::Input::Html::Converters::Ol
         LIST_TAGS = ["ol", "ul", "dir"].freeze
 
         def to_coradoc(node, state = {})
@@ -15,7 +15,7 @@ module Stepmod
       end
 
       Ol::LIST_TAGS.each do |tag|
-        Coradoc::Input::HTML::Converters.register tag.to_sym, Ol.new
+        Coradoc::Input::Html::Converters.register tag.to_sym, Ol.new
       end
     end
   end

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

@@ -8,7 +8,7 @@ module Stepmod
           treat_children(node, state)
         end
       end
-      Coradoc::Input::HTML::Converters.register :resource, Resource.new
+      Coradoc::Input::Html::Converters.register :resource, Resource.new
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Stepmod
           TEMPLATE
         end
       end
-      Coradoc::Input::HTML::Converters.register :schema, Schema.new
+      Coradoc::Input::Html::Converters.register :schema, Schema.new
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Stepmod
           treat_children(node, state).strip
         end
       end
-      Coradoc::Input::HTML::Converters.register :schema_diag, SchemaDiag.new
+      Coradoc::Input::Html::Converters.register :schema_diag, SchemaDiag.new
     end
   end
 end

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

@@ -57,7 +57,8 @@ module Stepmod
           TEMPLATE
         end
       end
-      Coradoc::Input::HTML::Converters.register :ext_description, StepmodExtDescription.new
+      Coradoc::Input::Html::Converters.register :ext_description,
+                                                StepmodExtDescription.new
     end
   end
 end

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

@@ -66,8 +66,8 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :strong, Strong.new
-      Coradoc::Input::HTML::Converters.register :b,      Strong.new
+      Coradoc::Input::Html::Converters.register :strong, Strong.new
+      Coradoc::Input::Html::Converters.register :b,      Strong.new
     end
   end
 end

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

@@ -3,9 +3,14 @@
 module Stepmod
   module Utils
     module Converters
-      class Sub < Coradoc::Input::HTML::Converters::Sub
+      class Sub < Coradoc::Input::Html::Converters::Sub
         def to_coradoc(node, state = {})
-          state[:equation] ? stem_notation(treat_children(node, state)) : super(node, state)
+          if state[:equation]
+            stem_notation(treat_children(node,
+                                         state))
+          else
+            super(node, state)
+          end
         end
 
         private
@@ -15,7 +20,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :sub, Sub.new
+      Coradoc::Input::Html::Converters.register :sub, Sub.new
     end
   end
 end

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

@@ -3,9 +3,14 @@
 module Stepmod
   module Utils
     module Converters
-      class Sup < Coradoc::Input::HTML::Converters::Sup
+      class Sup < Coradoc::Input::Html::Converters::Sup
         def to_coradoc(node, state = {})
-          state[:equation] ? stem_notation(treat_children(node, state)) : super(node, state)
+          if state[:equation]
+            stem_notation(treat_children(node,
+                                         state))
+          else
+            super(node, state)
+          end
         end
 
         def stem_notation(content)
@@ -13,7 +18,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :sup, Sup.new
+      Coradoc::Input::Html::Converters.register :sup, Sup.new
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :synonym, Synonym.new
+      Coradoc::Input::Html::Converters.register :synonym, Synonym.new
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Stepmod
   module Utils
     module Converters
-      class Table < Coradoc::Input::HTML::Converters::Table
+      class Table < Coradoc::Input::Html::Converters::Table
         def self.pattern(state, id)
           if state[:schema_and_entity].nil?
             raise StandardError.new("[table]: no state given, #{id}")
@@ -72,7 +72,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :table, Table.new
+      Coradoc::Input::Html::Converters.register :table, Table.new
     end
   end
 end

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

@@ -40,7 +40,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :term, Term.new
+      Coradoc::Input::Html::Converters.register :term, Term.new
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Stepmod
   module Utils
     module Converters
-      class Text < Coradoc::Input::HTML::Converters::Text
+      class Text < Coradoc::Input::Html::Converters::Text
         def to_coradoc(node, state = {})
           if node.text.strip.empty?
             treat_empty(node, state)
@@ -64,7 +64,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :text, Text.new
+      Coradoc::Input::Html::Converters.register :text, Text.new
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Stepmod
   module Utils
     module Converters
-      class Tr < Coradoc::Input::HTML::Converters::Tr
+      class Tr < Coradoc::Input::Html::Converters::Tr
         def to_coradoc(node, state = {})
           content = super(node, state)
           line_break = content.header ? "\n\n" : "\n"
@@ -11,7 +11,7 @@ module Stepmod
         end
       end
 
-      Coradoc::Input::HTML::Converters.register :tr, Tr.new
+      Coradoc::Input::Html::Converters.register :tr, Tr.new
     end
   end
 end

data/lib/stepmod/utils/smrl_description_converter.rb

@@ -34,8 +34,8 @@ module Stepmod
 
         root || (return "")
 
-        Coradoc::Input::HTML.config.with(options) do
-          result = Coradoc::Input::HTML::Converters.lookup(root.name).convert(root,
+        Coradoc::Input::Html.config.with(options) do
+          result = Coradoc::Input::Html::Converters.lookup(root.name).convert(root,
                                                                               options)
           Stepmod::Utils::Cleaner.new.tidy(result)
         end

data/lib/stepmod/utils/smrl_resource_converter.rb

@@ -51,8 +51,8 @@ module Stepmod
 
         root || (return "")
 
-        Coradoc::Input::HTML.config.with(options) do
-          result = Coradoc::Input::HTML::Converters.lookup(root.name).convert(root,
+        Coradoc::Input::Html.config.with(options) do
+          result = Coradoc::Input::Html::Converters.lookup(root.name).convert(root,
                                                                               options)
 
           Stepmod::Utils::Cleaner.new.tidy(result)

data/lib/stepmod/utils/stepmod_definition_converter.rb

@@ -50,8 +50,8 @@ module Stepmod
 
         return "" unless root
 
-        Coradoc::Input::HTML.config.with(options) do
-          result = Coradoc::Input::HTML::Converters.lookup(root.name).convert(root,
+        Coradoc::Input::Html.config.with(options) do
+          result = Coradoc::Input::Html::Converters.lookup(root.name).convert(root,
                                                                               options)
           return "" unless result
 

data/lib/stepmod/utils/stepmod_file_annotator.rb

@@ -58,7 +58,7 @@ module Stepmod
       def replace_schema_string_with_version(content)
         m = content.match(SCHEMA_VERSION_MATCH_REGEX)
         result = build_schema_string_with_version
-        unless m['trailing'].nil?
+        unless m["trailing"].nil?
           result = "#{result}#{m['trailing']}"
         end
 
@@ -178,19 +178,19 @@ module Stepmod
 
         unless bib_file && File.exist?(bib_file)
           raise StandardError.new(
-            "bib_file for #{schema_name} does not exist: #{bib_file}"
+            "bib_file for #{schema_name} does not exist: #{bib_file}",
           )
         end
 
         output_express << prepend_bibdata(
-                              converted_description || "",
-                              # bib_file will not be present for resouces
-                              # that are not in resource_docs cache.
-                              # e.g hierarchy_schema
-                              bib_file,
-                              @schema_name,
-                              match,
-                            )
+          converted_description || "",
+          # bib_file will not be present for resouces
+          # that are not in resource_docs cache.
+          # e.g hierarchy_schema
+          bib_file,
+          @schema_name,
+          match,
+        )
 
         if is_missing_version(output_express)
           puts "[annotator-WARNING] schema (#{@schema_name}) missing version string. "\
@@ -252,7 +252,7 @@ processed_images_cache)
             #{Stepmod::Utils::SmrlDescriptionConverter.convert(
               wrapper,
               no_notes_examples: true,
-              descriptions_file: descriptions_file
+              descriptions_file: descriptions_file,
             )}
           DESCRIPTION
 

data/lib/stepmod/utils/term.rb

@@ -8,8 +8,14 @@ module Stepmod
 
       def to_mn_adoc
         mn_adoc = ["=== #{definition.map(&:content).join}"]
-        mn_adoc << "\nalt:[#{acronym}]" if acronym
-        mn_adoc << "\n\n#{designations.map(&:designation).join(', ')}" if designations&.any?
+
+        designations.each do |designation|
+          mn_adoc << if designation.type == "abbreviation" && designation.acronym
+                       "\nalt:[#{designation.designation}]"
+                     else
+                       "\n\n#{designation.designation}"
+                     end
+        end
 
         mn_adoc.join
       end
@@ -18,26 +24,42 @@ module Stepmod
         def from_h(hash)
           _, definition, acronym = treat_acronym(hash["definition"])
 
-          hash["definition"] = [definition]
+          concept_data = Glossarist::ConceptData.new(
+            {
+              definition: [
+                Glossarist::DetailedDefinition.new({ content: definition }),
+              ],
+              terms: [],
+            },
+          )
+
+          add_designations(concept_data, hash["synonyms"]) if hash["synonyms"]
 
-          hash["acronym"] = acronym.gsub(/\(|\)/, "") if acronym
-          add_designations(hash, hash["synonyms"]) if hash["synonyms"]
+          if acronym
+            acronym = designation_object(acronym.gsub(/\(|\)/, ""),
+                                         "abbreviation")
+            acronym.acronym = true
+            concept_data.terms << acronym
+          end
 
-          new(hash.reject { |k, _| k == "synonyms" })
+          new({ data: concept_data })
         end
 
         private
 
-        def add_designations(hash, synonyms)
-          hash["designations"] ||= []
-          hash["designations"] << designation_hash(synonyms) if synonyms
+        def add_designations(concept_data, synonyms)
+          synonyms.each do |synonym|
+            concept_data.terms << designation_object(synonym)
+          end
         end
 
-        def designation_hash(value, type = "expression")
-          {
-            "designation" => value,
-            "type" => type,
-          }
+        def designation_object(value, type = "expression")
+          Glossarist::Designation::Base.from_yaml(
+            {
+              "designation" => value,
+              "type" => type,
+            }.to_yaml,
+          )
         end
 
         def treat_acronym(term_def)

data/lib/stepmod/utils/terms_extractor.rb

@@ -8,7 +8,7 @@ require "expressir/express/parser"
 require "indefinite_article"
 require "pubid-iso"
 
-Coradoc::Input::HTML.config.unknown_tags = :bypass
+Coradoc::Input::Html.config.unknown_tags = :bypass
 
 module Stepmod
   module Utils
@@ -374,16 +374,21 @@ document:)
 
         notes = [old_definition].reject { |note| redundant_note?(note) }
 
-        Stepmod::Utils::Concept.new(
-          designations: [
-            {
-              "type" => "expression",
-              "normative_status" => "preferred",
-              "designation" => entity.id,
-            },
-          ],
-          domain: domain,
-          definition: [definition.strip],
+        Stepmod::Utils::Concept.from_yaml({
+          data: {
+            terms: [
+              {
+                "type" => "expression",
+                "normative_status" => "preferred",
+                "designation" => entity.id,
+              },
+            ],
+            domain: domain,
+            notes: notes.map { |note| { "content" => note } },
+            definition: [{ "content" => definition.strip }],
+            language_code: "eng",
+            id: "#{bibdata.part}-#{@sequence}",
+          },
           id: "#{bibdata.part}-#{@sequence}",
           sources: [
             {
@@ -396,12 +401,11 @@ document:)
               # "link" => "https://www.iso.org/standard/32858.html",
             },
           ],
-          notes: notes,
           language_code: "eng",
           part: bibdata.part,
           schema: schema,
           document: document,
-        )
+        }.to_yaml)
       end
       # rubocop:enable Metrics/MethodLength
 

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.6.8".freeze
+    VERSION = "0.6.9".freeze
   end
 end

data/stepmod-utils.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -31,20 +31,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "concurrent-ruby"
-  spec.add_runtime_dependency "down"
-  spec.add_runtime_dependency "expressir"
-  spec.add_runtime_dependency "glossarist", "~> 2.0.10"
-  spec.add_runtime_dependency "indefinite_article"
-  spec.add_runtime_dependency "octokit"
-  spec.add_runtime_dependency "plurimath"
-  spec.add_runtime_dependency "ptools"
-  spec.add_runtime_dependency "pubid-iso"
-  spec.add_runtime_dependency "coradoc"
-  spec.add_runtime_dependency "shale"
-  spec.add_runtime_dependency "thor", ">= 0.20"
-  spec.add_runtime_dependency "unitsml"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rails"
+  spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "coradoc", "~> 1.1.7"
+  spec.add_dependency "down"
+  spec.add_dependency "expressir"
+  spec.add_dependency "glossarist", "~> 2.0"
+  spec.add_dependency "indefinite_article"
+  spec.add_dependency "octokit"
+  spec.add_dependency "plurimath"
+  spec.add_dependency "ptools"
+  spec.add_dependency "pubid-iso"
+  spec.add_dependency "shale"
+  spec.add_dependency "thor", ">= 0.20"
+  spec.add_dependency "unitsml"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coradoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: down
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: indefinite_article
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coradoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: shale
   requirement: !ruby/object:Gem::Requirement
@@ -192,48 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 'Stepmod-utils is a toolkit that works on STEPmod data.
 
   '
@@ -398,14 +356,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Stepmod-utils is a toolkit that works on STEPmod data.