metanorma-plugin-lutaml 0.7.43 → 0.7.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ccb84d2d51e49f3c38111da77b4e4075d6523c3d39e151c8442f0dae66f822d
-  data.tar.gz: cf4f84412c7e075808c47ff8da0760c78dc54e9b754fc16c38da4393ca51ae6d
+  metadata.gz: ecadace3879b75e1ec4f08f435da722a2151c32a419fed84476646f2dc7314f6
+  data.tar.gz: bc0e618b7252c140a1b9acc404194f2fdfa30e65c8b4ae8823c6bc19222a4a8a
 SHA512:
-  metadata.gz: 288cdab0f88cb441300782e222e52ef737429f564e6158dcb2235559fe3623492fa0063ae805c6490c57c1b0b3c026b9a7d80d4c879fbbb2660412fbcea81938
-  data.tar.gz: c5e44fae9fe3a9428c5a0cdfabf07d3ee3dfa9460d56beea21696db9406ec36084c6409c7130e12f242a109cf279b0bdc9fd7d62d6f61c4de024cc656cb59fdb
+  metadata.gz: 8d621151fd02cf3582d75366b8fc943f51286357d95584863c3158b7911b082dfaa877919505ba3483219d5c08eeae1ad449fe9862f0aa63b3507f08764f9a3a
+  data.tar.gz: 54823d6d7ae810e8791dc27d3dec120a44eb224fadce8ccedbd4884d4d8a28c54127bb1e8bf6b2c54e0c740085c52c5968d1e8181964902371cee15f329b990e

data/.rubocop_todo.yml

@@ -1,85 +1,40 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-13 23:15:25 UTC using RuboCop version 1.86.1.
+# on 2026-05-15 01:32:12 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Gemspec/RequireMFA:
-  Exclude:
-    - 'metanorma-plugin-lutaml.gemspec'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'spec/regen_expected.rb'
-    - 'spec/regen_expected_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IndentationWidth.
-Layout/AssignmentIndentation:
-  Exclude:
-    - 'lib/metanorma/plugin/lutaml/base_preprocessor.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLines:
-  Exclude:
-    - 'spec/regen_expected.rb'
-
-# Offense count: 12
+# Offense count: 14
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
     - 'Rakefile'
-    - 'lib/metanorma/plugin/lutaml/base_preprocessor.rb'
-    - 'lib/metanorma/plugin/lutaml/lutaml_ea_xmi_base.rb'
     - 'lib/metanorma/plugin/lutaml/utils.rb'
+    - 'spec/metanorma/plugin/lutaml/express_remarks_decorator_spec.rb'
+    - 'spec/metanorma/plugin/lutaml/lutaml_text_preprocessor_spec.rb'
     - 'spec/metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor_spec.rb'
     - 'spec/metanorma/plugin/lutaml/lutaml_xsd_preprocessor_spec.rb'
-    - 'spec/regen_expected.rb'
-    - 'spec/regen_expected_spec.rb'
+    - 'spec/metanorma/plugin/lutaml/macros_data2text_spec.rb'
+    - 'spec/metanorma/plugin/lutaml/macros_json2text_spec.rb'
+    - 'spec/metanorma/plugin/lutaml/macros_yaml2text_spec.rb'
+    - 'spec/metanorma/plugin/lutaml/source_extractor_spec.rb'
     - 'spec/support/shared_examples/structured_data_2_text_preprocessor.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingEmptyLines:
-  Exclude:
-    - 'Gemfile'
-    - 'spec/regen_expected.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'lib/metanorma/plugin/lutaml/base_preprocessor.rb'
-    - 'spec/regen_expected.rb'
-    - 'spec/regen_expected_spec.rb'
-
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
     - 'lib/metanorma/plugin/lutaml/lutaml_xsd_preprocessor.rb'
     - 'lib/metanorma/plugin/lutaml/utils.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
-    - 'lib/metanorma/plugin/lutaml/lutaml_ea_xmi_base.rb'
     - 'lib/metanorma/plugin/lutaml/utils.rb'
 
 # Offense count: 7
@@ -87,11 +42,10 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Max: 19
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
-    - 'lib/metanorma/plugin/lutaml/lutaml_ea_xmi_base.rb'
     - 'lib/metanorma/plugin/lutaml/utils.rb'
 
 # Offense count: 1
@@ -127,16 +81,10 @@ RSpec/ContextWording:
     - 'spec/metanorma/plugin/lutaml/macros_data2text_spec.rb'
     - 'spec/support/shared_examples/structured_data_2_text_preprocessor.rb'
 
-# Offense count: 1
-# Configuration parameters: IgnoredMetadata.
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/regen_expected_spec.rb'
-
-# Offense count: 40
+# Offense count: 44
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 38
+  Max: 26
 
 # Offense count: 13
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
@@ -161,7 +109,7 @@ RSpec/LeakyLocalVariable:
     - 'spec/metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor_spec.rb'
     - 'spec/metanorma/plugin/lutaml/lutaml_xmi_index_spec.rb'
 
-# Offense count: 16
+# Offense count: 21
 RSpec/MultipleExpectations:
   Max: 6
 
@@ -188,17 +136,6 @@ RSpec/NamedSubject:
 RSpec/NestedGroups:
   Max: 7
 
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/Output:
-  Exclude:
-    - 'spec/regen_expected.rb'
-
-# Offense count: 1
-RSpec/PendingWithoutReason:
-  Exclude:
-    - 'spec/metanorma/plugin/lutaml/lutaml_text_preprocessor_spec.rb'
-
 # Offense count: 2
 RSpec/RepeatedExampleGroupBody:
   Exclude:
@@ -220,19 +157,3 @@ RSpec/SpecFilePathFormat:
 RSpec/SubjectDeclaration:
   Exclude:
     - 'spec/metanorma/plugin/lutaml/config/root_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'metanorma-plugin-lutaml.gemspec'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Exclude:
-    - 'spec/metanorma/plugin/lutaml/lutaml_xsd_preprocessor_spec.rb'

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "metanorma/plugin/lutaml"
+require_relative "../lib/metanorma-plugin-lutaml"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      module Asciidoctor
+        autoload :PreprocessorNoIfdefsReader,
+                 "metanorma/plugin/lutaml/asciidoctor/preprocessor"
+      end
+    end
+  end
+end

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

@@ -3,8 +3,6 @@
 require "liquid"
 require "asciidoctor"
 require "asciidoctor/reader"
-require "metanorma/plugin/lutaml/utils"
-require "metanorma/plugin/lutaml/asciidoctor/preprocessor"
 
 module Metanorma
   module Plugin
@@ -173,7 +171,7 @@ module Metanorma
             )
             parsed_template.assigns["schemas_order"] =
               options["selected_schemas"]
