metanorma-plugin-lutaml 0.7.32 → 0.7.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd1f666910d8626ed3c60a6543c1d0922a1b988941acb672484757dc42e4e1d2
-  data.tar.gz: f40aa319451eaf3444f9bbb06a45aa2f28281fb81d9bc0db40fa5f2699c52d6d
+  metadata.gz: bdcd6f308c7b6b9aedf946aaf6c83524cc53fe0d861376b2f27488bdc66f03ea
+  data.tar.gz: 950763731a5d2712b15ae1f98fd06f173ffbab4e520243a8474ef652839455b5
 SHA512:
-  metadata.gz: '096af413077b87f001e1746914fe05f833c83ff698d60383c57e7daf4aa88aae61244d034836ea01eb66bd787940065c4689210d2e9bf7de69b499e6ee96adf5'
-  data.tar.gz: 9873bf6b1a5439de6c1aa6480631fc820a0a857e079438fa7ee987cd3fa6a2d069976986d587345bd9e1f4a6466efcae087d06f88647316d3b1afbb46021c0ae
+  metadata.gz: c7f843aa5286d1b952437b330749ade1854e510a33f2ec100e7a384c3049838f60fb099339c23c66ef54cad12c862ca29c7e5138eca3a8306ed326ba9e55e615
+  data.tar.gz: fbb5cbe113944fb2106143b8ad653dd39daca164df59b99b2564292132cd3b29c634c939589c4ce8de303aad30d9316b9e943ef6c3b90d3a71ff3258b60745fd

data/lib/metanorma/plugin/lutaml/config/root.rb

@@ -16,6 +16,7 @@ module Metanorma
           attribute :package_root_level, :integer
           attribute :render_nested_packages, :boolean
           attribute :external_classes, :hash
+          attribute :skip_unrecognized_connector, :boolean
 
           yaml do
             map "packages", to: :packages,
@@ -32,6 +33,7 @@ module Metanorma
             map "package_root_level", to: :package_root_level
             map "render_nested_packages", to: :render_nested_packages
             map "external_classes", to: :external_classes
+            map "skip_unrecognized_connector", to: :skip_unrecognized_connector
           end
 
           def packages_from_yaml(model, values) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity

data/lib/metanorma/plugin/lutaml/liquid/custom_filters/file_exist.rb

@@ -0,0 +1,13 @@
+module Metanorma
+  module Plugin
+    module Lutaml
+      module Liquid
+        module CustomFilters
+          def file_exist(path)
+            File.exist?(path)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,74 +8,122 @@
 [width="100%",cols="a,a,a,a,a,a,a,a"]
 |===
 
-h|Name: 7+| {{ klass.name }}
+h|Name 7+| {{ klass.name }}
 
-h|Definition: 7+| {{ klass.definition | html2adoc }}
+h|Definition 7+| {{ klass.definition | html2adoc }}
 
-h|Stereotype: 7+| {{ klass.stereotype | default: 'interface' }}
+h|Stereotype 7+| {{ klass.stereotype | default: 'interface' }}
 
 {% assign inherited = klass.associations | where: "member_end_type", "inheritance" %}
 {% if inherited.size > 0 %}
-h|Inheritance from: 7+| {{ inherited | map: 'member_end' | join: ", " }}
+h|Inherits from 7+| {{ inherited | map: 'member_end' | join: ", " }}
 {% endif %}
 
 {% assign generalizations = klass.associations | where: "member_end_type", "generalization" %}
 {% if generalizations.size > 0 %}
-h|Generalization of: 7+| {{ generalizations | map: 'member_end' | join: ", " }}
+h|Generalization of 7+| {{ generalizations | map: 'member_end' | join: ", " }}
 {% endif %}
 
-h|Abstract: 7+| {% if klass.is_abstract %}True{% else %}False{% endif %}
+h|Abstract 7+| {% if klass.is_abstract %}True{% else %}False{% endif %}
 {% assign aggregations = klass.associations | where: "member_end_type", "aggregation" %}
+
 {% if aggregations.size > 0 %}
-.{{aggregations.size | plus: 1}}+h|Associations:
-4+| _Association with_
-| _Obligation_
-| _Maximum occurrence_
-| _Provides_
+
+{% assign associations_colspan = aggregations.size | plus: 1 %}
+{% for assoc in aggregations %}
+{% if assoc.connector && assoc.connector.source %}
+{% assign associations_colspan = associations_colspan | plus: 1 %}
+{% endif %}
+{% if assoc.connector && assoc.connector.target %}
+{% assign associations_colspan = associations_colspan | plus: 1 %}
+{% endif %}
+{% endfor %}
+
+.{{associations_colspan}}+h|Associations
+2+h| _Name_
+2+h| _Type_
+3+h| _Definition_
 
 {% for assoc in aggregations %}
-4+| {{assoc.member_end}}
-| {% if assoc.member_end_cardinality %}{{ assoc.member_end_cardinality.min }}{% endif %}
-| {% if assoc.member_end_cardinality %}{{ assoc.member_end_cardinality.max }}{% endif %}
-| {{ assoc.member_end_attribute_name }}
+
+{% assign member_end_documentation_size = assoc.member_end.definition | size %}
+{% capture member_end_documentation %}{% if member_end_documentation_size > 0 %}{{ assoc.member_end.definition }}{% else %}(none){% endif %}{% endcapture %}
+
+2+| {{ assoc.member_end }}
+2+| {{ assoc.member_end_attribute_name }}
+3+| {{ member_end_documentation | html2adoc }}
+
+{% if assoc.connector && assoc.connector.source %}
+{% assign source_name_size = assoc.connector.source.name | size %}
+{% capture source_name %}{% if source_name_size > 0 %}{{ assoc.connector.source.name }}{% else %}(self){% endif %}{% endcapture %}
+{% assign source_documentation_size = assoc.connector.source.documentation | size %}
+{% capture source_documentation %}{% if source_documentation_size > 0 %}{{ assoc.connector.source.documentation }}{% else %}(none){% endif %}{% endcapture %}
+{% assign source_multiplicity_size = assoc.connector.source.multiplicity | size %}
+{% capture source_multiplicity %}{% if source_multiplicity_size > 0 %}[{{ assoc.connector.source.multiplicity }}]{% else %}[none]{% endif %}{% endcapture %}
+
+2+| source:{{ source_name }} {{ source_multiplicity }}
+2+| {{ assoc.connector.source.type }}
+3+| {{ source_documentation | html2adoc }}
+{% endif %}
+
+{% if assoc.connector && assoc.connector.target %}
+{% assign target_name_size = assoc.connector.target.name | size %}
+{% capture target_name %}{% if target_name_size > 0 %}{{ assoc.connector.target.name }}{% else %}(self){% endif %}{% endcapture %}
+{% assign target_documentation_size = assoc.connector.target.documentation | size %}
+{% capture target_documentation %}{% if target_documentation_size > 0 %}{{ assoc.connector.target.documentation }}{% else %}(none){% endif %}{% endcapture %}
+{% assign target_multiplicity_size = assoc.connector.target.multiplicity | size %}
+{% capture target_multiplicity %}{% if target_multiplicity_size > 0 %}[{{ assoc.connector.target.multiplicity }}]{% else %}[none]{% endif %}{% endcapture %}
+
+2+| target:{{ target_name }} {{ target_multiplicity }}
+2+| {{ assoc.connector.target.type }}
+3+| {{ target_documentation | html2adoc }}
+{% endif %}
 
 {% endfor %}
 {% else %}
-h| Associations: 7+| (none)
+h| Associations 7+| (none)
 {% endif %}
 
 {% if klass.attributes.size > 0 %}
-.{{klass.attributes.size | plus: 1}}+h|Public attributes:
-| _Name_
-2+| _Definition_
-| _Derived_
-| _Obligation_
-| _Maximum occurrence_
-| _Data type_
+.{{klass.attributes.size | plus: 1}}+h|Attributes
+2+h| _Name_
+2+h| _Type_
+3+h| _Definition_
 
 {% for attr in klass.attributes %}
-| {{attr.name}}
-2+| {{ attr.definition | html2adoc }}
-| {{ attr.is_derived }}
-| {{attr.cardinality.min}}
-| {{attr.cardinality.max}}
-| {{attr.type}}
+{% capture attr_cardinality %}[{{attr.cardinality.min}}..{{attr.cardinality.max}}]{% endcapture %}
+{% if attr_cardinality == "[*..*]" or attr_cardinality == "[0..*]" %}
+{% assign attr_cardinality = "[*]" %}
+{% endif %}
+{% if attr_cardinality == "[1..1]" %}
+{% assign attr_cardinality = "[1]" %}
+{% endif %}
+{% if attr_cardinality == "[..]" %}
+{% assign attr_cardinality = "[none]" %}
+{% endif %}
+
+{% assign attr_definition_size = attr.definition | size %}
+{% capture attr_definition %}{% if attr_definition_size > 0 %}{{ attr.definition }}{% else %}(none){% endif %}{% endcapture %}
+
+2+| {{ attr.name }} {{ attr_cardinality }}
+2+| {{ attr.type }}
+3+| {{ attr_definition | html2adoc }}
 
 {% endfor %}
 {% else %}
-h| Public attributes:
+h| Attributes
 7+| (none)
 {% endif %}
 
 {% if klass.constraints.size > 0 %}
-.{{ klass.constraints.size }}+h| Constraints:
+.{{ klass.constraints.size }}+h| Constraints
 {% for constraint in klass.constraints %}
 7+| `{{ constraint.body }}`: `{{ constraint.definition | replace: '|', '\|' }}`
 
 {% endfor %}
 {% else %}
 
-h|Constraints: 7+| (none)
+h|Constraints 7+| (none)
 {% endif %}
 
 |===

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

@@ -295,13 +295,9 @@ module Metanorma
         )
           root_package = package_level(lutaml_document.to_liquid,
                                        options.package_root_level || 1)
-          contexts = {}
-          contexts[context_name] = {
-            "name" => root_package["name"],
-            "root_packages" => [root_package],
-            "additional_context" => additional_context
-              .merge("external_classes" => options.external_classes),
-          }
+          contexts = create_default_context_object(
+            context_name, root_package, additional_context, options
+          )
 
           if options.packages.nil?
             contexts[context_name]["render_nested_packages"] = true
@@ -316,14 +312,28 @@ module Metanorma
               "packages" => sort_and_filter_out_packages(all_packages, options),
               "package_entities" => package_hash(options, "render_entities"),
               "package_skip_sections" => package_hash(options, "skip_tables"),
-              "render_nested_packages" => options.render_nested_packages ||
-                false,
+              "render_nested_packages" => !!options.render_nested_packages,
             },
           )
 
           contexts
         end
 
+        def create_default_context_object(
+          context_name, root_package, additional_context, options
+        )
+          contexts = {}
+          contexts[context_name] = {
+            "name" => root_package["name"],
+            "root_packages" => [root_package],
+            "additional_context" => additional_context
+              .merge("external_classes" => options.external_classes),
+            "skip_unrecognized_connector" => !!options
+              .skip_unrecognized_connector,
+          }
+          contexts
+        end
+
         def package_hash(options, key)
           return {} unless options.packages
 

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

@@ -33,8 +33,6 @@ module Metanorma
                                                           reader.lines)
           input_lines = r.readlines.to_enum
 
-          has_lutaml_liquid = input_lines.any? { |line| lutaml_liquid?(line) }
-
           express_indexes = Utils.parse_document_express_indexes(
             document,
             input_lines,
@@ -46,19 +44,11 @@ module Metanorma
             express_indexes: express_indexes,
           )
 
-          log(document, result_content) if has_lutaml_liquid
-
           Asciidoctor::PreprocessorNoIfdefsReader.new(document, result_content)
         end
 
         protected
 
-        def log(doc, text)
-          File.open("#{doc.attr('docfile')}.lutaml.log.txt", "w:UTF-8") do |f|
-            f.write(text.join("\n"))
-          end
-        end
-
         def lutaml_liquid?(line)
           line.match(EXPRESS_PREPROCESSOR_REGEX)
         end

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

@@ -7,6 +7,7 @@ require "metanorma/plugin/lutaml/liquid/custom_filters/html2adoc"
 require "metanorma/plugin/lutaml/liquid/custom_filters/values"
 require "metanorma/plugin/lutaml/liquid/custom_filters/replace_regex"
 require "metanorma/plugin/lutaml/liquid/custom_filters/loadfile"
+require "metanorma/plugin/lutaml/liquid/custom_filters/file_exist"
 
 module Metanorma
   module Plugin

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

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

data/metanorma-plugin-lutaml.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7.0" # rubocop:disable Gemspec/RequiredRubyVersion
 
   spec.add_dependency "asciidoctor"
-  spec.add_dependency "coradoc", "~> 1.1.1"
-  spec.add_dependency "expressir", "~> 2.1.13"
+  spec.add_dependency "coradoc", "~> 1.1"
+  spec.add_dependency "expressir", "~> 2.1"
   spec.add_dependency "isodoc"
   spec.add_dependency "liquid"
-  spec.add_dependency "lutaml", "~> 0.9.32"
+  spec.add_dependency "lutaml", "~> 0.9"
   spec.add_dependency "ogc-gml", "~>1.0.0"
   spec.add_dependency "relaton-cli"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.7.32
+  version: 0.7.34
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-29 00:00:00.000000000 Z
+date: 2025-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: expressir
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.13
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.13
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.32
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.32
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: ogc-gml
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - lib/metanorma/plugin/lutaml/file_not_found_error.rb
 - lib/metanorma/plugin/lutaml/json2_text_preprocessor.rb
 - lib/metanorma/plugin/lutaml/liquid/custom_blocks/key_iterator.rb
+- lib/metanorma/plugin/lutaml/liquid/custom_filters/file_exist.rb
 - lib/metanorma/plugin/lutaml/liquid/custom_filters/html2adoc.rb
 - lib/metanorma/plugin/lutaml/liquid/custom_filters/loadfile.rb
 - lib/metanorma/plugin/lutaml/liquid/custom_filters/replace_regex.rb