metanorma-plugin-lutaml 0.4.10 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241b12b07d457ea48176e22ce2cacc4a533c2ffc5435465637d51d37d6da1e80
-  data.tar.gz: 2a2bd1fe63f4febdae9ce40679f525cfe476f2a773ab15c5de9622145dbdbd7f
+  metadata.gz: d32e2622337e811833b81c4a3be6ff720d5b062807cd1e11532a4178e75a7f50
+  data.tar.gz: d048df682f6c5cc77770d74585b87644cf43d27e4bad65cfad6829fe3c75c2ad
 SHA512:
-  metadata.gz: 33ef546ecbc2929104ccda434021ef50afbd067d5f466b7d07181aea92415a15aaad67fdf3848b4bd0cf93878e032b007b437a630b1d5ea87398396b446b622f
-  data.tar.gz: 7373d126f78af6063dbfea6076018712f4185a6c0e75e50309befc23bf1e34beeec86ab80d8b36f9c73eb7e5ae238b0522e85ec307ee434538222790cc05d8c3
+  metadata.gz: 51972b3a3ca4fa2701813aefb8425cee81499725e8b488dd99098e446b1b37e8580cad84629e058ddab4ff8bd8db272558cd3f2666316623a9801407bd65ead6
+  data.tar.gz: 198d5703597a8c28a55e0d8c8845bc74738fbb3248fbc376d9c8488836c606f4d4e198bff24c24444d5c019455baa5f72ed970f51ef02f85845d1cc55c63f5a8

data/lib/metanorma/plugin/lutaml/liquid_templates/_packages_data_dictionary.liquid

@@ -135,8 +135,8 @@ None.
 {% assign non_unions = package.data_types | where: "stereotype", "DataType"  %}
 {% if non_unions.size > 0 %}
 {% for data_type in non_unions %}
-{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}<<{{ assoc.member_end }}-section,{{ assoc.member_end }}>>{% endfor %}{% endcapture %}
-[[{{ data_type.name }}-section]]
+{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}{% if additional_context.external_classes[assoc.member_end] %}<<{{ additional_context.external_classes[assoc.member_end] }},{{ assoc.member_end }}>>{% else %}<<section-{{ additional_context.external_classes[assoc.member_end] }},{{ assoc.member_end_xmi_id }}>>{% endif %}{% endfor %}{% endcapture %}
+[[section-{{ data_type.xmi_id }}]]
 {{equalsigns}}== {{ data_type.name }}
 
 .Metadata of {{ data_type.name }} ({{ data_type.stereotype }})
@@ -166,7 +166,7 @@ h| Constraint:
 {% if assoc.member_end_attribute_name.size > 0 %}
 {% capture cardinality %}&#91;{% case assoc.member_end_cardinality.min %}{% when "C" %}0{% when "M" %}1{% else %}{{assoc.member_end_cardinality.min}}{% endcase %}..{{ assoc.member_end_cardinality.max }}&#93;{% endcapture %}
 | {{ assoc.member_end_attribute_name }}
-| <<{{assoc.member_end}}-section,{{assoc.member_end}}>> {{ cardinality }}
+{% if additional_context.external_classes[assoc.member_end] %}| <<{{ additional_context.external_classes[assoc.member_end] }},{{assoc.member_end}}>> {{ cardinality }}{% else %}| <<section-{{ assoc.member_end_xmi_id }},{{assoc.member_end}}>> {{ cardinality }}{% endif %}
 | {{ assoc.definition | replace: '|', '\|' }}
 {% endif %}
 {% endfor %}
@@ -195,7 +195,7 @@ h| Constraint:
 {% for attr in data_type.attributes %}
 {% capture cardinality %}&#91;{% case attr.cardinality.min %}{% when 'C' %}0{% when 'M' %}1{% else %}{{ attr.cardinality.min }}{% endcase %}..{{ attr.cardinality.max }}&#93;{% endcapture %}
 | {{ attr.name }}
