rfcxml 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afc99ca4a6eb6ccc3fb1a220ac8a1945df6e823b15b86fd5003761c694e9e7be
-  data.tar.gz: 853d640f0e92ae96797e4bc79b0960f715e3a1d4bc4cc53c2e0763f62ce70c04
+  metadata.gz: a53d83dede12affcc88ca0ae6c147041be6991d34e9591cc917de1f7d8b57882
+  data.tar.gz: 225b1a13f2f9da13b602b16537df6ab89209c2cf5221258b2c3921e3d9a5a00a
 SHA512:
-  metadata.gz: 15e6b2ba34f404d084620f9c8991733ad794c023773d566508c263d2941fd358b579b4011011d8ef22827398a8e46acf832e0717e8013dc670a1a7ec0269b589
-  data.tar.gz: '0021048cb9d05a37f21261f8c054cbf9bfc8a234e04fc39b47970efe4c13314126aaf27fa6695aeea3318da19a5a18985a3e58323172da729987705cad1d0328'
+  metadata.gz: a4dfd64fb22e1c8e3aa6fbf9828f9b5d124f1e4395fc63813c512aef8ce5dd585f5f46df5c4da998e2ab646b8d60eaf56deb99e24b54e426b84b0170c1599e9e
+  data.tar.gz: 519531aabb6b89471c657395ac10c673d608f46f0c9d3235e4e1f31f083391a9e13ecc4cda469a22b9627397f47413751dac3f93de9f79d945a6d2b736adb781

data/.github/workflows/rake.yml

@@ -1,5 +1,7 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
+# Formerly cimas-managed. Now consumer-owned per metanorma/cimas#68
+# (workflow-file conversion from cimas-synced copied stubs to reusable-workflow
+# references). Pins metanorma/ci reusable at @v1 (moving major, three-tier
+# tagging discipline per metanorma/ci#372).
 name: rake
 
 on:
@@ -13,6 +15,6 @@ permissions:
 
 jobs:
   rake:
-    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
+    uses: metanorma/ci/.github/workflows/generic-rake.yml@v1
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -14,6 +14,12 @@ on:
   repository_dispatch:
     types: [ do-release ]
 
+# Least-privilege ceiling for the called rubygems-release.yml: its release job
+# needs contents:write (git tag push) and id-token:write (OIDC Trusted Publishing).
+permissions:
+  contents: write
+  id-token: write
+
 jobs:
   release:
     uses: metanorma/ci/.github/workflows/rubygems-release.yml@main

data/.github/workflows/roundtrip.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -45,15 +45,15 @@ jobs:
       - name: Download RFC XML files
         run: |
           mkdir -p rfc-xml-source
-          echo "Downloading RFC XML tarball..."
-          curl -L -o xmlsource.tar.gz "https://www.rfc-editor.org/in-notes/tar/xmlsource-all.tar.gz"
-          echo "Extracting..."
-          tar -xzf xmlsource.tar.gz -C rfc-xml-source
-          # The tarball extracts to a subdirectory, find it
-          XML_DIR=$(find rfc-xml-source -name "*.xml" -type f | head -1 | xargs dirname)
-          echo "XML_DIR=$XML_DIR" >> $GITHUB_ENV
-          FILE_COUNT=$(find "$XML_DIR" -name "*.xml" -type f | wc -l)
-          echo "Found $FILE_COUNT XML files in $XML_DIR"
+          echo "Syncing published RFC XML files via rsync..."
+          # rfc-editor.org retired the bulk tarball; rsync is now the official source.
+          # --include='*.xml' --exclude='*' (without --include='*/') limits the transfer
+          # to XML files at the module root, which are the published RFCs.
+          rsync -az --include='*.xml' --exclude='*' \
+            rsync.rfc-editor.org::rfcs/ rfc-xml-source/
+          echo "XML_DIR=rfc-xml-source" >> $GITHUB_ENV
+          FILE_COUNT=$(find "$XML_DIR" -maxdepth 1 -name "*.xml" -type f | wc -l)
+          echo "Found $FILE_COUNT published RFC XML files in $XML_DIR"
 
       - name: Run round-trip tests
         run: |
