stepmod-utils 0.6.8 → 0.6.10.pre.alpha.1

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

@@ -7,7 +7,7 @@ require "stepmod/utils/converters/express_figure"
 require "stepmod/utils/converters/express_table"
 require "expressir"
 require "expressir/express/parser"
-require "pubid-iso"
+require "pubid"
 
 module Stepmod
   module Utils
@@ -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

@@ -6,9 +6,9 @@ require "securerandom"
 require "expressir"
 require "expressir/express/parser"
 require "indefinite_article"
-require "pubid-iso"
+require "pubid"
 
-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.10.pre.alpha.1".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.2.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,19 @@ 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"
+  # The pubid monogem ships Pubid::Iso itself; the separate pubid-iso
+  # gem is superseded and its lib/pubid/iso.rb shadows the monogem's.
+  spec.add_dependency "pubid", "~> 2.0.0.pre.alpha"
+  spec.add_dependency "shale"
+  spec.add_dependency "thor", ">= 0.20"
+  spec.add_dependency "unitsml"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.10.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,6 +23,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 +71,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
@@ -123,33 +136,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pubid-iso
-  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: coradoc
+  name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.pre.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.pre.alpha
 - !ruby/object:Gem::Dependency
   name: shale
   requirement: !ruby/object:Gem::Requirement
@@ -192,48 +191,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.
 
   '
@@ -254,7 +211,6 @@ files:
 - ".github/workflows/release.yml"
 - ".github/workflows/test-concept-generation.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
@@ -390,7 +346,6 @@ homepage: https://github.com/metanorma/stepmod-utils
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -398,15 +353,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Stepmod-utils is a toolkit that works on STEPmod data.
 test_files: []

data/.hound.yml

@@ -1,5 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-ruby:
-  enabled: true
-  config_file: .rubocop.yml