metanorma-plugin-lutaml 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 701c14675ce78bd6ddc3f3302679709c852e5572da0779c8f26964c6cac866a3
-  data.tar.gz: 43d6abe93a90748e2b7a6163d396a43d1f09a8a36f8d0d2e43be34c7492a8daa
+  metadata.gz: '0847dcf75a0aa3da0e2179e5575757a140c29caa3d22d3b50cfe5ad04b1327d9'
+  data.tar.gz: 11c1e30bf0cbd74d10e6bd2cabb791f11508822baeb56c47622582580b855c35
 SHA512:
-  metadata.gz: 5d45281405302619caf401c6f319c4a217c30c34826e466ef874e661b3cfa3c11c9fa2691638de4590d22c68491bbc70abebea078135706d8cfcca86ec927d1f
-  data.tar.gz: 84b31a07da65105d1640613359e24ba60921c4c8c4ecc467cbdd200fee817a5e009b21d0533e90897151ddf260a6c2c48b68006818e5606e633a64197a2ec0bf
+  metadata.gz: f294b6e637b837af3a23939e0c152534bc7a86d7633399855c7e7b9a2373189ab60e9c3076e5fa7e1f1a975374e87413ada116aaed2a18c7be7027550d0b42fe
+  data.tar.gz: f418ee4fa767ddfac9e6d9f670cac031a6b86f781ee64717bbf5566b65784392450c038f220b321b22144c6b93cbc8deee57d73bcb3ca2b9ec9bd00b027a127f

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

@@ -48,7 +48,7 @@ module Metanorma
             # When we are dealing with a relative path of a template:
             # ../path/to/file we need to transform it into
             # the absolute one because `image::` macro wont understand it other way
-            prefixed_path = File.absolute_path(prefixed_path) if prefixed_path.start_with?('../')
+            prefixed_path = File.absolute_path(prefixed_path) if prefixed_path.start_with?("../")
             full_path = File.expand_path(prefixed_path)
             "#{$1}#{$2}#{full_path}#{$4}"
           end

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

@@ -1,4 +1,5 @@
-require "reverse_adoc"
+require "coradoc"
+require "coradoc/reverse_adoc"
 
 module Metanorma
   module Plugin
@@ -6,7 +7,7 @@ module Metanorma
       module Liquid
         module CustomFilters
           def html2adoc(input)
-            ReverseAdoc.convert(input)
+            Coradoc::ReverseAdoc.convert(input)
           end
 
           def interpolate(input)
@@ -15,7 +16,7 @@ module Metanorma
           end
 
           def identify(input)
-            input.split(/(?=[A-Z])/).map(&:downcase).join('-')
+            input.split(/(?=[A-Z])/).map(&:downcase).join("-")
           end
         end
       end

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

@@ -22,7 +22,8 @@ module Metanorma
 
           def full_path(template_path)
             unless %r{\A[^./][a-zA-Z0-9_/]+\z}.match?(template_path)
-              raise ::Liquid::FileSystemError, "Illegal template name '#{template_path}'"
+              raise ::Liquid::FileSystemError,
+                    "Illegal template name '#{template_path}'"
             end
 
             result_path = if template_path.include?('/')
@@ -46,11 +47,15 @@ module Metanorma
             end
 
             if result_path.nil?
-              raise ::Liquid::FileSystemError, "No documents in template path '#{File.expand_path(template_path)}'"
+              raise ::Liquid::FileSystemError,
+                    "No documents in template path '#{File.expand_path(template_path)}'"
             end
 
-            unless roots.any? { |root| File.expand_path(result_path).start_with?(File.expand_path(root)) }
-              raise ::Liquid::FileSystemError, "Illegal template path '#{File.expand_path(result_path)}'"
+            unless roots.any? do |root|
+                     File.expand_path(result_path).start_with?(File.expand_path(root))
+                   end
+              raise ::Liquid::FileSystemError,
+                    "Illegal template path '#{File.expand_path(result_path)}'"
             end
 
             result_path

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

@@ -16,14 +16,15 @@ module Metanorma
         REMARKS_ATTRIBUTE = "remarks"
 
         def process(document, reader)
-          r = Asciidoctor::PreprocessorNoIfdefsReader.new(document, reader.lines)
+          r = Asciidoctor::PreprocessorNoIfdefsReader.new(document,
+                                                          reader.lines)
           input_lines = r.readlines.to_enum
 
           has_lutaml = input_lines.any? { |line| lutaml?(line) }
 
           express_indexes = Utils.parse_document_express_indexes(
             document,
-            input_lines
+            input_lines,
           )
 
           result_content = process_input_lines(
@@ -53,18 +54,18 @@ module Metanorma
           ::Lutaml::Parser.parse(
             File.new(
               Utils.relative_file_path(document, file_path),
-              encoding: "UTF-8"
-            )
+              encoding: "UTF-8",
+            ),
           )
         end
 
         private
 
         def process_input_lines(
-            document:,
+          document:,
             input_lines:,
             express_indexes:
-          )
+        )
 
           result = []
           loop do
@@ -73,7 +74,7 @@ module Metanorma
                 document,
                 input_lines,
                 express_indexes,
-              )
+              ),
             )
           end
           result
@@ -99,7 +100,7 @@ module Metanorma
             index_names: index_names,
             context_name: context_name,
             options: options,
-            indexes: express_indexes
+            indexes: express_indexes,
           )
         end
 
@@ -120,23 +121,23 @@ module Metanorma
 
             # Does this condition ever happen? That is only if the
             # `lutaml-express-index` condition is not set
-            unless indexes[path]
+            if indexes[path]
+              indexes[path][:serialized_hash] ||= indexes[path][:wrapper].to_liquid
+            else
 
               full_path = Utils.relative_file_path(document, path)
               unless File.file?(full_path)
                 raise StandardError.new(
                   "Unable to load EXPRESS index for `#{path}`, " \
                   "please define it at `:lutaml-express-index:` or specify " \
-                  "the full path."
+                  "the full path.",
                 )
               end
               wrapper = load_lutaml_file(document, path)
               indexes[path] = {
                 wrapper: wrapper,
-                serialized_hash: wrapper.to_liquid
+                serialized_hash: wrapper.to_liquid,
               }
-            else
-              indexes[path][:serialized_hash] ||= indexes[path][:wrapper].to_liquid
             end
 
             indexes[path]
@@ -148,7 +149,7 @@ module Metanorma
 
           relative_file_path = Utils.relative_file_path(document, file_path)
           config_yaml = YAML.safe_load(
-            File.read(relative_file_path, encoding: "UTF-8")
+            File.read(relative_file_path, encoding: "UTF-8"),
           )
 
           options = {}
@@ -156,7 +157,7 @@ module Metanorma
             unless config_yaml["schemas"].is_a?(Hash)
               raise StandardError.new(
                 "[lutaml_express] attribute `config_yaml` must point to a YAML " \
-                "file that has the `schema` key containing a hash."
+                "file that has the `schema` key containing a hash.",
               )
             end
 
@@ -186,8 +187,9 @@ module Metanorma
             schema,
             options.merge(
               "relative_path_prefix" =>
-                Utils.relative_file_path(document, File.dirname(schema["file"]))
-            )
+                Utils.relative_file_path(document,
+                                         File.dirname(schema["file"])),
+            ),
           ) || {}
         end
 
@@ -200,7 +202,7 @@ module Metanorma
           gather_context_items(
             index_names: index_names,
             document: document,
-            indexes: indexes
+            indexes: indexes,
           ).map do |items|
 
             serialized_hash = items[:serialized_hash]
@@ -223,7 +225,7 @@ module Metanorma
               document: document,
               block_lines: lines,
               context_items: serialized_hash,
-              context_name: context_name
+              context_name: context_name,
             )
           end.flatten
         rescue StandardError => e
@@ -246,8 +248,8 @@ module Metanorma
               key,
               val&.map do |remark|
                 Metanorma::Plugin::Lutaml::ExpressRemarksDecorator
-                  .call(remark, options)
-              end
+                    .call(remark, options)
+              end,
             ]
           end
 

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

@@ -9,7 +9,7 @@ module Metanorma
       #  @example [lutaml_uml_attributes_table,path/to/lutaml,EntityName]
       class LutamlUmlAttributesTablePreprocessor < LutamlUmlClassPreprocessor
         MACRO_REGEXP =
-          /\[lutaml_uml_attributes_table,([^,]+),?([^,]+),?(.+?)?\]/
+          /\[lutaml_uml_attributes_table,([^,]+),?([^,]+),?(.+?)?\]/.freeze
 
         # rubocop:disable Layout/IndentHeredoc
         def template(options)

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

@@ -15,7 +15,7 @@ module Metanorma
       #  @example [lutaml_uml_class,path/to/lutaml,EntityName]
       class LutamlUmlClassPreprocessor < ::Asciidoctor::Extensions::Preprocessor
         MACRO_REGEXP =
-          /\[lutaml_uml_class,([^,]+),?([^,]+),?(.+?)?\]/
+          /\[lutaml_uml_class,([^,]+),?([^,]+),?(.+?)?\]/.freeze
 
         def get_macro_regexp
           self.class.const_get(:MACRO_REGEXP)
@@ -109,9 +109,9 @@ module Metanorma
 
           <<~TEMPLATE
             {% if definition.keyword == 'enumeration' %}
-            #{equalsigns(depth) + ' Enumeration: {{ definition.name }}' unless skip_headers}
+            #{"#{equalsigns(depth)} Enumeration: {{ definition.name }}" unless skip_headers}
             {% else %}
-            #{equalsigns(depth) + ' Class: {{ definition.name }}' unless skip_headers}
+            #{"#{equalsigns(depth)} Class: {{ definition.name }}" unless skip_headers}
             {% endif %}
 
             #{equalsigns(depth + 1)} Description

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

@@ -16,7 +16,7 @@ module Metanorma
       class LutamlUmlDatamodelDescriptionPreprocessor <
           ::Asciidoctor::Extensions::Preprocessor
         MACRO_REGEXP =
-          /\[lutaml_uml_datamodel_description,([^,]+),?(.+)?\]/
+          /\[lutaml_uml_datamodel_description,([^,]+),?(.+)?\]/.freeze
         LIQUID_INCLUDE_PATH = File.join(
           Gem.loaded_specs["metanorma-plugin-lutaml"].full_gem_path,
           "lib", "metanorma", "plugin", "lutaml", "liquid_templates"

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

@@ -31,7 +31,7 @@ module Metanorma
           # Allow includes for the template
           include_paths = [
             Utils.relative_file_path(document, ""),
-            include_path
+            include_path,
           ].compact
 
           liquid_template.registers[:file_system] =
@@ -72,12 +72,11 @@ module Metanorma
             save_express_repo_to_cache(
               cache_full_path,
               lutaml_wrapper.original_document,
-              document
+              document,
             )
           end
 
           lutaml_wrapper
-
         rescue Expressir::Error
           FileUtils.rm_rf(cache_full_path)
 
@@ -85,9 +84,8 @@ module Metanorma
             path: path,
             cache_path: cache_path,
             document: document,
-            force_read: true
+            force_read: true,
           )
-
         rescue StandardError => e
           document.logger.warn("Failed to load #{full_path}: #{e.message}")
           raise e
@@ -121,26 +119,21 @@ module Metanorma
         end
 
         # TODO: Refactor this using Suma::SchemaConfig
-        def load_express_from_index(document, path)
+        def load_express_from_index(_document, path)
           yaml_content = YAML.safe_load(File.read(path))
           schema_yaml_base_path = Pathname.new(File.dirname(path))
 
           # If there is a global root path set, all subsequent paths are
           # relative to it.
-          if yaml_content['path']
-            root_schema_path = Pathname.new(yaml_content['path'])
+          if yaml_content["path"]
+            root_schema_path = Pathname.new(yaml_content["path"])
             schema_yaml_base_path = schema_yaml_base_path + root_schema_path
           end
 
           files_to_load = yaml_content["schemas"].map do |key, value|
-
             # If there is no path: set for a schema, we assume it uses the
             # schema name as the #{filename}.exp.
-            schema_path = if value['path']
-              Pathname.new(value['path'])
-            else
-              Pathname.new("#{key}.exp")
-            end
+            schema_path = Pathname.new(value["path"] || "#{key}.exp")
 
             real_schema_path = schema_yaml_base_path + schema_path
             File.new(real_schema_path.cleanpath.to_s, encoding: "UTF-8")
@@ -171,13 +164,13 @@ module Metanorma
             lutaml_expressir_wrapper = load_express_repositories(
               path: path,
               cache_path: cache,
-              document: document
+              document: document,
             )
 
             if lutaml_expressir_wrapper
               express_indexes[name] = {
                 wrapper: lutaml_expressir_wrapper,
-                serialized_hash: nil
+                serialized_hash: nil,
               }
             end
           end

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

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

data/metanorma-plugin-lutaml.gemspec

@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "asciidoctor"
+  spec.add_dependency "coradoc"
   spec.add_dependency "expressir", "~> 1.4.0"
   spec.add_dependency "liquid"
   spec.add_dependency "lutaml"
   spec.add_dependency "relaton-cli"
-  spec.add_dependency "reverse_adoc", "~> 0.3.7"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coradoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: expressir
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: reverse_adoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement