metanorma-plugin-lutaml 0.7.20 → 0.7.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c70ed413914e29f4c181d02bfd50681434437361fe26f10dc1ca94f7e85058e
-  data.tar.gz: addb2f7403c0ffebe85e26cd918440e140d43349c57055be8366b4d35cf794a9
+  metadata.gz: 2141a34ad005450e66a18defc983c59a7178b83260713cd2565dcb4ed1e8cc2a
+  data.tar.gz: 004eecc5e8640fe07f06344a7a60163d875e6da502dffdf8824f478c1a57780f
 SHA512:
-  metadata.gz: c5a5b0e871111297d907041d087a24acc58caf7f4c54db1f5213f6be08afdc5d26baceb50a34d9b0d806acd61d9316e72c0b051b7b5da5edfc0aad54ecc995f7
-  data.tar.gz: 61b0e6159c1444ea0faf3f3e693e3e2ef228aca57d2129a98450207dec0158e72459049462483a436ddc68e119624298c78d66ac161c2bc34a736b70ab765a96
+  metadata.gz: d1fedd8cf68d1bdbbbdee4ad12e892d8986f8f9d12f9135651e65460b6c7101a59ed76c70cef55ec28293a61445375381813b28d11ad7cd68dc735bdb63a68d7
+  data.tar.gz: '092a888203f0e03f77fa73dbd33fdd20e411a77d110cf1cae99e9bf89df3b16fca27c6070c014a1918a5b4cdac2079dea15be706e98a38f573e0d527da2f2cac'

data/README.adoc

@@ -295,7 +295,7 @@ via Liquid:
 {% assign selected = repo.schemas | where: "selected" %}
 ... do things with `selected` ...
 ---
------
+----
 
 NOTE: This functionality is used in the ISO 10303 SRL to load the full schema
 set at once but only render the selected schemas in individual documents.
@@ -374,155 +374,6 @@ diagram MyView {
 ....
 ----
 
-=== Generating a UML class and attributes clause: `lutaml_uml_class`
-
-This command allows rendering a definition clause for a UML class.
-
-Given `example.lutaml` with this content:
-
-[source,java]
-----
-class Register {
-  definition {
-    A register of information.
-  }
-
-  identifier: String[1] {
-    definition {
-      Unique identifier of the register.
-    }
-  }
-
-  concepts: Concept[0..*] {
-    definition {
-      Concepts.
-    }
-  }
-}
-----
-
-The command:
-
-[source,adoc]
-----
-[lutaml_uml_class,views/Register_Register.lutaml,Register]
-----
-
-Will produce this output:
-
-____
-== Register
-
-A register of information.
-
-=== Attributes
-
-==== identifier
-
-Unique identifier of the register.
-
-.Specification of `Register.identifier`
-|===
-h|Value type and multiplicity	| `String [1]`
-|===
-
-==== concepts
-
-Concepts.
-
-.Specification of `Register.concepts`
-|===
-h|Value type and multiplicity	| `Concepts [0..*]`
-|===
-
-____
-
-The command accepts two options:
-
-`skip_headers=true`:: (or just `skip_headers`) The initial heading (the UML class name)
-will not be generated. This is useful if additional content is to be supplied
-to the clause, such as diagrams that are defined outside the UML model.
-
-`depth={n}`:: (default: `2`) This determines the depth of the generated headings.
-A depth of `2` means the initial heading will have 2 equal signs, and so forth.
-The heading depth of the attributes are in relation to the initial depth, so
-a depth of `2` will have the "Attributes" section at depth `3`.
-
-
-=== Generating a UML attributes table: `lutaml_uml_attributes_table`
-
-This command allows rendering definition tables for a UML model.
-
-Given `example.lutaml` file with the content:
-
-[source,java]
-----
-diagram MyView {
-  title "my diagram"
-
-  enum AddressClassProfile {
-    imlicistAttributeProfile: CharacterString [0..1] {
-      definition
-        this is multiline with `ascidoc`
-      end definition
-    }
-  }
-
-  class AttributeProfile {
-    +addressClassProfile: CharacterString [0..1]
-    imlicistAttributeProfile: CharacterString [0..1] {
-      definition this is attribute definition
-    }
-  }
-}
-----
-
-And the `lutaml_uml_attributes_table` command:
-
-[source,adoc]
-----
-[lutaml_uml_attributes_table, example.lutaml, AttributeProfile]
-----
-
-Will produce this output:
-
-____
-=== AttributeProfile
-
-.AttributeProfile attributes
-|===
-|Name |Definition |Mandatory/ Optional/ Conditional |Max Occur |Data Type
-
-|addressClassProfile |TODO: enum's definition |M |1 | `CharacterString`
-
-|imlicistAttributeProfile |this is attribute definition with multiply lines |M |1 | `CharacterString`
-
-|===
-____
-
-
-In case of "enumeration" (AddressClassProfile) entity:
-
-[source,adoc]
-----
-[lutaml_uml_attributes_table, example.lutaml, AddressClassProfile]
-----
-
-Will produce this output:
-
-____
-=== AddressClassProfile
-
-.AddressClassProfile values
-|===
-|Name |Definition
-
-|imlicistAttributeProfile |this is multiline with `asciidoc`
-
-|===
-____
-
-
 == Usage with Enterprise Architect (UML in XMI)
 
 === General

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

@@ -42,9 +42,7 @@ module Metanorma
           end
 
           doc ||= parent.document.attributes["lutaml_xmi_cache"].values.first
-          return doc if doc.instance_of?(::Lutaml::XMI::RootDrop)
-
-          doc.original_document
+          doc
         end
 
         def get_path_from_index(parent, index_name) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength

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

@@ -162,16 +162,8 @@ module Metanorma
           [lutaml_document, yaml_config]
         end
 
-        def get_original_document(wrapper)
-          doc = wrapper
-          return doc if doc.instance_of?(::Lutaml::XMI::RootDrop)
-
-          doc.original_document
-        end
-
         def fill_in_entities_refs_attributes(document, # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
           lutaml_document, _options)
-          lutaml_document = get_original_document(lutaml_document)
           # render_style = options.fetch(RENDER_STYLE_ATTRIBUTE, "default")
           all_children_packages = lutaml_document.packages
             .map(&:children_packages).flatten
@@ -201,7 +193,6 @@ module Metanorma
         end
 
         def fill_in_diagrams_attributes(document, lutaml_document) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-          lutaml_document = get_original_document(lutaml_document)
           package_flat_diagrams = lambda do |pks|
             pks.each_with_object({}) do |package, res|
               package.diagrams.map do |diag|

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

@@ -49,7 +49,7 @@ module Metanorma
           line.match(/^\[(?:\blutaml\b|\blutaml_express\b|\blutaml_express_liquid\b),(?<index_names>[^,]+)?,?(?<context_name>[^,]+)?(?<options>,.*)?\]/) # rubocop:disable Layout/LineLength
         end
 
-        def load_lutaml_file(document, file_path)
+        def load_express_lutaml_file(document, file_path)
           ::Lutaml::Parser.parse(
             File.new(
               Utils.relative_file_path(document, file_path),
@@ -108,9 +108,7 @@ module Metanorma
           index_names.map do |path|
             if indexes[path]
               indexes[path][:liquid_drop] ||=
-                indexes[path][:wrapper].original_document.to_liquid(
-                  options: options,
-                )
+                indexes[path][:model].to_liquid(options: options)
             else
               full_path = Utils.relative_file_path(document, path)
               unless File.file?(full_path)
@@ -120,11 +118,9 @@ module Metanorma
                   "the full path.",
                 )
               end
-              wrapper = load_lutaml_file(document, path)
+              express_model = load_express_lutaml_file(document, path)
               indexes[path] = {
-                liquid_drop: wrapper.original_document.to_liquid(
-                  options: options,
-                ),
+                liquid_drop: express_model.to_liquid(options: options),
               }
             end
 
@@ -155,13 +151,6 @@ module Metanorma
           options
         end
 
-        def get_original_document(wrapper)
-          doc = wrapper
-          return doc if doc.instance_of?(::Lutaml::XMI::RootDrop)
-
-          doc.original_document
-        end
-
         def render_liquid_template(document:, lines:, context_name:, # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/ParameterLists
 index_names:, options:, indexes:)
           config_yaml_path = options.delete("config_yaml")

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

@@ -14,7 +14,7 @@ module Metanorma
   module Plugin
     module Lutaml
       #  Macro for quick rendering of datamodel attributes/values table
-      #  @example [lutaml_uml_attributes_table,path/to/lutaml,EntityName]
+      # TODO: merge with lutaml_ea_xmi
       class LutamlUmlDatamodelDescriptionPreprocessor <
           ::Asciidoctor::Extensions::Preprocessor
         include LutamlEaXmiBase
@@ -24,8 +24,11 @@ module Metanorma
 
         private
 
-        def parse_result_document(full_path, _guidance = nil)
-          ::Lutaml::Parser.parse(File.new(full_path, encoding: "UTF-8")).first
+        def parse_result_document(full_path, guidance)
+          ::Lutaml::XMI::Parsers::XML.serialize_xmi_to_liquid(
+            File.new(full_path, encoding: "UTF-8"),
+            guidance,
+          )
         end
       end
     end

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

@@ -61,13 +61,6 @@ module Metanorma
           end
         end
 
-        def get_original_document(wrapper)
-          doc = wrapper
-          return doc if doc.instance_of?(::Lutaml::XMI::RootDrop)
-
-          doc.original_document
-        end
-
         def load_express_repositories(path:, cache_path:, document:,
 force_read: false)
           cache_full_path = cache_path &&
@@ -80,17 +73,17 @@ force_read: false)
 
           # If there is no cache or "force read" is set.
           full_path = Utils.relative_file_path(document, path)
-          lutaml_wrapper = load_express_repo_from_path(document, full_path)
+          lutaml_doc = load_express_repo_from_path(document, full_path)
 
           if cache_full_path && !File.file?(cache_full_path)
             save_express_repo_to_cache(
               cache_full_path,
-              get_original_document(lutaml_wrapper),
+              lutaml_doc,
               document,
             )
           end
 
-          lutaml_wrapper
+          lutaml_doc
         rescue Expressir::Error
           FileUtils.rm_rf(cache_full_path)
 
@@ -179,16 +172,15 @@ force_read: false)
               raise StandardError.new("No name and path set in `:lutaml-express-index:` attribute.")
             end
 
-            lutaml_expressir_wrapper = load_express_repositories(
+            lutaml_expressir_model = load_express_repositories(
               path: path,
               cache_path: cache,
               document: document,
             )
 
-            if lutaml_expressir_wrapper
+            if lutaml_expressir_model
               express_indexes[name] = {
-                wrapper: lutaml_expressir_wrapper,
-                serialized_hash: nil,
+                model: lutaml_expressir_model,
               }
             end
           end

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

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

data/lib/metanorma-plugin-lutaml.rb

@@ -1,7 +1,5 @@
 require "metanorma/plugin/lutaml/version"
 require "metanorma/plugin/lutaml/lutaml_preprocessor"
-require "metanorma/plugin/lutaml/lutaml_uml_class_preprocessor"
-require "metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_ea_xmi_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_diagram_block"

data/metanorma-plugin-lutaml.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml"
-  spec.add_development_dependency "metanorma-standoc"
+  spec.add_development_dependency "metanorma-standoc", "~> 3.0"
   spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rspec-html-matchers"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.7.20
+  version: 0.7.22
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -140,16 +140,16 @@ dependencies:
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -343,8 +343,6 @@ files:
 - lib/metanorma/plugin/lutaml/lutaml_klass_table_block_macro.rb
 - lib/metanorma/plugin/lutaml/lutaml_preprocessor.rb
 - lib/metanorma/plugin/lutaml/lutaml_table_inline_macro.rb
-- lib/metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor.rb
-- lib/metanorma/plugin/lutaml/lutaml_uml_class_preprocessor.rb
 - lib/metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor.rb
 - lib/metanorma/plugin/lutaml/utils.rb
 - lib/metanorma/plugin/lutaml/version.rb

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

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require "metanorma/plugin/lutaml/asciidoctor/preprocessor"
-
-module Metanorma
-  module Plugin
-    module Lutaml
-      #  Macro for quick rendering of datamodel attributes/values table
-      #  @example [lutaml_uml_attributes_table,path/to/lutaml,EntityName]
-      class LutamlUmlAttributesTablePreprocessor < LutamlUmlClassPreprocessor
-        MACRO_REGEXP =
-          /\[lutaml_uml_attributes_table,([^,]+),?([^,]+),?(.+?)?\]/.freeze
-
-        # rubocop:disable Layout/IndentHeredoc
-        def template(options)
-          skip_headers = options[:skip_headers]
-
-          <<~TEMPLATE
-            #{'=== {{ definition.name }}' unless skip_headers}
-            {{ definition.definition }}
-
-            {% if definition.attributes %}
-            {% if definition.keyword == 'enumeration' %}
-            .{{ definition.name }} values
-            |===
-            |Name |Definition
-
-            {% for item in definition.attributes %}
-            |{{ item.name }} |{{ item.definition }}
-            {% endfor %}
-            |===
-            {% else %}
-            .{{ definition.name }} attributes
-            |===
-            |Name |Definition |Mandatory / Optional / Conditional |Max Occur |Data Type
-
-            {% for item in definition.attributes %}
-            |{{ item.name }} |{% if item.definition %}{{ item.definition }}{% endif %} |{% if item.cardinality.min == "0" %}O{% else %}M{% endif %} |{% if item.cardinality.max == "*" %}N{% else %}1{% endif %} |{% if item.origin %}<<{{ item.origin }}>>{% endif %} `{{ item.type }}`
-            {% endfor %}
-            |===
-            {% endif %}
-            {% endif %}
-
-          TEMPLATE
-        end
-        # rubocop:enable Layout/IndentHeredoc
-      end
-    end
-  end
-end

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

@@ -1,168 +0,0 @@
-# frozen_string_literal: true
-
-require "liquid"
-require "asciidoctor"
-require "asciidoctor/reader"
-require "lutaml"
-require "lutaml/uml"
-require "metanorma/plugin/lutaml/utils"
-require "metanorma/plugin/lutaml/asciidoctor/preprocessor"
-
-module Metanorma
-  module Plugin
-    module Lutaml
-      #  Macro for quick rendering of datamodel attributes/values table
-      #  @example [lutaml_uml_class,path/to/lutaml,EntityName]
-      class LutamlUmlClassPreprocessor < ::Asciidoctor::Extensions::Preprocessor
-        MACRO_REGEXP =
-          /\[lutaml_uml_class,([^,]+),?([^,]+),?(.+?)?\]/.freeze
-
-        def get_macro_regexp
-          self.class.const_get(:MACRO_REGEXP)
-        end
-
-        # search document for block `datamodel_attributes_table`
-        #  read include derectives that goes after that in block and transform
-        #  into yaml2text blocks
-        def process(document, reader)
-          r = Asciidoctor::PreprocessorNoIfdefsReader.new document, reader.lines
-          input_lines = r.readlines.to_enum
-          Asciidoctor::PreprocessorNoIfdefsReader
-            .new(document, processed_lines(document, input_lines))
-        end
-
-        private
-
-        def lutaml_document_from_file(document, file_path)
-          ::Lutaml::Parser.parse(
-            File.new(
-              Utils.relative_file_path(document, file_path),
-              encoding: "UTF-8",
-            ),
-          ).first
-        end
-
-        DEFAULT_OPTIONS = { depth: 2 }.freeze
-
-        def parse_options_to_hash(options_string)
-          return DEFAULT_OPTIONS.dup if options_string.nil? ||
-            options_string.empty?
-
-          opts = options_string.split(",").inject({}) do |acc, pair|
-            key, value = pair.split("=")
-            key = key.to_sym
-            value = true if value.nil?
-            value = value.to_i if key == :depth
-            acc[key] = value if key
-            acc
-          end
-
-          DEFAULT_OPTIONS.dup.merge(opts)
-        end
-
-        def processed_lines(document, input_lines)
-          input_lines.each_with_object([]) do |line, result|
-            if match = line.match(get_macro_regexp)
-              lutaml_path = match[1]
-              entity_name = match[2]
-              options = parse_options_to_hash(match[3])
-
-              result.push(*parse_macro(lutaml_path, entity_name, document,
-                                       options))
-            else
-              result.push(line)
-            end
-          end
-        end
-
-        def parse_macro(lutaml_path, entity_name, document, options)
-          lutaml_document = lutaml_document_from_file(document, lutaml_path)
-            .serialized_document
-          entities = [lutaml_document["classes"], lutaml_document["enums"]]
-            .compact
-            .flatten
-          entity_definition = entities.detect do |klass|
-            klass["name"] == entity_name.strip
-          end
-          model_representation(entity_definition, document, options)
-        end
-
-        def model_representation(entity_definition, document, options)
-          render_result, errors = Utils.render_liquid_string(
-            template_string: template(options),
-            context_items: entity_definition,
-            context_name: "definition",
-            document: document,
-          )
-          Utils.notify_render_errors(document, errors)
-          render_result.split("\n")
-        end
-
-        def equalsigns(depth)
-          "=" * depth
-        end
-
-        # rubocop:disable Layout/IndentHeredoc
-        def template(options)
-          skip_headers = options[:skip_headers]
-          depth = options[:depth]
-
-          <<~TEMPLATE
-            {% if definition.keyword == 'enumeration' %}
-            #{"#{equalsigns(depth)} Enumeration: {{ definition.name }}" unless skip_headers}
-            {% else %}
-            #{"#{equalsigns(depth)} Class: {{ definition.name }}" unless skip_headers}
-            {% endif %}
-
-            #{equalsigns(depth + 1)} Description
-
-            {{ definition.definition }}
-
-            {% if definition.attributes %}
-            {% if definition.keyword == 'enumeration' %}
-            {% for item in definition.attributes %}
-            #{equalsigns(depth + 1)} Enumeration value: {{item.name}}
-
-            {% if item.definition %}
-            {{ item.definition }}
-            {% endif %}
-
-            {% endfor %}
-
-            {% else %}
-
-            {% for item in definition.attributes %}
-            #{equalsigns(depth + 1)} Attribute: {{item.name}}
-
-            {% if item.definition %}
-            {{ item.definition }}
-            {% endif %}
-
-            Value type and multiplicity:
-            {% if item.type -%}{{ item.type }}{% else -%}(no type specified){% endif %}
-            {% if item.cardinality.min -%}
-            {% if item.cardinality.max -%}
-            {blank}[{{item.cardinality.min}}..{{item.cardinality.max}}]
-            {% else -%}
-            {blank}[{{item.cardinality.min}}]
-            {% endif -%}
-            {% else -%}
-            (multiplicity unspecified)
-            {% endif %}
-
-            {% if item.origin %}
-            Origin: <<{{ item.origin }}>>
-            {% endif %}
-
-            {% endfor %}
-
-            {% endif %}
-            {% endif %}
-
-          TEMPLATE
-        end
-        # rubocop:enable Layout/IndentHeredoc
-      end
-    end
-  end
-end