rfcxml 0.2.1 → 0.3.0

data/lib/rfcxml/v3/note.rb

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "dl"
-require_relative "name"
-require_relative "ol"
-require_relative "text"
-require_relative "ul"
-
 module Rfcxml
   module V3
     class Note < Lutaml::Model::Serializable

data/lib/rfcxml/v3/ol.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "li"
-
 module Rfcxml
   module V3
     class Ol < Lutaml::Model::Serializable

data/lib/rfcxml/v3/postal.rb

@@ -2,17 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "city"
-require_relative "cityarea"
-require_relative "code"
-require_relative "country"
-require_relative "extaddr"
-require_relative "pobox"
-require_relative "postal_line"
-require_relative "region"
-require_relative "sortingcode"
-require_relative "street"
-
 module Rfcxml
   module V3
     class Postal < Lutaml::Model::Serializable

data/lib/rfcxml/v3/postamble.rb

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

data/lib/rfcxml/v3/preamble.rb

@@ -2,20 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "bcp14"
-require_relative "cref"
-require_relative "em"
-require_relative "eref"
-require_relative "iref"
-require_relative "relref"
-require_relative "spanx"
-require_relative "strong"
-require_relative "sub"
-require_relative "sup"
-require_relative "tt"
-require_relative "u"
-require_relative "xref"
-
 module Rfcxml
   module V3
     class Preamble < Lutaml::Model::Serializable

data/lib/rfcxml/v3/refcontent.rb

@@ -2,9 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "bcp14"
-require_relative "xref_text"
-
 module Rfcxml
   module V3
     class Refcontent < Lutaml::Model::Serializable

data/lib/rfcxml/v3/reference.rb

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "annotation"
-require_relative "format"
-require_relative "front"
-require_relative "refcontent"
-require_relative "series_info"
-
 module Rfcxml
   module V3
     class Reference < Lutaml::Model::Serializable

data/lib/rfcxml/v3/referencegroup.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "reference"
-
 module Rfcxml
   module V3
     class Referencegroup < Lutaml::Model::Serializable

data/lib/rfcxml/v3/references.rb

@@ -2,10 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "name"
-require_relative "reference"
-require_relative "referencegroup"
-
 module Rfcxml
   module V3
     class References < Lutaml::Model::Serializable

data/lib/rfcxml/v3/rfc.rb

@@ -18,7 +18,7 @@ module Rfcxml
       attribute :consensus, :string, default: -> { "false" }
       attribute :series_no, :string
       attribute :ipr, :string
-      attribute :lang, :string
+      attribute :lang, Lutaml::Xml::W3c::XmlLangType
       attribute :ipr_extract, :string
       attribute :submission_type, :string, default: -> { "IETF" }
       attribute :doc_name, :string
@@ -59,7 +59,7 @@ module Rfcxml
         map_attribute "version", to: :version
         map_attribute "scripts", to: :scripts
         map_attribute "expiresDate", to: :expires_date
-        map_attribute "lang", to: :lang, prefix: :xml
+        map_attribute "lang", to: :lang
 
         %w[link front middle back].each do |element|
           map_element element, to: element.to_sym

data/lib/rfcxml/v3/section.rb

@@ -2,23 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "artset"
-require_relative "artwork"
-require_relative "aside"
-require_relative "author"
-require_relative "blockquote"
-require_relative "contact"
-require_relative "dl"
-require_relative "figure"
-require_relative "iref"
-require_relative "name"
-require_relative "ol"
-require_relative "sourcecode"
-require_relative "text"
-require_relative "table"
-require_relative "texttable"
-require_relative "ul"
-
 module Rfcxml
   module V3
     class Section < Lutaml::Model::Serializable

data/lib/rfcxml/v3/strong.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "br"
-require_relative "sup"
-
 module Rfcxml
   module V3
     class Strong < Lutaml::Model::Serializable
@@ -11,13 +8,13 @@ module Rfcxml
       attribute :bcp14, Bcp14, collection: true
       attribute :br, Br, collection: true
       attribute :cref, Cref, collection: true
-      attribute :em, Em, collection: true
+      attribute :em, "Rfcxml::V3::Em", collection: true
       attribute :eref, Eref, collection: true
       attribute :iref, Iref, collection: true
       attribute :relref, Relref, collection: true
-      attribute :sub, Sub, collection: true
-      attribute :sup, Sup, collection: true
-      attribute :tt, Tt, collection: true
+      attribute :sub, "Rfcxml::V3::Sub", collection: true
+      attribute :sup, "Rfcxml::V3::Sup", collection: true
+      attribute :tt, "Rfcxml::V3::Tt", collection: true
       attribute :xref, Xref, collection: true
 
       xml do

data/lib/rfcxml/v3/sub.rb

@@ -2,30 +2,20 @@
 
 require "lutaml/model"
 
-require_relative "bcp14"
-require_relative "cref"
-require_relative "em"
-require_relative "eref"
-require_relative "iref"
-require_relative "relref"
-require_relative "strong"
-require_relative "tt"
-require_relative "xref"
-
 module Rfcxml
   module V3
     class Sub < Lutaml::Model::Serializable
       attribute :content, :string
       attribute :bcp14, Bcp14, collection: true
       attribute :cref, Cref, collection: true
-      attribute :em, Em, collection: true
+      attribute :em, "Rfcxml::V3::Em", collection: true
       attribute :eref, Eref, collection: true
       attribute :iref, Iref, collection: true
       attribute :relref, Relref, collection: true
-      attribute :strong, Strong, collection: true
+      attribute :strong, "Rfcxml::V3::Strong", collection: true
       attribute :sub, Sub, collection: true
-      attribute :sup, Sup, collection: true
-      attribute :tt, Tt, collection: true
+      attribute :sup, "Rfcxml::V3::Sup", collection: true
+      attribute :tt, "Rfcxml::V3::Tt", collection: true
       attribute :xref, Xref, collection: true
 
       xml do

data/lib/rfcxml/v3/sup.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "sub"
-
 module Rfcxml
   module V3
     class Sup < Sub

data/lib/rfcxml/v3/table.rb

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "iref"
-require_relative "name"
-require_relative "tbody"
-require_relative "tfoot"
-require_relative "thead"
-
 module Rfcxml
   module V3
     class Table < Lutaml::Model::Serializable

data/lib/rfcxml/v3/tbody.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "tr"
-
 module Rfcxml
   module V3
     class Tbody < Lutaml::Model::Serializable

data/lib/rfcxml/v3/td.rb

@@ -2,28 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "artset"
-require_relative "artwork"
-require_relative "bcp14"
-require_relative "br"
-require_relative "cref"
-require_relative "dl"
-require_relative "em"
-require_relative "eref"
-require_relative "figure"
-require_relative "iref"
-require_relative "ol"
-require_relative "relref"
-require_relative "sourcecode"
-require_relative "strong"
-require_relative "sub"
-require_relative "sup"
-require_relative "text"
-require_relative "tt"
-require_relative "u"
-require_relative "ul"
-require_relative "xref"
-
 module Rfcxml
   module V3
     class Td < Lutaml::Model::Serializable

data/lib/rfcxml/v3/text.rb

@@ -2,27 +2,8 @@
 
 require "lutaml/model"
 
-require_relative "bcp14"
-require_relative "br"
-require_relative "contact"
-require_relative "cref"
-require_relative "em"
-require_relative "eref"
-require_relative "iref"
-require_relative "relref"
-require_relative "spanx"
-require_relative "strong"
-require_relative "sub"
-require_relative "sup"
-require_relative "tt"
-require_relative "u"
-require_relative "vspace"
-require_relative "xref"
-
 module Rfcxml
   module V3
-    class List < Lutaml::Model::Serializable; end
-
     class Text < Lutaml::Model::Serializable
       attribute :content, :string
       attribute :anchor, :string

data/lib/rfcxml/v3/texttable.rb

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "c"
-require_relative "name"
-require_relative "postamble"
-require_relative "preamble"
-require_relative "ttcol"
-
 module Rfcxml
   module V3
     class Texttable < Lutaml::Model::Serializable

data/lib/rfcxml/v3/tfoot.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "tr"
-
 module Rfcxml
   module V3
     class Tfoot < Lutaml::Model::Serializable

data/lib/rfcxml/v3/th.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "td"
-
 module Rfcxml
   module V3
     class Th < Td

data/lib/rfcxml/v3/thead.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "tr"
-
 module Rfcxml
   module V3
     class Thead < Lutaml::Model::Serializable

data/lib/rfcxml/v3/title.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "br"
-
 module Rfcxml
   module V3
     class Title < Lutaml::Model::Serializable

data/lib/rfcxml/v3/toc.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "section"
-
 module Rfcxml
   module V3
     class Toc < Lutaml::Model::Serializable

data/lib/rfcxml/v3/tr.rb

@@ -2,9 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "td"
-require_relative "th"
-
 module Rfcxml
   module V3
     class Tr < Lutaml::Model::Serializable

data/lib/rfcxml/v3/tt.rb

@@ -2,34 +2,20 @@
 
 require "lutaml/model"
 
-require_relative "bcp14"
-require_relative "br"
-require_relative "cref"
-require_relative "em"
-require_relative "eref"
-require_relative "iref"
-require_relative "relref"
-require_relative "strong"
-require_relative "sub"
-require_relative "sup"
-require_relative "xref"
-
 module Rfcxml
   module V3
-    class Cref < Lutaml::Model::Serializable; end
-
     class Tt < Lutaml::Model::Serializable
       attribute :content, :string
       attribute :bcp14, Bcp14, collection: true
       attribute :br, Br, collection: true
       attribute :cref, Cref, collection: true
-      attribute :em, Em, collection: true
+      attribute :em, "Rfcxml::V3::Em", collection: true
       attribute :eref, Eref, collection: true
       attribute :iref, Iref, collection: true
       attribute :relref, Relref, collection: true
-      attribute :strong, Strong, collection: true
-      attribute :sub, Sub, collection: true
-      attribute :sup, Sup, collection: true
+      attribute :strong, "Rfcxml::V3::Strong", collection: true
+      attribute :sub, "Rfcxml::V3::Sub", collection: true
+      attribute :sup, "Rfcxml::V3::Sup", collection: true
       attribute :xref, Xref, collection: true
 
       xml do

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

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.1"
+  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,6 +16,7 @@ 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"
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`
@@ -26,8 +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_dependency "lutaml-model", "~> 0.7"
+  spec.add_dependency "lutaml-model", "~> 0.8.0"
   spec.add_dependency "nokogiri"
 end