metanorma-generic 3.3.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ec74d798c9587dc416bc7b55a0cd6881b63a92baa00d1622ef9e0b1a7dec4b
-  data.tar.gz: d273177d7958183f00d910cc2d7335184bb55e2f9be12128fa82151c7a5d3736
+  metadata.gz: 6000d91122bed81dc0d79c81fc4b3bbb3a84e6f164aedcdfff5c997aabf14b2c
+  data.tar.gz: 1667842e29d745ac3ca391e7d0b41422d688d6b2195707bdbc9ab200bc3fe43e
 SHA512:
-  metadata.gz: 8eb5507c253a60dbe078ae2631c6075147b0fbb00103e665202e5ad51fcc1d76f0f6c226f0f82d3d6879100a30855075cd314aaee239dbeb3713feeb574b8b9c
-  data.tar.gz: 8726ab262692ed85cc2ba26bff3f7104ef416cfa4f82f2a3ce195ce08c7fc789735f750f078be1ede1808931d0c7bc2b4df44c80ca4b303920f9176acfaa181e
+  metadata.gz: 2294d7023864c81c3847f1ecffe99133caf10152676912926c1d2a48efe39f21d3160f02d2ff116fe4bf75323db6a783cd6a20f160eacee4137addc132b56281
+  data.tar.gz: 6094641c6e7628b00a66b36ccf16c51ed09fd4875e2a10d46778515f538dc1915edfd4d9140e3124ddd2e7504c3817b6179f00f68389571609286078f878da66

data/.rubocop.yml

@@ -1,10 +1,10 @@
 # Auto-generated by Cimas: Do not edit it manually!
 # See https://github.com/metanorma/cimas
 inherit_from:
-  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
 # local repo-specific modifications
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.4

data/lib/metanorma/generic/bibdata_config.rb

@@ -1,3 +1,5 @@
+require "relaton-cli"
+
 module Metanorma
   module Generic
     class BibdataConfig < ::Lutaml::Model::Serializable
@@ -15,7 +17,7 @@ module Metanorma
 
       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

data/lib/metanorma/generic/cleanup.rb

@@ -15,18 +15,47 @@ module Metanorma
         Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
           conv.meta.set(a, configuration.send(a))
         end
-        # conv.meta.set(:bibdata, bibdata_hash(xmldoc))
+        conv.meta.set(:bibdata, bibdata_hash(xmldoc))
         @isodoc = conv
         @isodoc
       end
 
       def bibdata_hash(xmldoc)
-        b = xmldoc.at("//bibdata") || xmldoc.at("//xmlns:bibdata")
-        bib = BibdataConfig.from_xml("<metanorma>#{b.to_xml}</metanorma>").bibdata
+        b = xmldoc.at("//bibdata") || xmldoc.at("//xmlns:bibdata") or return nil
+        stripped = Nokogiri::XML(b.to_xml)
+        stripped.remove_namespaces!
+        # Drop @boilerplate="true" docidentifiers before handing the
+        # bibdata to Relaton::Cli.parse_xml: their content is an
+        # unresolved Liquid template, and recent relaton-iho /
+        # relaton-cc / etc. eagerly call pubid in their docidentifier
+        # content= setter, which crashes on raw Liquid syntax. The
+        # template variables for substitution come from other bibdata
+        # fields (seriesabbr, docnumeric, …), not from the
+        # docidentifier itself, so dropping it here does not affect
+        # what we feed back into isodoc.meta. Substitution still runs
+        # on the original xmldoc via standoc's
+        # docidentifier_boilerplate_isodoc; afterwards
+        # refresh_isodoc_bibdata re-calls bibdata_hash to seed
+        # isodoc.meta with the resolved docidentifier.
+        # See https://github.com/metanorma/metanorma/issues/558.
+        stripped.xpath("//docidentifier[@boilerplate = 'true']").each(&:remove)
+        bib = BibdataConfig.from_xml(
+          "<metanorma>#{stripped.root.to_xml}</metanorma>",
+        ).bibdata or return nil
         YAML.safe_load(bib.to_yaml, permitted_classes: [Date, Symbol],
                                     symbolize_names: true)
       end
 
+      # Override standoc's hook: in addition to re-running
+      # isodoc_bibdata_parse, refresh conv.meta[:bibdata] with the
+      # bibdata_hash now that docidentifiers have been substituted, so
+      # downstream consumers (boilerplate Liquid expansion, coverpage
+      # interpolation, etc.) see the resolved values.
+      def refresh_isodoc_bibdata(xmldoc, conv)
+        super
+        conv.meta.set(:bibdata, bibdata_hash(xmldoc))
+      end
+
       def boilerplate_file(xmldoc)
         f = configuration.boilerplate
         f.nil? and return super

data/lib/metanorma/generic/converter.rb

@@ -3,7 +3,7 @@ require "metanorma-standoc"
 require "fileutils"
 require_relative "front"
 require_relative "bibdata_config"
-require "metanorma"
+require "metanorma-core"
 require "pathname"
 
 module Metanorma

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.3.3".freeze
+    VERSION = "3.4.0".freeze
   end
 end

data/lib/metanorma-generic.rb

@@ -4,7 +4,7 @@ require "metanorma/generic/converter"
 require "metanorma/generic/validate"
 require "metanorma/generic/cleanup"
 require "isodoc/generic"
-require "metanorma"
+require "metanorma-core"
 
 if defined? Metanorma::Registry
   Metanorma::Registry.instance.register(Metanorma::Generic::Processor)

data/metanorma-generic.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 3.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.4.2"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -36,9 +36,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"
-spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "canon", "= 0.1.3"
+  spec.add_development_dependency "canon"#, "= 0.2.3"
+  spec.add_development_dependency "metanorma"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-13 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +182,30 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: metanorma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.