metanorma 2.3.6 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eef0412dfe852af4d9501f0728dbd623eecaf6e34be11e260c3e39d56b1cc38
-  data.tar.gz: d056fba553e88322f4ba3e7b26f79b7a1b0742baa69b1df2e214304c44f10f54
+  metadata.gz: 1fe5c7a031f978aaa36771f2174a8d972d7effc8292d52365065fa0c5c23ba49
+  data.tar.gz: 0ec95b729ba94e8836641423adba30c308859b50e112f1796480b566063eae3c
 SHA512:
-  metadata.gz: ffe39fe5dcc28776e081ec29f2a95db589483a84aa05cd9f5e97753151c036c9952d1f9b4feb160022f9849f6b71fdfb3d82ad4837e424514480d0664d6a1a3a
-  data.tar.gz: 60ed129530b14a6cc95d833ed35e981e0fc119a34db65f643bb74e65bbde2b59d4da3ac51173d259f83c7f20c6920a81be7472da8194f9f73e4266af4e076ee2
+  metadata.gz: f32e75c81c4faa7c73954eee1442a7603541a927b7d17272ab733b3b5be4f9e643125c8ebbb3da552c5cacf5aa57acd19db138e37fb97cc4ea2fe7d4255ee7da
+  data.tar.gz: 38e96e9c3595fbe970c8844711fd37c860ea47484a6b4767c0d841eae630e63573576335c248def2693b1910bdcb3e863a13e0aca72676b92df66d68fac4c6b8

data/lib/metanorma/collection/document/document.rb

@@ -49,45 +49,47 @@ module Metanorma
         private
 
         # Select the appropriate Relaton parser class for the given flavor tag.
+        # Uses the flavor's Item class (not Bibdata) because in Relaton 2.x,
+        # Bibdata.from_xml produces a generic Relaton::Bib::ItemData instance
+        # (due to BibdataShared resolving `model ItemData` in the definer's scope),
+        # while Item.from_xml correctly produces a flavor-specific ItemData instance.
         # @param tag [String, nil] flavor tag (e.g. "iso", "ietf")
-        # @param bibdata [Boolean] true when parsing a <bibdata> element (has <ext>);
-        #   false when parsing a <bibitem> element (no <ext>)
-        # @return [Class] Relaton parser class (Bibdata or Bibitem subclass)
-        def mn2relaton_parser(tag, bibdata: false)
+        # @return [Class] Relaton Item parser class
+        def mn2relaton_parser(tag)
           case tag
           when "bipm"
-            require "relaton/bipm" unless defined?(::Relaton::Bipm::Bibdata)
-            bibdata ? ::Relaton::Bipm::Bibdata : ::Relaton::Bipm::Bibitem
+            require "relaton/bipm" unless defined?(::Relaton::Bipm::Item)
+            ::Relaton::Bipm::Item
           when "bsi"
-            require "relaton/bsi" unless defined?(::Relaton::Bsi::Bibdata)
-            bibdata ? ::Relaton::Bsi::Bibdata : ::Relaton::Bsi::Bibitem
+            require "relaton/bsi" unless defined?(::Relaton::Bsi::Item)
+            ::Relaton::Bsi::Item
           when "ietf"
-            require "relaton/ietf" unless defined?(::Relaton::Ietf::Bibdata)
-            bibdata ? ::Relaton::Ietf::Bibdata : ::Relaton::Ietf::Bibitem
+            require "relaton/ietf" unless defined?(::Relaton::Ietf::Item)
+            ::Relaton::Ietf::Item
           when "iho"
-            require "relaton/iho" unless defined?(::Relaton::Iho::Bibdata)
-            bibdata ? ::Relaton::Iho::Bibdata : ::Relaton::Iho::Bibitem
+            require "relaton/iho" unless defined?(::Relaton::Iho::Item)
+            ::Relaton::Iho::Item
           when "itu"
-            require "relaton/itu" unless defined?(::Relaton::Itu::Bibdata)
-            bibdata ? ::Relaton::Itu::Bibdata : ::Relaton::Itu::Bibitem
+            require "relaton/itu" unless defined?(::Relaton::Itu::Item)
+            ::Relaton::Itu::Item
           when "iec"
-            require "relaton/iec" unless defined?(::Relaton::Iec::Bibdata)
-            bibdata ? ::Relaton::Iec::Bibdata : ::Relaton::Iec::Bibitem
+            require "relaton/iec" unless defined?(::Relaton::Iec::Item)
+            ::Relaton::Iec::Item
           when "iso"
-            require "relaton/iso" unless defined?(::Relaton::Iso::Bibdata)
-            bibdata ? ::Relaton::Iso::Bibdata : ::Relaton::Iso::Bibitem
+            require "relaton/iso" unless defined?(::Relaton::Iso::Item)
+            ::Relaton::Iso::Item
           when "nist"
-            require "relaton/nist" unless defined?(::Relaton::Nist::Bibdata)
-            bibdata ? ::Relaton::Nist::Bibdata : ::Relaton::Nist::Bibitem
+            require "relaton/nist" unless defined?(::Relaton::Nist::Item)
+            ::Relaton::Nist::Item
           when "ogc"
-            require "relaton/ogc" unless defined?(::Relaton::Ogc::Bibdata)
-            bibdata ? ::Relaton::Ogc::Bibdata : ::Relaton::Ogc::Bibitem
+            require "relaton/ogc" unless defined?(::Relaton::Ogc::Item)
+            ::Relaton::Ogc::Item
           else
-            bibdata ? ::Relaton::Bib::Bibdata : ::Relaton::Bib::Bibitem
+            ::Relaton::Bib::Item
           end
         rescue LoadError => e
-          warn "Warning: Failed to load relaton gem for '#{tag}': #{e.message}. Falling back to Relaton::Bib::Bibdata/Bibitem"
-          bibdata ? ::Relaton::Bib::Bibdata : ::Relaton::Bib::Bibitem
+          warn "Warning: Failed to load relaton gem for '#{tag}': #{e.message}. Falling back to Relaton::Bib::Item"
+          ::Relaton::Bib::Item
         end
 
         # #param xml [Nokogiri::XML::Document, Nokogiri::XML::Element]
@@ -101,7 +103,7 @@ module Metanorma
           r = if b.name == "bibitem"
                 ::Relaton::Bib::Bibitem
               else
-                mn2relaton_parser(xml.root["flavor"], bibdata: true)
+                mn2relaton_parser(xml.root["flavor"])
               end
           # Relaton doesn't understand Pres XML tags
           b.xpath("//xmlns:fmt-identifier").each(&:remove)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.3.6".freeze
+  VERSION = "2.3.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-13 00:00:00.000000000 Z
+date: 2026-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor