stepmod-utils 0.3.21 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d50ed47ffc263b007aa9f2bda3bf5535d9cf84dbc56f1fc87c63d4255ed3f02
-  data.tar.gz: 3572d73a116953f337ac8add7bb47133f33ab3244daa6f3ee58e9901f26cb5f1
+  metadata.gz: fc9977f6a7248164968637abc31b264b928a1b6de459e62a25fc9a95a250ec10
+  data.tar.gz: 030aa9b15094edaa59fbde8ff7948ff7d05dc96b73130495cedcb5f3e52c3b4d
 SHA512:
-  metadata.gz: 5263394029779a53cca0c8f41171eb5bbc8e2490de14041c4e6ae56f8880a0f4eff49c1235d43d69f0d34501e5ae372a4c77bbfeb459147765fd87f81014d7dd
-  data.tar.gz: 6aab6c46a9023e194fe278cedd353807d070eba8c61949777af13ff63a26d3f652a304575cfc56873b54fd57187347a1321df40d7527905320689664da89991c
+  metadata.gz: dca1f9e90a28a17c3cbc6082fb115a705bafe55871256bd2f9112fbd4879c02335a04767d60e3d6e5aaa3a935bf738b9a003542741587b8b4537c8328fe8c17c
+  data.tar.gz: 625b2542ab86f94f54829e750d8297307dfc47dadf740c3d96d65cff611478d04d1d267eb6b3e71abffebad876bbdfd982f50e09e2081ff1feb505fdd3f20f97

data/lib/stepmod/utils/terms_extractor.rb

@@ -476,44 +476,35 @@ module Stepmod
         entity_id.downcase.gsub(/_/, " ")
       end
 
+      def entity_ref(entity_id)
+        if entity_id == entity_name_to_text(entity_id)
+          "{{#{entity_id}}}"
+        else
+          "{{#{entity_id},#{entity_name_to_text(entity_id)}}}"
+        end
+      end
+
       # rubocop:disable Layout/LineLength
       def generate_entity_definition(entity, domain, old_definition)
         return "" if entity.nil?
 
         # 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 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_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_ref + " entity"
-          end
-
+        entity_type = if domain_type = domain.match(/\A(application object):/)
+          domain_type[1]
         else
+          "entity data type"
+        end
 
-          # Not "application object"
-          if entity.subtype_of.size.zero?
-            "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 the " +
-            "{{#{entity.id}}} entity"
+        entity_text = if entity.subtype_of.size.zero?
+          "#{entity_type} " +
+          "that represents the " + entity_ref(entity.id) + " entity"
+        else
+          entity_subtypes = entity.subtype_of.map do |e|
+            "{{#{e.id}}}"
           end
+          "#{entity_type} that is a type of " +
+          "#{entity_subtypes.join(' and ')} " +
+          "that represents the " + entity_ref(entity.id) + " entity"
         end
 
         definition = <<~DEFINITION

data/lib/stepmod/utils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.22
 platform: ruby
 authors:
 - Ribose Inc.