rfcxml 0.2.1 → 0.4.0

data/lib/rfcxml/v3/rfc.rb

@@ -11,23 +11,36 @@ module Rfcxml
   module V3
     class Rfc < Lutaml::Model::Serializable
       attribute :number, :string
-      attribute :obsoletes, :string, default: -> { "" }
-      attribute :updates, :string, default: -> { "" }
-      attribute :category, :string
+      attribute :obsoletes, :string
+      attribute :updates, :string
+      attribute :category, :string,
+                values: %w[std bcp exp info historic]
       attribute :mode, :string
-      attribute :consensus, :string, default: -> { "false" }
+      attribute :consensus, :string,
+                values: %w[no yes false true],
+                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 :submission_type, :string,
+                values: %w[IETF IAB IRTF independent editorial],
+                default: -> { "IETF" }
       attribute :doc_name, :string
-      attribute :sort_refs, :string, default: -> { "false" }
-      attribute :sym_refs, :string, default: -> { "true" }
-      attribute :toc_include, :string, default: -> { "true" }
+      attribute :sort_refs, :string,
+                values: %w[true false],
+                default: -> { "false" }
+      attribute :sym_refs, :string,
+                values: %w[true false],
+                default: -> { "true" }
+      attribute :toc_include, :string,
+                values: %w[true false],
+                default: -> { "true" }
       attribute :toc_depth, :string, default: -> { "3" }
       attribute :prep_time, :string
-      attribute :index_include, :string, default: -> { "true" }
+      attribute :index_include, :string,
+                values: %w[true false],
+                default: -> { "true" }
       attribute :version, :string
       attribute :scripts, :string, default: -> { "Common,Latin" }
       attribute :expires_date, :string
@@ -37,11 +50,14 @@ module Rfcxml
       attribute :back, Back
 
       xml do
-        root "rfc"
+        element "rfc"
+        ordered
 
         map_attribute "number", to: :number
-        map_attribute "obsoletes", to: :obsoletes
-        map_attribute "updates", to: :updates
+        map_attribute "obsoletes", to: :obsoletes,
+                                   value_map: { to: { empty: :empty } }
+        map_attribute "updates", to: :updates,
+                                 value_map: { to: { empty: :empty } }
         map_attribute "category", to: :category
         map_attribute "mode", to: :mode
         map_attribute "consensus", to: :consensus
@@ -59,12 +75,44 @@ 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
         end
       end
+
+      # Override to_xml to fix SVG elements
+      # SVG elements need xmlns="http://www.w3.org/2000/svg" attribute
+      # lutaml-model doesn't properly output xmlns when serializing SVG
+      # and it incorrectly handles <text> elements (treats them as text content)
+      def to_xml(options = {})
+        xml = super
+        return xml unless xml
+
+        # Post-process to ensure SVG elements have xmlns attribute
+        doc = Nokogiri::XML(xml)
+        svg_needs_fix = doc.xpath("//svg[not(@xmlns)]").any? ||
+          doc.xpath("//svg//*[@xmlns='http://www.w3.org/2000/svg']").any?
+
+        return xml unless svg_needs_fix
+
+        doc.xpath("//svg[not(@xmlns)]").each do |svg_elem|
+          svg_elem["xmlns"] = "http://www.w3.org/2000/svg"
+        end
+
+        # Remove redundant xmlns from child elements within SVG
+        doc.xpath("//svg//*[@xmlns='http://www.w3.org/2000/svg']").each do |child|
+          child.delete("xmlns")
+        end
+
+        # Preserve XML declaration if it was in the original output
+        if xml.start_with?("<?xml")
+          doc.to_xml
+        else
+          doc.root.to_xml
+        end
+      end
     end
   end
 end

data/lib/rfcxml/v3/section.rb

@@ -2,32 +2,21 @@
 
 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
       attribute :anchor, :string
       attribute :pn, :string
       attribute :title, :string
-      attribute :numbered, :string, default: -> { "true" }
-      attribute :toc, :string, default: -> { "default" }
-      attribute :remove_in_rfc, :string, default: -> { "false" }
+      attribute :numbered, :string,
+                values: %w[true false],
+                default: -> { "true" }
+      attribute :toc, :string,
+                values: %w[include exclude default],
+                default: -> { "default" }
+      attribute :remove_in_rfc, :string,
+                values: %w[true false],
+                default: -> { "false" }
       attribute :name, Name
       attribute :artset, Artset, collection: true
       attribute :artwork, Artwork, collection: true
