stepmod-utils 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0c01510a286c5aa7e3b0a32a910b7b3637726e01cb7433f8552ef6758f3fa5
-  data.tar.gz: 0a3fd286cb1f42a4d5cb52989616cb36cc39cffd49c0cd6a7219685b9b83dfba
+  metadata.gz: 0d50ed47ffc263b007aa9f2bda3bf5535d9cf84dbc56f1fc87c63d4255ed3f02
+  data.tar.gz: 3572d73a116953f337ac8add7bb47133f33ab3244daa6f3ee58e9901f26cb5f1
 SHA512:
-  metadata.gz: 4cca0b6de2ee2109e0f11f144406a14f58a54cbd2030ae15180d897a923bf8c98de36b9f8c1d59445a2cde22a1cc2c9ac70474f6b1262fb6a7faa4bec460a631
-  data.tar.gz: c4c78c48c121619e7e47fda0a86caeaec622535cd5c57468e1316998fa4ab7a2c73549fe227c0a7df2bde4ea69f32852b52018304cfabe6c129241f8a2b54484
+  metadata.gz: 5263394029779a53cca0c8f41171eb5bbc8e2490de14041c4e6ae56f8880a0f4eff49c1235d43d69f0d34501e5ae372a4c77bbfeb459147765fd87f81014d7dd
+  data.tar.gz: 6aab6c46a9023e194fe278cedd353807d070eba8c61949777af13ff63a26d3f652a304575cfc56873b54fd57187347a1321df40d7527905320689664da89991c

data/lib/stepmod/utils/terms_extractor.rb

@@ -154,7 +154,7 @@ module Stepmod
 
           # read definitions
           current_part_concepts = Glossarist::Collection.new
-          current_document.xpath("//definition").each_with_index do |definition, definition_index|
+          current_document.xpath("//definition").each.with_index(1) do |definition, definition_index|
             term_id = definition["id"]
             unless term_id.nil?
               if encountered_terms[term_id]
@@ -444,7 +444,9 @@ module Stepmod
         combined.gsub!(/\n\/\/.*?\n/, "\n")
         combined.strip!
 
-        combined
+        express_reference_to_mention(combined)
+
+        # combined
         # # TODO: If the definition contains a list immediately after the first paragraph, don't split
         # return definition if definition =~ /\n\* /
 
@@ -461,6 +463,15 @@ module Stepmod
         # end
       end
 
+      # Replace `<<express:{schema}.{entity},{render}>>` with {{entity,render}}
+      def express_reference_to_mention(description)
+        # TODO: Use Expressir to check whether the "entity" is really an
+        # EXPRESS ENTITY. If not, skip the mention.
+        description.gsub(/<<express:([^,]+),([^>]+)>>/) do |match|
+          "{{#{Regexp.last_match[1].split('.').last},#{Regexp.last_match[2]}}}"
+        end
+      end
+
       def entity_name_to_text(entity_id)
         entity_id.downcase.gsub(/_/, " ")
       end
@@ -471,33 +482,37 @@ module Stepmod
 
         # See: metanorma/iso-10303-2#90
         # TODO: This is not DRY in case we have to further customize
-        entity_text = if domain_type = domain.match(/\A(application.*?):/)
+        entity_text = if domain_type = domain.match(/\A(application object):/)
+
+          entity_ref = if entity.id == entity_name_to_text(entity.id)
+            "{{#{entity.id}}}"
+          else
+            "{{#{entity.id},#{entity_name_to_text(entity.id)}}}"
+          end
 
           if entity.subtype_of.size.zero?
-            "#{domain_type[1]} that represents the " +
-            "{{#{entity.id},#{entity_name_to_text(entity.id)}}} entity"
+            "#{domain_type[1]} that represents the " + entity_ref + " entity"
           else
             entity_subtypes = entity.subtype_of.map do |e|
               "{{#{e.id},#{entity_name_to_text(e.id)}}}"
             end
             "#{domain_type[1]} that is a type of " +
             "#{entity_subtypes.join(' and ')} that represents the " +
-            "{{#{entity.id},#{entity_name_to_text(entity.id)}}} entity"
+            entity_ref + " entity"
           end
 
         else
 
-          # Not "application object" or "application module"
+          # Not "application object"
           if entity.subtype_of.size.zero?
-            "entity data type that represents " +
-            entity.id.indefinite_article + " {{#{entity.id}}} entity"
+            "entity data type that represents the {{#{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"
+            "entity data type that is a type of " +
+            "#{entity_subtypes.join(' and ')} that represents the " +
+            "{{#{entity.id}}} entity"
           end
         end
 

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.20".freeze
+    VERSION = "0.3.21".freeze
   end
 end

metadata

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