@@ -62,7 +62,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: roundtrip-results
           path: tmp/roundtrip-results-*/

data/.gitignore

@@ -15,3 +15,4 @@
 
 Gemfile.lock
 TODO*
+.claude/worktrees/

data/.rubocop.yml

@@ -2,18 +2,30 @@
 # See https://github.com/metanorma/cimas
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
+  # .rubocop_todo.yml MUST be the last entry. inherit_from is last-wins:
+  # if listed before oss-guides, the shared config's stricter Metrics/
+  # (MethodLength, BlockLength, etc.) rules override the todo's per-file
+  # grandfathering, and the todo becomes inert on those cops. Empirically
+  # verified on suma 2026-07-06: with todo listed first, 34 Metrics/* offenses
+  # remained; moved last, cleared. Every gem in the metanorma-org fleet
+  # already ships a `.rubocop_todo.yml` on its live tree (audited 2026-07-06,
+  # 54/54 have it), so this reference is safe to emit unconditionally.
   - .rubocop_todo.yml
 
-inherit_mode:
-  merge:
-    - Exclude
-
-# local repo-specific modifications
-# ...
+# Rubocop plugins enabled centrally so every metanorma-org gem picks them up
+# on cimas sync — best practice belongs at the shared-template layer, not
+# per-repo. Per ronaldtse feedback on metanorma/ci#332.
 plugins:
   - rubocop-rspec
   - rubocop-performance
   - rubocop-rake
 
+# local repo-specific modifications
+# ...
+
 AllCops:
-  TargetRubyVersion: 3.0
+  # 3.3 matches the org-wide minimum being pushed via #274 (Raise minimum
+  # Ruby version to 3.3 due to EOL of 3.2 on 2026-03-31). Was 3.4 before
+  # this commit — 3.4 was above the org's stated minimum and would have
+  # applied Rubocop rules that fail-close on gems still targeting 3.3.
+  TargetRubyVersion: 3.3

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-01 09:55:57 UTC using RuboCop version 1.86.1.
+# on 2026-06-15 14:33:06 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,40 +11,7 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'rfcxml.gemspec'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'spec/v3/cref_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/BlockEndNewline:
-  Exclude:
-    - 'spec/v3/cref_spec.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'lib/rfcxml/v3/td.rb'
-    - 'spec/v3/rfc_pi_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
-# SupportedStylesAlignWith: start_of_line, relative_to_receiver
-Layout/IndentationWidth:
-  Exclude:
-    - 'spec/v3/cref_spec.rb'
-
-# Offense count: 28
+# Offense count: 24
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -58,32 +25,20 @@ Layout/LineLength:
     - 'spec/v3/rfc_pi_spec.rb'
     - 'spec/v3/td_spec.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'spec/v3/rfc_pi_spec.rb'
-
-# Offense count: 4
-Lint/NoReturnInBeginEndBlocks:
-  Exclude:
-    - 'scripts/roundtrip_test.rb'
-
-# Offense count: 6
+# Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
     - 'lib/rfcxml/v3/rfc.rb'
     - 'scripts/roundtrip_test.rb'
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 37
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -93,9 +48,9 @@ Metrics/CyclomaticComplexity:
 # Offense count: 9
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 50
+  Max: 22
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -114,12 +69,12 @@ RSpec/DescribeClass:
   Exclude:
     - 'spec/v3/document_creation_spec.rb'
 
-# Offense count: 20
+# Offense count: 22
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 29
 
-# Offense count: 25
+# Offense count: 32
 RSpec/MultipleExpectations:
   Max: 9
 
@@ -139,14 +94,3 @@ RSpec/SpecFilePathFormat:
 Security/Open:
   Exclude:
     - 'Rakefile'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# AllowedMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/v3/cref_spec.rb'

data/lib/rfcxml/rfc_index/abstract.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Rfcxml
+  module RfcIndex
+    class Abstract < Lutaml::Model::Serializable
+      attribute :p, :string, collection: true
+
+      xml do
+        root "abstract"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "p", to: :p
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/author.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Rfcxml
+  module RfcIndex
+    class Author < Lutaml::Model::Serializable
+      attribute :name, :string
+      attribute :title, :string
+      attribute :organization, :string
+      attribute :org_abbrev, :string
+
+      xml do
+        root "author"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "name", to: :name
+        map_element "title", to: :title
+        map_element "organization", to: :organization
+        map_element "org-abbrev", to: :org_abbrev
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/bcp_entry.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+require_relative "document_ref"
+
+module Rfcxml
+  module RfcIndex
+    class BcpEntry < Lutaml::Model::Serializable
+      attribute :doc_id, :string
+      attribute :title, :string
+      attribute :is_also, DocumentRef
+
+      xml do
+        root "bcp-entry"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "doc-id", to: :doc_id
+        map_element "title", to: :title
+        map_element "is-also", to: :is_also
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/date.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Rfcxml
+  module RfcIndex
+    class Date < Lutaml::Model::Serializable
+      attribute :month, :string
+      attribute :day, :string
+      attribute :year, :string
+
+      xml do
+        root "date"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "month", to: :month
+        map_element "day", to: :day
+        map_element "year", to: :year
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/document_ref.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Rfcxml
+  module RfcIndex
+    class DocumentRef < Lutaml::Model::Serializable
+      attribute :doc_id, :string, collection: true
+
+      xml do
+        root "documentRef"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "doc-id", to: :doc_id
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/format.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Rfcxml
+  module RfcIndex
+    class Format < Lutaml::Model::Serializable
+      attribute :file_format, :string, collection: true
+
+      xml do
+        root "format"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "file-format", to: :file_format
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/fyi_entry.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+require_relative "document_ref"
+
+module Rfcxml
+  module RfcIndex
+    class FyiEntry < Lutaml::Model::Serializable
+      attribute :doc_id, :string
+      attribute :title, :string
+      attribute :is_also, DocumentRef
+
+      xml do
+        root "fyi-entry"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "doc-id", to: :doc_id
+        map_element "title", to: :title
+        map_element "is-also", to: :is_also
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/keywords.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+require_relative "kw"
+
+module Rfcxml
+  module RfcIndex
+    class Keywords < Lutaml::Model::Serializable
+      attribute :kw, Kw, collection: true
+
+      xml do
+        root "keywords"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "kw", to: :kw
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/kw.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Rfcxml
+  module RfcIndex
+    class Kw < Lutaml::Model::Serializable
+      attribute :content, :string
+
+      xml do
+        root "kw"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/namespace.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "lutaml/xml"
+
+module Rfcxml
+  module RfcIndex
+    class Namespace < Lutaml::Xml::W3c::XmlNamespace
+      uri "https://www.rfc-editor.org/rfc-index"
+      element_form_default :qualified
+    end
+  end
+end

data/lib/rfcxml/rfc_index/rfc_entry.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+require_relative "author"
+require_relative "date"
+require_relative "format"
+require_relative "keywords"
+require_relative "abstract"
+require_relative "document_ref"
+
+module Rfcxml
+  module RfcIndex
+    class RfcEntry < Lutaml::Model::Serializable
+      attribute :doc_id, :string
+      attribute :title, :string
+      attribute :author, Author, collection: true
+      attribute :date, Date
+      attribute :format, Format
+      attribute :page_count, :string
+      attribute :keywords, Keywords
+      attribute :abstract, Abstract
+      attribute :draft, :string
+      attribute :notes, :string
+      attribute :obsoletes, DocumentRef
+      attribute :obsoleted_by, DocumentRef
+      attribute :updates, DocumentRef
+      attribute :updated_by, DocumentRef
+      attribute :is_also, DocumentRef
+      attribute :see_also, DocumentRef
+      attribute :current_status, :string
+      attribute :publication_status, :string
+      attribute :stream, :string
+      attribute :area, :string
+      attribute :wg_acronym, :string
+      attribute :errata_url, :string
+      attribute :doi, :string
+
+      xml do
+        root "rfc-entry"
+        namespace Rfcxml::RfcIndex::Namespace
+        ordered
+
+        map_element "doc-id", to: :doc_id
+        map_element "title", to: :title
+        map_element "author", to: :author
+        map_element "date", to: :date
+        map_element "format", to: :format
+        map_element "page-count", to: :page_count
+        map_element "keywords", to: :keywords
+        map_element "abstract", to: :abstract
+        map_element "draft", to: :draft
+        map_element "notes", to: :notes
+        map_element "obsoletes", to: :obsoletes
+        map_element "obsoleted-by", to: :obsoleted_by
+        map_element "updates", to: :updates
+        map_element "updated-by", to: :updated_by
+        map_element "is-also", to: :is_also
+        map_element "see-also", to: :see_also
+        map_element "current-status", to: :current_status
+        map_element "publication-status", to: :publication_status
+        map_element "stream", to: :stream
+        map_element "area", to: :area
+        map_element "wg_acronym", to: :wg_acronym
+        map_element "errata-url", to: :errata_url
+        map_element "doi", to: :doi
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/rfc_index.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+require_relative "namespace"
+require_relative "bcp_entry"
+require_relative "fyi_entry"
+require_relative "rfc_entry"
+require_relative "rfc_not_issued_entry"
+require_relative "std_entry"
+
+module Rfcxml
+  module RfcIndex
+    class RfcIndex < Lutaml::Model::Serializable
+      attribute :title, :string
+      attribute :bcp_entry, BcpEntry, collection: true
+      attribute :fyi_entry, FyiEntry, collection: true
+      attribute :rfc_entry, RfcEntry, collection: true
+      attribute :rfc_not_issued_entry, RfcNotIssuedEntry, collection: true
+      attribute :std_entry, StdEntry, collection: true
+
+      xml do
+        root "rfc-index"
+        namespace Rfcxml::RfcIndex::Namespace
+        ordered
+
+        map_attribute "title", to: :title
+
+        map_element "bcp-entry", to: :bcp_entry
+        map_element "fyi-entry", to: :fyi_entry
+        map_element "rfc-entry", to: :rfc_entry
+        map_element "rfc-not-issued-entry", to: :rfc_not_issued_entry
+        map_element "std-entry", to: :std_entry
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/rfc_not_issued_entry.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Rfcxml
+  module RfcIndex
+    class RfcNotIssuedEntry < Lutaml::Model::Serializable
+      attribute :doc_id, :string
+
+      xml do
+        root "rfc-not-issued-entry"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "doc-id", to: :doc_id
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index/std_entry.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+require_relative "document_ref"
+
+module Rfcxml
+  module RfcIndex
+    class StdEntry < Lutaml::Model::Serializable
+      attribute :doc_id, :string
+      attribute :title, :string
+      attribute :is_also, DocumentRef
+
+      xml do
+        root "std-entry"
+        namespace Rfcxml::RfcIndex::Namespace
+
+        map_element "doc-id", to: :doc_id
+        map_element "title", to: :title
+        map_element "is-also", to: :is_also
+      end
+    end
+  end
+end