-| <<{{ attr.type }}-section,{{ attr.type }}>> {{ cardinality }}
+{% if additional_context.external_classes[attr.type] %}| <<{{ additional_context.external_classes[attr.type] }},{{ attr.type }}>> {{ cardinality }}{% else %}| <<section-{{ attr.xmi_id }},{{ attr.type }}>> {{ cardinality }}{% endif %}
 | {{ attr.definition | replace: '|', '\|' }}
 
 {% endfor %}
@@ -217,7 +217,7 @@ None.
 
 {% if package.enums.size > 0 %}
 {% for enum in package.enums %}
-[[{{ enum.name }}-section]]
+[[section-{{ enum.xmi_id }}]]
 {{equalsigns}}== {{ enum.name }}
 
 .Metadata of {{ enum.name }} (Enumeration)

data/lib/metanorma/plugin/lutaml/liquid_templates/_packages_data_dictionary_class.liquid

@@ -1,6 +1,6 @@
 {% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
-{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}<<{{ assoc.member_end }}-section,{{ assoc.member_end }}>>{% endfor %}{% endcapture %}
-[[{{ klass.name }}-section]]
+{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}{% if additional_context.external_classes[assoc.member_end] %}<<{{ additional_context.external_classes[assoc.member_end] }},{{ assoc.member_end }}>>{% else %}<<section-{{ assoc.member_end_xmi_id }},{{ assoc.member_end }}>>{% endif %}{% endfor %}{% endcapture %}
+[[section-{{ klass.xmi_id }}]]
 {{equalsigns}} {{ klass.name }}
 {%comment%}(inside class: depth is {{ depth }}, equalsigns {{equalsigns}}){%endcomment%}
 
@@ -31,7 +31,7 @@ h| Constraint:
 {% if assoc.member_end_attribute_name.size > 0 %}
 {% capture cardinality %}&#91;{% case assoc.member_end_cardinality.min %}{% when "C" %}0{% when "M" %}1{% else %}{{assoc.member_end_cardinality.min}}{% endcase %}..{{ assoc.member_end_cardinality.max }}&#93;{% endcapture %}
 | {{ assoc.member_end_attribute_name }}
-| <<{{assoc.member_end}}-section,{{assoc.member_end}}>> {{ cardinality }}
+{% if additional_context.external_classes[assoc.member_end] %}| <<{{ additional_context.external_classes[assoc.member_end] }},{{assoc.member_end}}>> {{ cardinality }}{% else %}| <<section-{{ assoc.member_end_xmi_id }},{{ assoc.member_end }}>> {{ cardinality }}{% endif %}
 | {{ assoc.definition | replace: '|', '\|' }}
 {% endif %}
 {% endfor %}
@@ -59,7 +59,7 @@ h| Constraint:
 {% for attr in klass.attributes %}
 {% capture cardinality %}&#91;{% case attr.cardinality.min %}{% when 'C' %}0{% when 'M' %}1{% else %}{{ attr.cardinality.min }}{% endcase %}..{{ attr.cardinality.max }}&#93;{% endcapture %}
 | {{ attr.name }}
-| <<{{ attr.type }}-section,{{ attr.type }}>> {{ cardinality }}
+{% if additional_context.external_classes[attr.type] %}| <<{{ additional_context.external_classes[attr.type] }},{{ attr.type }}>> {{ cardinality }}{% else %}| <<section-{{ attr.xmi_id }},{{ attr.type }}>> {{ cardinality }}{% endif %}
 | {{ attr.definition | replace: '|', '\|' }}
 
 {% endfor %}

data/lib/metanorma/plugin/lutaml/liquid_templates/_packages_entity_list.liquid

@@ -22,7 +22,7 @@
 {% if depth %}
 {% assign nested_depth = depth | plus: 1 %}
 {% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
-[[rc_{{ package_name }}-model_section]]
+[[section-{{ package.xmi_id }}]]
 {{equalsigns}} {{ package.name }}
 {% endif %}
 
@@ -89,7 +89,11 @@
 
 {% for klass in package.classes %}
 {% unless not_classes_stereotypes contains klass.stereotype %}
-| <<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
+{% if additional_context.external_classes[klass.name] %}
+| <<{{ additional_context.external_classes[klass.name] }},{{ klass.name }}>> «{{ klass.stereotype }}»
+{% else %}
+| | <<section-{{ klass.xmi_id }},{{ klass.name }}>> «{{ klass.stereotype }}»
+{% endif %}
 | {{ klass.definition | replace: '|', '\|' }}
 
 {% endunless %}
@@ -120,36 +124,6 @@
 
 {% endif %}
 
-{% comment %} {% if package.data_types.size > 0 %}
-.Data types used in {{ package.name }}
-[cols="2a,6a",options="header"]
-|===
-|Name |Description
-
-{% for klass in package.data_types %}
-|<<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
-|{{ klass.definition | replace: '|', '\|' }}
-
-{% endfor %}
-
-|===
-{% endif %}
-
-{% if package.enums.size > 0 %}
-.Enumerated Classes used in {{ package.name }}
-[cols="2a,6a",options="header"]
-|===
-|Name |Description
-
-{% for klass in package.enums %}
-|<<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
-|{{ klass.definition | replace: '|', '\|' }}
-
-{% endfor %}
-
-|===
-{% endif %} {% endcomment %}
-
 {% if additional_context.all_macros.size > 0 %}
 {% assign sorted_all_macros = additional_context.all_macros | where: "position", "after" | sort: 'index' %}
 {% for block in sorted_all_macros %}

data/lib/metanorma/plugin/lutaml/liquid_templates/_packages_entity_list_class.liquid

@@ -9,7 +9,7 @@
 {% assign package_name = package.name %}
 {% unless package_entities and package_entities[package_name][klass_name] != true %}
 {% unless not_classes_stereotypes contains klass.stereotype %}
-| <<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
+| <<section-{{ klass.xmi_id }},{{ klass.name }}>> «{{ klass.stereotype }}»
 | {{ klass.definition | replace: '|', '\|' }}
 
 {% endunless %}

data/lib/metanorma/plugin/lutaml/liquid_templates/_packages_entity_list_classes.liquid

@@ -4,7 +4,7 @@
 |Name |Description
 
 {% for klass in classes %}
-| <<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype | default: "Enumeration" }}»
+| <<section-{{ klass.xmi_id }},{{ klass.name }}>> «{{ klass.stereotype | default: "Enumeration" }}»
 | {{ klass.definition | replace: '|', '\|' }}
 
 {% endfor %}

