metanorma-generic 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed01524e23a3a084bd1aa2aeb545c721d5d083548699e09b3529e1c40dcb6432
-  data.tar.gz: af9f237dde23eee11c874cf136946dc359375fe06671f750750e2de8c99a1623
+  metadata.gz: 6000d91122bed81dc0d79c81fc4b3bbb3a84e6f164aedcdfff5c997aabf14b2c
+  data.tar.gz: 1667842e29d745ac3ca391e7d0b41422d688d6b2195707bdbc9ab200bc3fe43e
 SHA512:
-  metadata.gz: 409b1d2362e0cc6cc6b85e2054d11a8c420e4b19fd0c2cd17a42dad01d065dcb4a7613eac9aa1d44684e49aa8f2bdebea42eaa300404518bbf8aeb01c106d316
-  data.tar.gz: e639dcacf43f6ed51102ff81475c59b8e5f3f477cc4c91bc5600f88404f21974979ce8650aec181dfc2fb41620137e8cf66ed342474ab530db13c35cc6ac90f5
+  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

@@ -17,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

@@ -24,6 +24,21 @@ module Metanorma
         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
@@ -31,6 +46,16 @@ module Metanorma
                                     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/version.rb

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

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"
@@ -40,6 +40,6 @@ Gem::Specification.new do |spec|
   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"
+  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.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-27 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