data/lib/rfcxml/rfc_index.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Rfcxml
+  module RfcIndex
+    autoload :Namespace, "#{__dir__}/rfc_index/namespace"
+    autoload :RfcIndex, "#{__dir__}/rfc_index/rfc_index"
+    autoload :RfcEntry, "#{__dir__}/rfc_index/rfc_entry"
+    autoload :StdEntry, "#{__dir__}/rfc_index/std_entry"
+    autoload :BcpEntry, "#{__dir__}/rfc_index/bcp_entry"
+    autoload :FyiEntry, "#{__dir__}/rfc_index/fyi_entry"
+    autoload :RfcNotIssuedEntry, "#{__dir__}/rfc_index/rfc_not_issued_entry"
+    autoload :Author, "#{__dir__}/rfc_index/author"
+    autoload :Date, "#{__dir__}/rfc_index/date"
+    autoload :Format, "#{__dir__}/rfc_index/format"
+    autoload :Keywords, "#{__dir__}/rfc_index/keywords"
+    autoload :Kw, "#{__dir__}/rfc_index/kw"
+    autoload :Abstract, "#{__dir__}/rfc_index/abstract"
+    autoload :DocumentRef, "#{__dir__}/rfc_index/document_ref"
+  end
+end

data/lib/rfcxml/v3/artwork.rb

@@ -27,13 +27,14 @@ module Rfcxml
         map_attribute "pn", to: :pn
         map_attribute "name", to: :name, value_map: { to: { empty: :empty } }
         map_attribute "type", to: :type, value_map: { to: { empty: :empty } }
-        map_attribute "src", to: :src
+        map_attribute "src", to: :src, value_map: { to: { empty: :empty } }
         map_attribute "align", to: :align
         map_attribute "alt", to: :alt, value_map: { to: { empty: :empty } }
         map_attribute "width", to: :width, value_map: { to: { empty: :empty } }
         map_attribute "height", to: :height,
                                 value_map: { to: { empty: :empty } }
-        map_attribute "originalSrc", to: :original_src
+        map_attribute "originalSrc", to: :original_src,
+                                     value_map: { to: { empty: :empty } }
       end
     end
   end

data/lib/rfcxml/v3/blockquote.rb

@@ -5,7 +5,7 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class Blockquote < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :anchor, :string
       attribute :pn, :string
       attribute :cite, :string
@@ -34,7 +34,7 @@ module Rfcxml
 
       xml do
         element "blockquote"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/c.rb

@@ -5,7 +5,7 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class C < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :cref, Cref, collection: true
       attribute :eref, Eref, collection: true
       attribute :iref, Iref, collection: true
@@ -14,7 +14,7 @@ module Rfcxml
 
       xml do
         element "c"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_element "cref", to: :cref

data/lib/rfcxml/v3/cref.rb

@@ -5,7 +5,7 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class Cref < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :anchor, :string
       attribute :source, :string
       attribute :display, :string, default: -> { "true" }
@@ -21,7 +21,7 @@ module Rfcxml
 
       xml do
         element "cref"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/dd.rb

@@ -10,6 +10,7 @@ module Rfcxml
       attribute :pn, :string
       attribute :artset, Artset, collection: true
       attribute :artwork, Artwork, collection: true
+      attribute :blockquote, Blockquote, collection: true
       attribute :dl, Dl, collection: true
       attribute :figure, Figure, collection: true
       attribute :ol, Ol, collection: true
@@ -41,8 +42,9 @@ module Rfcxml
         map_attribute "anchor", to: :anchor
         map_attribute "pn", to: :pn
 
-        %w[artset artwork aside dl figure ol sourcecode t table ul bcp14 br
-           cref em eref iref relref strong sub sup tt u xref].each do |element|
+        %w[artset artwork blockquote aside dl figure ol sourcecode t table ul
+           bcp14 br cref em eref iref relref strong sub sup tt u
+           xref].each do |element|
           map_element element, to: element.to_sym
         end
       end

data/lib/rfcxml/v3/dt.rb

@@ -5,7 +5,7 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class Dt < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :anchor, :string
       attribute :pn, :string
       attribute :bcp14, Bcp14, collection: true
@@ -23,7 +23,7 @@ module Rfcxml
 
       xml do
         element "dt"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/postamble.rb

@@ -5,7 +5,7 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class Postamble < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :cref, Cref, collection: true
       attribute :eref, Eref, collection: true
       attribute :iref, Iref, collection: true
@@ -14,7 +14,7 @@ module Rfcxml
 
       xml do
         element "postamble"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_element "cref", to: :cref

data/lib/rfcxml/v3/preamble.rb

@@ -5,7 +5,7 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class Preamble < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :bcp14, Bcp14, collection: true
       attribute :cref, Cref, collection: true
       attribute :em, Em, collection: true
@@ -22,7 +22,7 @@ module Rfcxml
 
       xml do
         element "preamble"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/v3/refcontent.rb

@@ -5,13 +5,13 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class Refcontent < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :bcp14, Bcp14, collection: true
       include XrefText
 
       xml do
         element "refcontent"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/v3/strong.rb

@@ -4,7 +4,7 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class Strong < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :bcp14, Bcp14, collection: true
       attribute :br, Br, collection: true
       attribute :cref, Cref, collection: true
@@ -19,7 +19,7 @@ module Rfcxml
 
       xml do
         element "strong"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/v3/sub.rb

@@ -5,7 +5,7 @@ require "lutaml/model"
 module Rfcxml
   module V3
     class Sub < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :content, :string, collection: true
       attribute :bcp14, Bcp14, collection: true
       attribute :cref, Cref, collection: true
       attribute :em, "Rfcxml::V3::Em", collection: true
@@ -20,7 +20,7 @@ module Rfcxml
 
       xml do
         element "sub"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/v3/sup.rb

@@ -7,7 +7,7 @@ module Rfcxml
     class Sup < Sub
       xml do
         element "sup"
-        ordered
+        mixed_content
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfcxml
-  VERSION = "0.4.3"
+  VERSION = "0.4.5"
 end

data/lib/rfcxml.rb

@@ -3,9 +3,10 @@
 require "lutaml/model"
 require "lutaml/xml"
 
-Lutaml::Model::Config.configure do |config|
-  config.xml_adapter_type = :nokogiri
-end
+# No require-time adapter configuration: assigning xml_adapter_type here
+# globally clobbered the host application's adapter selection mid-process
+# (e.g. a parse already in flight on a different adapter, lutaml-model
+# #871). lutaml-model resolves an adapter on demand when none is pinned.
 
 module Rfcxml
   class Error < StandardError; end
@@ -14,3 +15,4 @@ module Rfcxml
 end
 
 require_relative "rfcxml/v3"
+require_relative "rfcxml/rfc_index"

data/rfcxml.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 3.2.0"
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   spec.add_dependency "lutaml-model", "~> 0.8.0"
   spec.add_dependency "nokogiri"

data/scripts/roundtrip_test.rb

@@ -120,63 +120,82 @@ class RoundTripTester
     end
   end
 
-  def perform_test(filepath, basename)
-    # Read input
-    input = begin
-      File.read(filepath)
-    rescue StandardError => e
-      return build_error_result(basename, "Read", e)
-    end
+  def root_element_name(xml)
+    xml.each_line do |line|
+      if (m = line.match(/<([\w:.-]+)[\s>]/))
+        next if m[1] == "xml"
 
-    # Parse
-    parsed = begin
-      Rfcxml::V3::Rfc.from_xml(input)
-    rescue StandardError => e
-      return build_error_result(basename, "Parse", e)
+        return m[1].sub(/^.*:/, "")
+      end
     end
+    nil
+  end
 
-    # Serialize
-    output = begin
-      parsed.to_xml(pretty: true, declaration: true, encoding: "utf-8")
-    rescue StandardError => e
-      return build_error_result(basename, "Serialize", e)
-    end
+  def perform_test(filepath, basename)
+    input = read_input(filepath, basename)
+    return input if input.key?(:status)
 
-    # Compare using Canon DOM diff with explicit match options
-    # Using DOM diff with attribute_order: ignore and attribute_values: normalize
-    # handles round-trip differences correctly
-    comparison = begin
-      Canon::Comparison.equivalent?(
-        output,
-        input,
-        diff_algorithm: :dom,
-        format: :xml,
-        match: {
-          attribute_order: :ignore,
-          attribute_values: :normalize,
-          text_content: :normalize,
-          structural_whitespace: :ignore,
-        },
-        verbose: true,
-      )
-    rescue StandardError => e
-      return build_error_result(basename, "Compare", e)
-    end
+    parsed = parse_input(input[:xml], basename)
+    return parsed if parsed.key?(:status)
 
-    # Check result
+    output = serialize(parsed[:model], basename)
+    return output if output.key?(:status)
+
+    compare_and_build_result(output[:xml], input[:xml], filepath, basename)
+  end
+
+  def read_input(filepath, basename)
+    { xml: File.read(filepath) }
+  rescue StandardError => e
+    build_error_result(basename, "Read", e)
+  end
+
+  def parse_input(xml, basename)
+    { model: model_class_for(xml).from_xml(xml) }
+  rescue StandardError => e
+    build_error_result(basename, "Parse", e)
+  end
+
+  def serialize(model, basename)
+    { xml: model.to_xml(pretty: true, declaration: true, encoding: "utf-8") }
+  rescue StandardError => e
+    build_error_result(basename, "Serialize", e)
+  end
+
+  def model_class_for(xml)
+    root_element_name(xml) == "rfc-index" ? Rfcxml::RfcIndex::RfcIndex : Rfcxml::V3::Rfc
+  end
+
+  def compare_and_build_result(output, input, filepath, basename)
+    comparison = Canon::Comparison.equivalent?(
+      output, input,
+      diff_algorithm: :dom, format: :xml,
+      match: {
+        attribute_order: :ignore,
+        attribute_values: :normalize,
+        text_content: :normalize,
+        structural_whitespace: :ignore,
+      },
+      verbose: true
+    )
+    build_comparison_result(comparison, output, filepath, basename)
+  rescue StandardError => e
+    build_error_result(basename, "Compare", e)
+  end
+
+  def build_comparison_result(comparison, output, filepath, basename)
     equivalent = comparison.respond_to?(:equivalent?) ? comparison.equivalent? : comparison
+    return pass_result(basename) if equivalent
 
-    if equivalent
-      # Pass - write empty marker file
-      write_pass_marker(basename)
-      { file: basename, status: :pass }
-    else
-      # Fail - write detailed report and source
-      differences = extract_differences(comparison)
-      write_fail_report(basename, filepath, differences)
-      write_source_output(basename, output)
-      { file: basename, status: :fail, differences: differences }
-    end
+    differences = extract_differences(comparison)
+    write_fail_report(basename, filepath, differences)
+    write_source_output(basename, output)
+    { file: basename, status: :fail, differences: differences }
+  end
+
+  def pass_result(basename)
+    write_pass_marker(basename)
+    { file: basename, status: :pass }
   end
 
   def build_error_result(basename, phase, error)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfcxml
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-01 00:00:00.000000000 Z
+date: 2026-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -60,6 +60,21 @@ files:
 - bin/console
 - bin/setup
 - lib/rfcxml.rb
+- lib/rfcxml/rfc_index.rb
+- lib/rfcxml/rfc_index/abstract.rb
+- lib/rfcxml/rfc_index/author.rb
+- lib/rfcxml/rfc_index/bcp_entry.rb
+- lib/rfcxml/rfc_index/date.rb
+- lib/rfcxml/rfc_index/document_ref.rb
+- lib/rfcxml/rfc_index/format.rb
+- lib/rfcxml/rfc_index/fyi_entry.rb
+- lib/rfcxml/rfc_index/keywords.rb
+- lib/rfcxml/rfc_index/kw.rb
+- lib/rfcxml/rfc_index/namespace.rb
+- lib/rfcxml/rfc_index/rfc_entry.rb
+- lib/rfcxml/rfc_index/rfc_index.rb
+- lib/rfcxml/rfc_index/rfc_not_issued_entry.rb
+- lib/rfcxml/rfc_index/std_entry.rb
 - lib/rfcxml/v3.rb
 - lib/rfcxml/v3/abstract.rb
 - lib/rfcxml/v3/address.rb
@@ -170,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="