metanorma-plugin-lutaml 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e52ac2333cb4e251e5d531e8909d1a763a6f05960ad886136741676639235e44
-  data.tar.gz: 7f3e2daffb58c5074928121da9f4951f85a704e1cb8d8e666e5cfcfcdff90e7c
+  metadata.gz: 701c14675ce78bd6ddc3f3302679709c852e5572da0779c8f26964c6cac866a3
+  data.tar.gz: 43d6abe93a90748e2b7a6163d396a43d1f09a8a36f8d0d2e43be34c7492a8daa
 SHA512:
-  metadata.gz: bc3b7a23fef7ba9b8b7537ea94d5b28c548b0f55409e4dbf6e8cac0d35742d2126d4831a9bc1747647ac5d9e3c3f4f1ed3d4b00eb0ffeeae0251b65d6301833e
-  data.tar.gz: e56cad378a1131c70ebc0a47e2d44cbdba2fda3bc4a56f866a4a3e3b45268eeb02fa859e02d48904a8b4b90fe0699fc99c607853e9509b41221953917ed2a0f0
+  metadata.gz: 5d45281405302619caf401c6f319c4a217c30c34826e466ef874e661b3cfa3c11c9fa2691638de4590d22c68491bbc70abebea078135706d8cfcca86ec927d1f
+  data.tar.gz: 84b31a07da65105d1640613359e24ba60921c4c8c4ecc467cbdd200fee817a5e009b21d0533e90897151ddf260a6c2c48b68006818e5606e633a64197a2ec0bf

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

@@ -67,7 +67,7 @@ module Metanorma
               entity_name = match[2]
               options = parse_options_to_hash(match[3])
 
-              result.push(*parse_marco(lutaml_path, entity_name, document,
+              result.push(*parse_macro(lutaml_path, entity_name, document,
                                        options))
             else
               result.push(line)
@@ -75,7 +75,7 @@ module Metanorma
           end
         end
 
-        def parse_marco(lutaml_path, entity_name, document, options)
+        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"]]

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

@@ -120,18 +120,30 @@ module Metanorma
           ::Lutaml::Parser.parse(files)
         end
 
+        # TODO: Refactor this using Suma::SchemaConfig
         def load_express_from_index(document, path)
           yaml_content = YAML.safe_load(File.read(path))
-          root_path = yaml_content["path"]
-          schemas_paths = yaml_content["schemas"]
-            .map do |(schema_name, schema_values)|
-            schema_values["path"] || File.join(root_path.to_s,
-                                               "#{schema_name}.exp")
+          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'])
+            schema_yaml_base_path = schema_yaml_base_path + root_schema_path
           end
 
-          files_to_load = schemas_paths.map do |path|
-            File.new(Utils.relative_file_path(document, path),
-                     encoding: "UTF-8")
+          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
+
+            real_schema_path = schema_yaml_base_path + schema_path
+            File.new(real_schema_path.cleanpath.to_s, encoding: "UTF-8")
           end
 
           ::Lutaml::Parser.parse(files_to_load)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor