metanorma-plugin-lutaml 0.4.11 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ac25c64f997af2bb3228af3816a9aafe2ea0b62a8c80eaa58f598cba8085e2
-  data.tar.gz: 824ab598854889b1a7079d872d96f515757719436eba95850eb7a85d924e23fc
+  metadata.gz: ac83fb068848793194a604aa3da4a32bd1ee9cdc8a71bb1715fe2f44b230fded
+  data.tar.gz: 4b818c299336493cd3c1134165c1dacbef645ed648cc08322974ce5fb8678ccd
 SHA512:
-  metadata.gz: 68246a6140b1a29548a77c10e7949058652c4be9e1ec2ee150d698f777e0bb91c2c4d75abaac3f69b8d09089f945cc24fff150a9ac83acf6ff36c521bd8c1c97
-  data.tar.gz: a8c60e3c539d000334fafa9b43d3e89a144dd327f9c212445aae35a547f1dd6ce0214df15b3223d8306829d3e3f938318331b1581c9220ff330e8cfd5817f0fb
+  metadata.gz: bc4635a30a4715c1adcc9fed82a76d7258646d435079bbb1003ce1ebc41edf980a66d77429a42111068fcfc106cb3dc9a872eaa00780dc07c13664d94dc62731
+  data.tar.gz: 7634e9dfafe63910b9a3b0e6c29b29db6ca894d3f71612db60e1b5c97913db116c95a624cbba6181ce55cd24acf2a84766868b017be3907b9b8eef0396a297c9

data/.github/workflows/rake.yml

@@ -10,34 +10,6 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@master
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - uses: metanorma/metanorma-build-scripts/plantuml-setup-action@master
-
-      - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-          event-type: tests-passed
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+    uses: metanorma/metanorma-build-scripts/.github/workflows/plantuml-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: metanorma/metanorma-build-scripts/.github/workflows/rubygems-release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+      event_name: ${{ github.event_name }}
+    secrets:
+      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+

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 %}{% capture ref_id %}{% if additional_context.external_classes[assoc.member_end] %}{{ additional_context.external_classes[assoc.member_end] }}{% else %}{{ assoc.member_end }}-section{% endif %}{% endcapture %}<<{{ ref_id }},{{ 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,8 +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 }}
-{% capture ref_id %}{% if additional_context.external_classes[assoc.member_end] %}{{ additional_context.external_classes[assoc.member_end] }}{% else %}{{ assoc.member_end }}-section{% endif %}{% endcapture %}
-| <<{{ ref_id }},{{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 %}
@@ -196,8 +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 }}
-{% capture ref_id %}{% if additional_context.external_classes[attr.type] %}{{ additional_context.external_classes[attr.type] }}{% else %}{{ attr.type }}-section{% endif %}{% endcapture %}
-| <<{{ ref_id }},{{ 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 %}
@@ -219,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 %}{% capture ref_id %}{% if additional_context.external_classes[assoc.member_end] %}{{ additional_context.external_classes[assoc.member_end] }}{% else %}{{ assoc.member_end }}-section{% endif %}{% endcapture %}<<{{ ref_id }},{{ 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,8 +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 }}
-{% capture ref_id %}{% if additional_context.external_classes[assoc.member_end] %}{{ additional_context.external_classes[assoc.member_end] }}{% else %}{{ assoc.member_end }}-section{% endif %}{% endcapture %}
-| <<{{ ref_id }},{{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 %}
@@ -60,8 +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 }}
-{% capture ref_id %}{% if additional_context.external_classes[attr.type] %}{{ additional_context.external_classes[attr.type] }}{% else %}{{ attr.type }}-section{% endif %}{% endcapture %}
-| <<{{ ref_id }},{{ 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,8 +89,11 @@
 
 {% for klass in package.classes %}
 {% unless not_classes_stereotypes contains klass.stereotype %}
-{% capture ref_id %}{% if additional_context.external_classes[klass.name] %}{{ additional_context.external_classes[klass.name] }}{% else %}{{ klass.name }}-section{% endif %}{% endcapture %}
-| <<{{ ref_id }},{{ 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 %}

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/version.rb

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.4.11".freeze
+      VERSION = "0.4.15".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.11
+  version: 0.4.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -242,6 +242,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -301,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Metanorma plugin for LutaML