data/lib/metanorma/plugin/lutaml/lutaml_table_inline_macro.rb

@@ -8,7 +8,7 @@ module Metanorma
         SUPPORTED_OPTIONS = %w[class enum data_type]
 
         use_dsl
-        named :lutaml_table_class
+        named :lutaml_table
 
         def process(parent, _target, attrs)
           keyword = SUPPORTED_OPTIONS.find { |n| attrs[n] }

data/lib/metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor.rb

@@ -163,7 +163,7 @@ module Metanorma
               'render_nested_packages' => true,
               "packages" => root_package['packages'],
               "root_packages" => [root_package],
-              "additional_context" => additional_context,
+              "additional_context" => additional_context.merge("external_classes" => options["external_classes"]),
               "name" => root_package['name']
             }
           end
@@ -173,7 +173,7 @@ module Metanorma
             "packages" => sort_and_filter_out_packages(all_packages, options),
             "package_entities" => package_entities(options),
             "package_skip_sections" => package_skip_sections(options),
-            "additional_context" => additional_context,
+            "additional_context" => additional_context.merge("external_classes" => options["external_classes"]),
             "root_packages" => [root_package],
             "name" => root_package['name']
           }

data/lib/metanorma/plugin/lutaml/version.rb

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.4.10".freeze
+      VERSION = "0.4.14".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Metanorma plugin for LutaML