stepmod-utils 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d666c11f9282db59fefb04c07c40a88f6167cd214d316f2b1a14ae7117ce898
-  data.tar.gz: fe07f66170d74a97a95003b0f5e3594c5f2bbeaa3d431b716ce52f01d13d418d
+  metadata.gz: 4541a1fb0b4b3671d2aadf8cb833e93ca8b45f0c591b0da2df55e4614c2bcbf4
+  data.tar.gz: dbf98829e92bfcd54b468691011ab0de3781cf515b4d4b511ec394846f556ac6
 SHA512:
-  metadata.gz: 7b2fea45d8a30e633e393afac572894481d7de3bf5a33cd19043b6b55cb5b2c948666eb705b4cc9e69a12fe7b43217ca80f8f9a47d7aab4507b1b00c4136476e
-  data.tar.gz: 8e5334b99ece0ad5bff37d8ffd7cd70c64fd4998c3e0f4da58825802420f8537493a7858a6158b00ffcfdb3907a532e44067ab4ba07f7cc8f6091b5bb7912517
+  metadata.gz: 8410dd3702701b592aa67af784813058dcf2299ffe9dd60d45cab59b7035952111e17144b3b3b446e03135ae84a2a7ac5467f155b92ff768aa155d96437f0387
+  data.tar.gz: ea2fb98127cb384a70bd5aaf5febab17a92460170c820b250c52c0dca884bdc8d298f5ecdcf54f52ded4d1d22e75cbbce0fc65582499a04413e5e95cc8eb6b85

data/exe/stepmod-extract-terms

@@ -153,10 +153,13 @@ end
 
 log "INFO: written summary file to: 04x-stepmod-entities-resources.adoc"
 
-part_modules.each do |(bibdata, part_modules_arm, part_modules_mim)|
+part_modules.sort_by do |(bibdata, part_modules_arm, part_modules_mim)|
+  bibdata.part.to_i
+end.each do |(bibdata, part_modules_arm, part_modules_mim)|
   fn = "05x-stepmod-entities-modules-#{bibdata.part}.adoc"
   File.open(fn, "w") do |file|
     file.puts("")
+
     unless part_modules_arm.empty?
       schema_name = part_modules_arm.first.first
       concepts = part_modules_arm.first.last.to_a.map do |n|
@@ -181,6 +184,7 @@ part_modules.each do |(bibdata, part_modules_arm, part_modules_mim)|
       file.puts(replace_images(concepts.map(&:to_mn_adoc).join("\n")))
     end
   end
+
   log "INFO: written to: #{fn}"
 end
 

data/lib/stepmod/utils/terms_extractor.rb

@@ -134,8 +134,8 @@ module Stepmod
           end
 
           unless ACCEPTED_STAGES.include? bibdata.doctype
-            log "INFO: skipped #{bibdata.docid} as it is not \
-              one of (#{ACCEPTED_STAGES.join(', ')})."
+            log "INFO: skipped #{bibdata.docid} as it is not " \
+              "one of (#{ACCEPTED_STAGES.join(', ')})."
             next
           end
 
@@ -200,7 +200,7 @@ module Stepmod
           log "INFO: FILE PATH IS #{file_path}"
           case file_path.to_s
           when /resource.xml$/
-            log "INFO: Processing resource.xml for #{file_path}"
+            log "INFO: Processing resource.xml for #{fpath}"
 
             current_document.xpath("//schema").each do |schema_node|
               schema_name = schema_node["name"]
@@ -259,7 +259,7 @@ module Stepmod
             end
 
           when /module.xml$/
-            log "INFO: Processing module.xml for #{file_path}"
+            log "INFO: Processing module.xml for #{fpath}"
             # Assumption: every schema is only linked by a single module document.
             # puts current_document.xpath('//module').length
             schema_name = current_document.xpath("//module").first["name"]
@@ -284,7 +284,8 @@ module Stepmod
                 schema.entities.each do |entity|
                   old_definition = entity.remarks.first
 
-                  domain = "application module: #{schema.id}"
+                  # See: metanorma/iso-10303-2#90
+                  domain = "application object: #{schema.id}"
                   entity_definition = generate_entity_definition(entity, domain, old_definition)
 
                   reference_anchor = bibdata.anchor
@@ -362,11 +363,11 @@ module Stepmod
 
           log "INFO: Completed processing XML file #{fpath}"
           if current_part_concepts.to_a.empty?
-            log "INFO: Skipping #{fpath} (#{bibdata.docid}) \
-              because it contains no concepts."
+            log "INFO: Skipping #{fpath} (#{bibdata.docid}) " \
+              "because it contains no concepts."
           elsif current_part_concepts.to_a.length < 3
-            log "INFO: Skipping #{fpath} (#{bibdata.docid}) \
-              because it only has #{current_part_concepts.to_a.length} terms."
+            log "INFO: Skipping #{fpath} (#{bibdata.docid}) " \
+              "because it only has #{current_part_concepts.to_a.length} terms."
 
             current_part_concepts.to_a.each do |x|
               general_concepts.store(x)
@@ -377,23 +378,24 @@ module Stepmod
                                 current_part_concepts]
             end
           end
+
           unless current_part_resources.to_a.empty?
             part_resources << [bibdata,
                                current_part_resources]
           end
+
           if (current_part_modules_arm.to_a.size +
               current_part_modules_mim.to_a.size).positive?
             part_modules << [bibdata, current_part_modules_arm,
                              current_part_modules_mim]
           end
+
         end
       end
 
       def find_or_initialize_concept(collection, localized_concept)
-        concept_id = SecureRandom.uuid
-
         concept = collection
-          .store(Glossarist::Concept.new(id: concept_id))
+          .store(Glossarist::Concept.new(id: SecureRandom.uuid))
         concept.add_l10n(localized_concept)
       end
 
@@ -471,19 +473,45 @@ module Stepmod
         # end
       end
 
+      def entity_name_to_text(entity_id)
+        entity_id.downcase.gsub(/_/, " ")
+      end
 
       # rubocop:disable Layout/LineLength
       def generate_entity_definition(entity, domain, old_definition)
         return "" if entity.nil?
 
-        entity_text = if entity.subtype_of.size.zero?
-                        "entity data type that represents " +
-                        entity.id.indefinite_article + " **#{entity.id}** entity"
-                      else
-                        "entity data type that is a type of "+
-                        "**#{entity.subtype_of.map(&:id).join('** and **')}** that represents " +
-                        entity.id.indefinite_article + " **#{entity.id}** entity"
-                      end
+        # See: metanorma/iso-10303-2#90
+        # TODO: This is not DRY in case we have to further customize
+        entity_text = if domain =~ /\Aapplication object:/
+
+          if entity.subtype_of.size.zero?
+            "application object that represents the " +
+            "{{#{entity.id},#{entity_name_to_text(entity.id)}}} entity"
+          else
+            entity_subtypes = entity.subtype_of.map do |e|
+              "{{#{e.id},#{entity_name_to_text(e.id)}}}"
+            end
+            "application object that is a type of " +
+            "#{entity_subtypes.join(' and ')} that represents the " +
+            "{{#{entity.id},#{entity_name_to_text(entity.id)}}} entity"
+          end
+
+        else
+
+          # Not "application object"
+          if entity.subtype_of.size.zero?
+            "entity data type that represents " +
+            entity.id.indefinite_article + " {{#{entity.id}}} entity"
+          else
+            entity_subtypes = entity.subtype_of.map do |e|
+              "{{#{e.id}}}"
+            end
+            "entity data type that is a type of "+
+            "#{entity_subtypes.join(' and ')} that represents " +
+            entity.id.indefinite_article + " {{#{entity.id}}} entity"
+          end
+        end
 
         definition = <<~DEFINITION
           === #{entity.id}

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.18".freeze
+    VERSION = "0.3.19".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby