rfcxml 0.2.0 → 0.3.0

data/lib/rfcxml/v3/ttcol.rb

@@ -2,11 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "cref"
-require_relative "eref"
-require_relative "iref"
-require_relative "xref"
-
 module Rfcxml
   module V3
     class Ttcol < Lutaml::Model::Serializable

data/lib/rfcxml/v3/ul.rb

@@ -4,8 +4,6 @@ require "lutaml/model"
 
 module Rfcxml
   module V3
-    class Li < Lutaml::Model::Serializable; end
-
     class Ul < Lutaml::Model::Serializable
       attribute :anchor, :string
       attribute :spacing, :string, default: -> { "normal" }

data/lib/rfcxml/v3/xref.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "xref_text"
-
 module Rfcxml
   module V3
     class Xref < Lutaml::Model::Serializable
@@ -25,7 +23,8 @@ module Rfcxml
         map_attribute "target", to: :target
         map_attribute "pageno", to: :pageno
         map_attribute "format", to: :format
-        map_attribute "derivedContent", to: :derived_content
+        map_attribute "derivedContent", to: :derived_content,
+                                        value_map: { to: { empty: :empty } }
         map_attribute "sectionFormat", to: :section_format
         map_attribute "section", to: :section
         map_attribute "relative", to: :relative

data/lib/rfcxml/v3/xref_text.rb

@@ -1,28 +1,19 @@
 # frozen_string_literal: true
 
-# require_relative "em"
-# require_relative "strong"
-# require_relative "sub"
-# require_relative "sup"
-# require_relative "tt"
 require "lutaml/model"
 
 module Rfcxml
   module V3
-    class Strong < Lutaml::Model::Serializable; end
-    class Em < Strong; end
-    class Sub < Lutaml::Model::Serializable; end
-    class Sup < Sub; end
-    class Tt < Lutaml::Model::Serializable; end
-
+    # Mixin module for common text formatting elements
+    # Included by Xref, Refcontent, and other elements
     module XrefText
       def self.included(base)
         base.class_eval do
-          attribute :em, ::Rfcxml::V3::Em, collection: true
-          attribute :strong, V3::Strong, collection: true
-          attribute :sub, V3::Sub, collection: true
-          attribute :sup, V3::Sup, collection: true
-          attribute :tt, V3::Tt, collection: true
+          attribute :em, "Rfcxml::V3::Em", collection: true
+          attribute :strong, "Rfcxml::V3::Strong", collection: true
+          attribute :sub, "Rfcxml::V3::Sub", collection: true
+          attribute :sup, "Rfcxml::V3::Sup", collection: true
+          attribute :tt, "Rfcxml::V3::Tt", collection: true
         end
       end
     end

data/lib/rfcxml/v3.rb

@@ -1,8 +1,106 @@
 # frozen_string_literal: true
 
-require_relative "v3/rfc"
-
 module Rfcxml
   module V3
+    # Core document structure
+    autoload :Rfc, "#{__dir__}/v3/rfc"
+    autoload :Front, "#{__dir__}/v3/front"
+    autoload :Middle, "#{__dir__}/v3/middle"
+    autoload :Back, "#{__dir__}/v3/back"
+
+    # Front matter elements
+    autoload :Abstract, "#{__dir__}/v3/abstract"
+    autoload :Annotation, "#{__dir__}/v3/annotation"
+    autoload :Area, "#{__dir__}/v3/area"
+    autoload :Author, "#{__dir__}/v3/author"
+    autoload :Contact, "#{__dir__}/v3/contact"
+    autoload :Date, "#{__dir__}/v3/date"
+    autoload :Keyword, "#{__dir__}/v3/keyword"
+    autoload :Note, "#{__dir__}/v3/note"
+    autoload :Organization, "#{__dir__}/v3/organization"
+    autoload :Title, "#{__dir__}/v3/title"
+    autoload :Workgroup, "#{__dir__}/v3/workgroup"
+
+    # Address elements
+    autoload :Address, "#{__dir__}/v3/address"
+    autoload :City, "#{__dir__}/v3/city"
+    autoload :Cityarea, "#{__dir__}/v3/cityarea"
+    autoload :Country, "#{__dir__}/v3/country"
+    autoload :Email, "#{__dir__}/v3/email"
+    autoload :Extaddr, "#{__dir__}/v3/extaddr"
+    autoload :Facsimile, "#{__dir__}/v3/facsimile"
+    autoload :Phone, "#{__dir__}/v3/phone"
+    autoload :Pobox, "#{__dir__}/v3/pobox"
+    autoload :Postal, "#{__dir__}/v3/postal"
+    autoload :PostalLine, "#{__dir__}/v3/postal_line"
+    autoload :Region, "#{__dir__}/v3/region"
+    autoload :Sortingcode, "#{__dir__}/v3/sortingcode"
+    autoload :Street, "#{__dir__}/v3/street"
+    autoload :Uri, "#{__dir__}/v3/uri"
+
+    # Body elements
+    autoload :Section, "#{__dir__}/v3/section"
+    autoload :Aside, "#{__dir__}/v3/aside"
+    autoload :Blockquote, "#{__dir__}/v3/blockquote"
+    autoload :Boilerplate, "#{__dir__}/v3/boilerplate"
+    autoload :Figure, "#{__dir__}/v3/figure"
+    autoload :Ol, "#{__dir__}/v3/ol"
+    autoload :Ul, "#{__dir__}/v3/ul"
+    autoload :Li, "#{__dir__}/v3/li"
+    autoload :Dl, "#{__dir__}/v3/dl"
+    autoload :Dt, "#{__dir__}/v3/dt"
+    autoload :Dd, "#{__dir__}/v3/dd"
+    autoload :Table, "#{__dir__}/v3/table"
+    autoload :Tbody, "#{__dir__}/v3/tbody"
+    autoload :Tfoot, "#{__dir__}/v3/tfoot"
+    autoload :Thead, "#{__dir__}/v3/thead"
+    autoload :Tr, "#{__dir__}/v3/tr"
+    autoload :Td, "#{__dir__}/v3/td"
+    autoload :Th, "#{__dir__}/v3/th"
+
+    # Inline text elements
+    autoload :Bcp14, "#{__dir__}/v3/bcp14"
+    autoload :Br, "#{__dir__}/v3/br"
+    autoload :C, "#{__dir__}/v3/c"
+    autoload :Code, "#{__dir__}/v3/code"
+    autoload :Cref, "#{__dir__}/v3/cref"
+    autoload :Em, "#{__dir__}/v3/strong" # Em is defined in strong.rb
+    autoload :Eref, "#{__dir__}/v3/eref"
+    autoload :Iref, "#{__dir__}/v3/iref"
+    autoload :Name, "#{__dir__}/v3/name"
+    autoload :Postamble, "#{__dir__}/v3/postamble"
+    autoload :Preamble, "#{__dir__}/v3/preamble"
+    autoload :Relref, "#{__dir__}/v3/relref"
+    autoload :Spanx, "#{__dir__}/v3/spanx"
+    autoload :Strong, "#{__dir__}/v3/strong"
+    autoload :Sub, "#{__dir__}/v3/sub"
+    autoload :Sup, "#{__dir__}/v3/sup"
+    autoload :Tt, "#{__dir__}/v3/tt"
+    autoload :U, "#{__dir__}/v3/u"
+    autoload :Xref, "#{__dir__}/v3/xref"
+    autoload :XrefText, "#{__dir__}/v3/xref_text"
+
+    # Artwork and code elements
+    autoload :Artset, "#{__dir__}/v3/artset"
+    autoload :Artwork, "#{__dir__}/v3/artwork"
+    autoload :Sourcecode, "#{__dir__}/v3/sourcecode"
+
+    # References
+    autoload :Displayreference, "#{__dir__}/v3/displayreference"
+    autoload :Refcontent, "#{__dir__}/v3/refcontent"
+    autoload :Reference, "#{__dir__}/v3/reference"
+    autoload :Referencegroup, "#{__dir__}/v3/referencegroup"
+    autoload :References, "#{__dir__}/v3/references"
+
+    # Other elements
+    autoload :Format, "#{__dir__}/v3/format"
+    autoload :Link, "#{__dir__}/v3/link"
+    autoload :List, "#{__dir__}/v3/list"
+    autoload :SeriesInfo, "#{__dir__}/v3/series_info"
+    autoload :Text, "#{__dir__}/v3/text"
+    autoload :Texttable, "#{__dir__}/v3/texttable"
+    autoload :Toc, "#{__dir__}/v3/toc"
+    autoload :Ttcol, "#{__dir__}/v3/ttcol"
+    autoload :Vspace, "#{__dir__}/v3/vspace"
   end
 end

data/lib/rfcxml/version.rb

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

data/lib/rfcxml.rb

@@ -3,15 +3,13 @@
 require "lutaml/model"
 
 Lutaml::Model::Config.configure do |config|
-  require "lutaml/model/xml_adapter/nokogiri_adapter"
-  config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
+  config.xml_adapter_type = :nokogiri
 end
 
 module Rfcxml
   class Error < StandardError; end
 
-  # Your code goes here...
+  autoload :Version, "#{__dir__}/rfcxml/version"
 end
 
-require_relative "rfcxml/version"
 require_relative "rfcxml/v3"

data/rfcxml.gemspec

@@ -16,10 +16,8 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "https://github.com/metanorma/rfcxml/releases"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem
-  # that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`
       .split("\x0")
@@ -29,19 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
-  spec.add_runtime_dependency "lutaml-model"
-  spec.add_runtime_dependency "nokogiri"
-
-  spec.add_development_dependency "equivalent-xml"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "xml-c14n"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = spec.homepage
+  spec.add_dependency "lutaml-model", "~> 0.8.0"
+  spec.add_dependency "nokogiri"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rfcxml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2026-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -38,90 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: xml-c14n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: IETF RFC XML parser and generator
 email:
 - open.source@ribose.com'
@@ -168,7 +84,6 @@ files:
 - lib/rfcxml/v3/displayreference.rb
 - lib/rfcxml/v3/dl.rb
 - lib/rfcxml/v3/dt.rb
-- lib/rfcxml/v3/em.rb
 - lib/rfcxml/v3/email.rb
 - lib/rfcxml/v3/eref.rb
 - lib/rfcxml/v3/extaddr.rb
@@ -241,7 +156,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/metanorma/rfcxml
   source_code_uri: https://github.com/metanorma/rfcxml
-  changelog_uri: https://github.com/metanorma/rfcxml
+  changelog_uri: https://github.com/metanorma/rfcxml/releases
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -250,14 +166,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: IETF RFC XML parser and generator

data/lib/rfcxml/v3/em.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "lutaml/model"
-require_relative "strong"
-
-module Rfcxml
-  module V3
-    class Em < Strong
-      xml do
-        root "em"
-      end
-    end
-  end
-end