stepmod-utils 0.3.29 → 0.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20464f99d7ac2bb1ef98259e6e66d356fde298ca671e67587a57e072fdaad77c
-  data.tar.gz: 21ef21a08bd1dd78dca12c5f960ff8b715dbfbb3183a2d6ae3bb2da39300f53a
+  metadata.gz: 94969385c7a15c9c97396a1f41bb772001e7114cef8896cf3a4291635f6b0087
+  data.tar.gz: 568556c9711f6b04cd6dbb83bfc1ba3d14da334711f841dbed2609014eb6b642
 SHA512:
-  metadata.gz: e941853286cd6888c10323d8dce31b8347764e9588805eeae62248f8b1bcbf5c0f4e9324a24886704580dc874aa8ff92abc4d921a6bac224db3ff1983aa14707
-  data.tar.gz: 12ef57a910098c8f9cd9f98ad0af39072b6fb7496a6cbb7b238b401ee8f2f8dabaa4296ae2caaa3e5f24e54ce76674a76c8c8aa83c627b51e17d49706963c1b2
+  metadata.gz: 8dd2832e232332d5062e368e6e74bb8bbdb1a0bc76ab2e171e1351a83b684fbca26a0a6f16f346d82b1d2e8cce2a76fe7febc2d5b0684642b8864ebbf36a1dd1
+  data.tar.gz: 05727db1fdd1631ebe6cb19fac8f09306cacab603c03ade34c6c5683be9a2283f13e22e364a3580952414d132554adfbc2238c3d951f9cc92ac02a76fa5880c3

data/lib/stepmod/utils/terms_extractor.rb

@@ -243,13 +243,15 @@ module Stepmod
               bibdata: bibdata,
               # See: metanorma/iso-10303-2#90
               domain_prefix: "application module",
+              schema_type: type,
             )
           when "module_mim"
             mim_concepts = parse_annotated_module(
               schema: schema,
               bibdata: bibdata,
               # See: metanorma/iso-10303-2#90
-              domain_prefix: "application object",
+              domain_prefix: "application module",
+              schema_type: type,
             )
           when "resource"
             parse_annotated_resource(schema: schema, bibdata: bibdata)
@@ -268,7 +270,7 @@ module Stepmod
         }[match.captures[0]] || "resource"
       end
 
-      def parse_annotated_module(schema:, bibdata:, domain_prefix:)
+      def parse_annotated_module(schema:, bibdata:, domain_prefix:, schema_type:)
         log "INFO: parse_annotated_module: " \
             "Processing modules schema #{schema.file}"
 
@@ -285,6 +287,7 @@ module Stepmod
               "name" => schema.id,
               "type" => "module",
               "path" => extract_file_path(entity.parent.file),
+              "schema_type" => schema_type
             },
             document: {
               "type" => "module",
@@ -330,6 +333,7 @@ module Stepmod
               "name" => schema.id,
               "type" => "resource",
               "path" => extract_file_path(entity.parent.file),
+              "schema_type" => "resource"
             },
             document: {
               "type" => "resource",
@@ -363,7 +367,8 @@ module Stepmod
       # rubocop:disable Metrics/MethodLength
       def generate_concept_from_entity(entity:, schema:, domain:, bibdata:, document:)
         old_definition = trim_definition(entity.remarks.first)
-        definition = generate_entity_definition(entity, domain)
+        schema_type = schema["schema_type"]
+        definition = generate_entity_definition(entity, domain, schema_type)
 
         notes = [old_definition].reject { |note| redundant_note?(note) }
 
@@ -515,15 +520,20 @@ module Stepmod
       # end
 
       # rubocop:disable Layout/LineLength
-      def generate_entity_definition(entity, domain)
+      def generate_entity_definition(entity, domain, schema_type)
         return "" if entity.nil?
 
         # See: metanorma/iso-10303-2#90
-        entity_type = if domain_type = domain.match(/\A(application object):/)
-                        "{{#{domain_type[1]}}}"
-                      else
-                        "{{entity data type}}"
-                      end
+        entity_type = case schema_type
+        when "module_arm"
+          "{{application object}}"
+        when "module_mim"
+          "{{entity data type}}"
+        when "resource", "business_object_model"
+          "{{entity data type}}"
+        else
+          raise Error.new("[stepmod-utils] encountered unsupported schema_type")
+        end
 
         if entity.subtype_of.size.zero?
           "#{entity_type} " \

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.29".freeze
+    VERSION = "0.3.30".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.29
+  version: 0.3.30
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby