From 67f085cfe0fe1d62243e3cf0f85ecafb35a27d01 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Thu, 7 May 2026 01:37:02 +1000 Subject: [PATCH 1/3] rspec --- Gemfile.devel | 10 +++++++--- spec/metanorma/validate_spec.rb | 22 ---------------------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Gemfile.devel b/Gemfile.devel index 833866d..9613c2d 100644 --- a/Gemfile.devel +++ b/Gemfile.devel @@ -1,4 +1,8 @@ -gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main" -gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "main" +gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/lutaml-model-0.8.0" +gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "fix/lutaml-model-0.8.0" +gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "fix/lutaml-model-0.8.0" gem "metanorma-core", git: "https://github.com/metanorma/metanorma-core", branch: "main" -gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "main" +gem "metanorma-plugin-lutaml", git: "https://github.com/metanorma/metanorma-plugin-lutaml", branch: "fix/ruby-4.0" +gem "metanorma", git: "https://github.com/metanorma/metanorma", branch: "rt-lutaml-080" + + diff --git a/spec/metanorma/validate_spec.rb b/spec/metanorma/validate_spec.rb index ad046f2..b999d15 100644 --- a/spec/metanorma/validate_spec.rb +++ b/spec/metanorma/validate_spec.rb @@ -1,28 +1,6 @@ require "spec_helper" -require "metanorma" RSpec.describe Metanorma::Generic do - context "when xref_error.adoc compilation" do - around do |example| - FileUtils.rm_f "spec/assets/xref_error.err.html" - example.run - Dir["spec/assets/xref_error*"].each do |file| - next if file.match?(/adoc$/) - - FileUtils.rm_f(file) - end - end - - it "generates error file" do - expect do - Metanorma::Compile - .new - .compile("spec/assets/xref_error.adoc", type: "generic", "agree-to-terms": true) - end.to(change { File.exist?("spec/assets/xref_error.err.html") } - .from(false).to(true)) - end - end - it "does not issue doctype warning if doctype not supplied" do Metanorma::Generic.configure do |config| config.default_doctype = "pizza" From f84252cfcf96a7a84511f330f2e7ecae6e621c05 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Thu, 7 May 2026 01:38:22 +1000 Subject: [PATCH 2/3] revert gemfile --- Gemfile.devel | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile.devel b/Gemfile.devel index 9613c2d..2621372 100644 --- a/Gemfile.devel +++ b/Gemfile.devel @@ -1,8 +1,7 @@ -gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/lutaml-model-0.8.0" -gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "fix/lutaml-model-0.8.0" -gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "fix/lutaml-model-0.8.0" +gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main" +gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "main" +gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "main" gem "metanorma-core", git: "https://github.com/metanorma/metanorma-core", branch: "main" -gem "metanorma-plugin-lutaml", git: "https://github.com/metanorma/metanorma-plugin-lutaml", branch: "fix/ruby-4.0" -gem "metanorma", git: "https://github.com/metanorma/metanorma", branch: "rt-lutaml-080" +gem "metanorma-plugin-lutaml", git: "https://github.com/metanorma/metanorma-plugin-lutaml", branch: "main" From 21d8fd3133d6c79fa238391e0eb1076ed3b12e2d Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Thu, 7 May 2026 01:46:05 +1000 Subject: [PATCH 3/3] updates: https://github.com/metanorma/isodoc/issues/790 --- Gemfile.devel | 8 ++++---- lib/metanorma/generic/bibdata_config.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.devel b/Gemfile.devel index 2621372..7a6d345 100644 --- a/Gemfile.devel +++ b/Gemfile.devel @@ -1,7 +1,7 @@ -gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main" -gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "main" -gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "main" +gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/lutaml-model-0.8.0" +gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "fix/lutaml-model-0.8.0" +gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "fix/lutaml-model-0.8.0" gem "metanorma-core", git: "https://github.com/metanorma/metanorma-core", branch: "main" -gem "metanorma-plugin-lutaml", git: "https://github.com/metanorma/metanorma-plugin-lutaml", branch: "main" +gem "metanorma-plugin-lutaml", git: "https://github.com/metanorma/metanorma-plugin-lutaml", branch: "fix/ruby-4.0" diff --git a/lib/metanorma/generic/bibdata_config.rb b/lib/metanorma/generic/bibdata_config.rb index 4d43c8b..708627e 100644 --- a/lib/metanorma/generic/bibdata_config.rb +++ b/lib/metanorma/generic/bibdata_config.rb @@ -17,7 +17,7 @@ class Bibdata < ::Lutaml::Model::Serializable def bibdata_from_xml(model, node) node or return - model.bibdata = Relaton::Cli.parse_xml(node.adapter_node) + model.bibdata = Relaton::Cli.parse_xml(node.adapter_node.native) end def bibdata_to_xml(model, parent, doc); end