-            parsed_template.render
+            parsed_template.render.split("\n", -1)
           end.flatten
         rescue StandardError => e
           ::Metanorma::Util.log(

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

@@ -3,9 +3,6 @@
 require "liquid"
 require "asciidoctor"
 require "asciidoctor/reader"
-require_relative "source_extractor"
-require_relative "utils"
-require "metanorma/plugin/lutaml/asciidoctor/preprocessor"
 
 module Metanorma
   module Plugin

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      class CacheStore
+        def initialize(max_size: 50)
+          @store = {}
+          @max_size = max_size
+          @mutex = Mutex.new
+        end
+
+        def fetch(key)
+          @mutex.synchronize { @store[key] }
+        end
+
+        def store(key, value)
+          @mutex.synchronize do
+            evict! if @store.size >= @max_size
+            @store[key] = value
+          end
+        end
+
+        def fetch_or_store(key)
+          @mutex.synchronize do
+            if @store.key?(key)
+              @store[key]
+            else
+              evict! if @store.size >= @max_size
+              @store[key] = yield
+            end
+          end
+        end
+
+        def clear
+          @mutex.synchronize { @store.clear }
+        end
+
+        def size
+          @mutex.synchronize { @store.size }
+        end
+
+        private
+
+        def evict!
+          @store.shift
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,14 @@ module Metanorma
             map "skip_tables", to: :skip_tables
             map "render_entities", to: :render_entities
           end
+
+          def collection_for(key)
+            case key
+            when "render_entities" then render_entities
+            when "skip_tables" then skip_tables
+            else raise ArgumentError, "Unknown collection key: #{key}"
+            end
+          end
         end
       end
     end

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

@@ -3,16 +3,17 @@
 require "yaml"
 require "lutaml"
 require "lutaml/model"
-require_relative "config/package"
-require_relative "config/root"
-require_relative "config/guidance_attribute"
-require_relative "config/guidance_klass"
-require_relative "config/guidance"
 
 module Metanorma
   module Plugin
     module Lutaml
       module Config
+        autoload :Guidance, "metanorma/plugin/lutaml/config/guidance"
+        autoload :GuidanceAttribute,
+                 "metanorma/plugin/lutaml/config/guidance_attribute"
+        autoload :GuidanceKlass, "metanorma/plugin/lutaml/config/guidance_klass"
+        autoload :Package, "metanorma/plugin/lutaml/config/package"
+        autoload :Root, "metanorma/plugin/lutaml/config/root"
       end
     end
   end

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

@@ -2,8 +2,6 @@
 
 require "json"
 require "yaml"
-require_relative "file_not_found_error"
-require_relative "parse_error"
 
 module Metanorma
   module Plugin

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "content"
-require_relative "base_structured_text_preprocessor"
-
 module Metanorma
   module Plugin
     module Lutaml

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

@@ -55,13 +55,7 @@ module Metanorma
 
         def prefix_relative_paths(line, path_prefix)
           line.gsub(RELATIVE_PREFIX_MACRO_REGEXP) do |_match|
-            prefixed_path = File.join(path_prefix, $3.strip)
-            # Transform relative path (../path/to/file) into the absolute path
-            # because `image::` macro wont understand it other way
-            if prefixed_path.start_with?("../")
-              prefixed_path = File.absolute_path(prefixed_path)
-            end
-            full_path = File.expand_path(prefixed_path)
+            full_path = File.expand_path(File.join(path_prefix, $3.strip))
             "#{$1}#{$2}#{full_path}#{$4}"
           end
         end

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "content"
-require_relative "base_structured_text_preprocessor"
-
 module Metanorma
   module Plugin
     module Lutaml

data/lib/metanorma/plugin/lutaml/liquid/custom_blocks.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      module Liquid
+        module CustomBlocks
+        end
+      end
+    end
+  end
+end
+
+require_relative "custom_blocks/key_iterator"

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

@@ -1,4 +1,4 @@
-require_relative "../../content"
+# frozen_string_literal: true
 
 module Metanorma
   module Plugin

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      module Liquid
+        module CustomFilters
+        end
+      end
+    end
+  end
+end
+
+require_relative "custom_filters/html2adoc"
+require_relative "custom_filters/values"
+require_relative "custom_filters/replace_regex"
+require_relative "custom_filters/loadfile"
+require_relative "custom_filters/file_exist"

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      module Liquid
+        autoload :CustomBlocks, "metanorma/plugin/lutaml/liquid/custom_blocks"
+        autoload :CustomFilters, "metanorma/plugin/lutaml/liquid/custom_filters"
+        autoload :LocalFileSystem,
+                 "metanorma/plugin/lutaml/liquid/multiply_local_file_system"
+      end
+    end
+  end
+end

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

@@ -6,7 +6,6 @@ require "asciidoctor/reader"
 require "lutaml"
 require "lutaml/uml"
 require "lutaml/formatter"
-require "metanorma/plugin/lutaml/utils"
 
 module Metanorma
   module Plugin
@@ -33,7 +32,7 @@ module Metanorma
         def abort(parent, reader, attrs, msg)
           warn(msg)
           attrs["language"] = "lutaml"
-          source = reader.respond_to?(:source) ? reader.source : reader
+          source = reader.is_a?(::Asciidoctor::Reader) ? reader.source : reader
           create_listing_block(
             parent,
             source,

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "metanorma/plugin/lutaml/lutaml_diagram_base"
-
 module Metanorma
   module Plugin
     module Lutaml

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "metanorma/plugin/lutaml/lutaml_diagram_base"
-
 module Metanorma
   module Plugin
     module Lutaml

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "metanorma/plugin/lutaml/lutaml_diagram_base"
-
 module Metanorma
   module Plugin
     module Lutaml