@@ -47,7 +36,8 @@ module Rfcxml
       attribute :section, Section, collection: true
 
       xml do
-        root "section", mixed: true
+        element "section"
+        mixed_content
 
         map_attribute "anchor", to: :anchor
         map_attribute "pn", to: :pn

data/lib/rfcxml/v3/series_info.rb

@@ -10,13 +10,14 @@ module Rfcxml
       attribute :ascii_name, :string
       attribute :ascii_value, :string
       attribute :status, :string
-      attribute :stream, :string
+      attribute :stream, :string,
+                values: %w[IETF IAB IRTF independent editorial]
 
       xml do
-        root "seriesInfo"
+        element "seriesInfo"
 
-        map_attribute "name", to: :name
-        map_attribute "value", to: :value
+        map_attribute "name", to: :name, value_map: { to: { empty: :empty } }
+        map_attribute "value", to: :value, value_map: { to: { empty: :empty } }
         map_attribute "asciiName", to: :ascii_name
         map_attribute "asciiValue", to: :ascii_value
         map_attribute "status", to: :status

data/lib/rfcxml/v3/sortingcode.rb

@@ -9,7 +9,7 @@ module Rfcxml
       attribute :ascii, :string
 
       xml do
-        root "sortingcode"
+        element "sortingcode"
 
         map_content to: :content
         map_attribute "ascii", to: :ascii

data/lib/rfcxml/v3/sourcecode.rb

@@ -8,23 +8,27 @@ module Rfcxml
       attribute :content, :string
       attribute :anchor, :string
       attribute :pn, :string
-      attribute :name, :string, default: -> { "" }
-      attribute :type, :string, default: -> { "" }
-      attribute :markers, :string, default: -> { "false" }
+      attribute :name, :string
+      attribute :type, :string
+      attribute :markers, :string
       attribute :src, :string
       attribute :original_src, :string
 
       xml do
-        root "sourcecode"
+        element "sourcecode"
+        mixed_content
 
         map_content to: :content
-        map_attribute "anchor", to: :anchor
-        map_attribute "pn", to: :pn
+        map_attribute "anchor", to: :anchor,
+                                value_map: { to: { empty: :empty } }
+        map_attribute "pn", to: :pn, value_map: { to: { empty: :empty } }
         map_attribute "name", to: :name, value_map: { to: { empty: :empty } }
         map_attribute "type", to: :type, value_map: { to: { empty: :empty } }
-        map_attribute "markers", to: :markers
-        map_attribute "src", to: :src
-        map_attribute "originalSrc", to: :original_src
+        map_attribute "markers", to: :markers,
+                                 value_map: { to: { empty: :empty } }
+        map_attribute "src", to: :src, value_map: { to: { empty: :empty } }
+        map_attribute "originalSrc", to: :original_src,
+                                     value_map: { to: { empty: :empty } }
       end
     end
   end

data/lib/rfcxml/v3/spanx.rb

@@ -9,7 +9,7 @@ module Rfcxml
       attribute :style, :string, default: -> { "emph" }
 
       xml do
-        root "spanx"
+        element "spanx"
 
         map_content to: :content
         map_attribute "style", to: :style

data/lib/rfcxml/v3/street.rb

@@ -9,7 +9,7 @@ module Rfcxml
       attribute :ascii, :string
 
       xml do
-        root "street"
+        element "street"
 
         map_content to: :content
         map_attribute "ascii", to: :ascii

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,17 +8,18 @@ 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
-        root "strong"
+        element "strong"
+        ordered
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/v3/sub.rb

@@ -2,34 +2,25 @@
 
 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
-        root "sub"
+        element "sub"
+        ordered
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/v3/sup.rb

@@ -2,13 +2,12 @@
 
 require "lutaml/model"
 
-require_relative "sub"
-
 module Rfcxml
   module V3
     class Sup < Sub
       xml do
-        root "sup"
+        element "sup"
+        ordered
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

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
@@ -21,7 +15,7 @@ module Rfcxml
       attribute :tfoot, Tfoot
 
       xml do
-        root "table"
+        element "table"
 
         map_attribute "align", to: :align
         map_attribute "anchor", to: :anchor

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
@@ -11,7 +9,7 @@ module Rfcxml
       attribute :tr, Tr, collection: true
 
       xml do
-        root "tbody"
+        element "tbody"
 
         map_attribute "anchor", to: :anchor
         map_element "tr", to: :tr

data/lib/rfcxml/v3/td.rb

@@ -2,36 +2,32 @@
 
 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
       attribute :content, :string
       attribute :anchor, :string
-      attribute :colspan, :string, default: -> { "1" }
-      attribute :rowspan, :string, default: -> { "1" }
-      attribute :align, :string, default: -> { "left" }
+      attribute :colspan, :string
+      attribute :rowspan, :string
+      attribute :align, :string,
+                values: %w[left center right]
+
+      # Normalize empty string colspan/rowspan to nil.
+      # Schema default for colspan/rowspan is "1", so empty string should not
+      # be serialized as an attribute. This ensures round-trip comparison
+      # treats rowspan="" (in source) as equivalent to absent rowspan.
+      module ColspanRowspanNormalizer
+        def colspan=(value)
+          super(value.to_s.empty? ? nil : value)
+        end
+
+        def rowspan=(value)
+          super(value.to_s.empty? ? nil : value)
+        end
+      end
+
+      prepend ColspanRowspanNormalizer
+
       attribute :artset, Artset, collection: true
       attribute :artwork, Artwork, collection: true
       attribute :dl, Dl, collection: true
@@ -55,7 +51,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "td"
+        element "td"
+        mixed_content
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

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
@@ -50,7 +31,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "t", mixed: true
+        element "t"
+        mixed_content
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/texttable.rb

@@ -2,20 +2,20 @@
 
 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
       attribute :anchor, :string
-      attribute :title, :string, default: -> { "" }
-      attribute :suppress_title, :string, default: -> { "false" }
-      attribute :align, :string, default: -> { "center" }
-      attribute :style, :string, default: -> { "full" }
+      attribute :title, :string
+      attribute :suppress_title, :string,
+                values: %w[true false],
+                default: -> { "false" }
+      attribute :align, :string,
+                values: %w[left center right],
+                default: -> { "center" }
+      attribute :style, :string,
+                values: %w[all none headers full],
+                default: -> { "full" }
       attribute :name, Name
       attribute :preamble, Preamble
       attribute :ttcol, Ttcol, collection: true
@@ -23,10 +23,10 @@ module Rfcxml
       attribute :postamble, Postamble
 
       xml do
-        root "texttable"
+        element "texttable"
 
         map_attribute "anchor", to: :anchor
-        map_attribute "title", to: :title
+        map_attribute "title", to: :title, value_map: { to: { empty: :empty } }
         map_attribute "suppress-title", to: :suppress_title
         map_attribute "align", to: :align
         map_attribute "style", to: :style

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
@@ -11,7 +9,7 @@ module Rfcxml
       attribute :tr, Tr, collection: true
 
       xml do
-        root "tfoot"
+        element "tfoot"
 
         map_attribute "anchor", to: :anchor
         map_element "tr", to: :tr

data/lib/rfcxml/v3/th.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "td"
-
 module Rfcxml
   module V3
     class Th < Td
       xml do
-        root "th"
+        element "th"
       end
     end
   end

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
@@ -11,7 +9,7 @@ module Rfcxml
       attribute :tr, Tr, collection: true
 
       xml do
-        root "thead"
+        element "thead"
 
         map_attribute "anchor", to: :anchor
         map_element "tr", to: :tr

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
@@ -13,10 +11,11 @@ module Rfcxml
       attribute :br, Br, collection: true
 
       xml do
-        root "title"
+        element "title"
 
         map_content to: :content
-        map_attribute "abbrev", to: :abbrev
+        map_attribute "abbrev", to: :abbrev,
+                                value_map: { to: { empty: :empty } }
         map_attribute "ascii", to: :ascii
         map_element "br", to: :br
       end

data/lib/rfcxml/v3/toc.rb

@@ -2,15 +2,13 @@
 
 require "lutaml/model"
 
-require_relative "section"
-
 module Rfcxml
   module V3
     class Toc < Lutaml::Model::Serializable
       attribute :section, Section, collection: true
 
       xml do
-        root "toc"
+        element "toc"
 
         map_element "section", to: :section
       end

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
@@ -13,7 +10,9 @@ module Rfcxml
       attribute :th, Th, collection: true
 
       xml do
-        root "tr"
+        element "tr"
+        ordered
+        mixed_content
 
         map_attribute "anchor", to: :anchor
         map_element "td", to: :td