rfcxml 0.3.0 → 0.4.0

data/lib/rfcxml/v3/address.rb

@@ -12,7 +12,8 @@ module Rfcxml
       attribute :uri, Uri
 
       xml do
-        root "address"
+        element "address"
+        ordered
 
         map_element "postal", to: :postal
         map_element "phone", to: :phone

data/lib/rfcxml/v3/annotation.rb

@@ -21,7 +21,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "annotation", mixed: true
+        element "annotation"
+        mixed_content
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/v3/area.rb

@@ -8,7 +8,7 @@ module Rfcxml
       attribute :content, :string
 
       xml do
-        root "area"
+        element "area"
 
         map_content to: :content
       end

data/lib/rfcxml/v3/artset.rb

@@ -10,7 +10,8 @@ module Rfcxml
       attribute :artwork, Artwork, collection: true
 
       xml do
-        root "artset"
+        element "artset"
+        ordered
 
         map_attribute "anchor", to: :anchor
         map_attribute "pn", to: :pn

data/lib/rfcxml/v3/artwork.rb

@@ -8,19 +8,21 @@ module Rfcxml
       attribute :content, :string
       attribute :anchor, :string
       attribute :pn, :string
-      attribute :name, :string, default: -> { "" }
-      attribute :type, :string, default: -> { "" }
+      attribute :name, :string
+      attribute :type, :string
       attribute :src, :string
-      attribute :align, :string, default: -> { "left" }
-      attribute :alt, :string, default: -> { "" }
-      attribute :width, :string, default: -> { "" }
-      attribute :height, :string, default: -> { "" }
+      attribute :align, :string, values: %w[left center right]
+      attribute :alt, :string
+      attribute :width, :string
+      attribute :height, :string
       attribute :original_src, :string
 
       xml do
-        root "artwork"
+        element "artwork"
 
-        map_content to: :content
+        # Use map_all to capture both text content AND child elements like <svg>
+        # map_content only captures text nodes, not child elements
+        map_all to: :content
         map_attribute "anchor", to: :anchor
         map_attribute "pn", to: :pn
         map_attribute "name", to: :name, value_map: { to: { empty: :empty } }
@@ -28,8 +30,9 @@ module Rfcxml
         map_attribute "src", to: :src
         map_attribute "align", to: :align
         map_attribute "alt", to: :alt, value_map: { to: { empty: :empty } }
-        map_attribute "width", to: :width
-        map_attribute "height", to: :height
+        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
       end
     end

data/lib/rfcxml/v3/aside.rb

@@ -19,7 +19,8 @@ module Rfcxml
       attribute :ul, Ul, collection: true
 
       xml do
-        root "aside"
+        element "aside"
+        ordered
 
         map_attribute "anchor", to: :anchor
         map_attribute "pn", to: :pn

data/lib/rfcxml/v3/author.rb

@@ -11,22 +11,29 @@ module Rfcxml
       attribute :surname, :string
       attribute :ascii_surname, :string
       attribute :fullname, :string
-      attribute :role, :string
+      attribute :role, :string, values: %w[editor]
       attribute :ascii_fullname, :string
       attribute :organization, Organization
       attribute :address, Address
 
       xml do
-        root "author"
+        element "author"
+        ordered
 
         map_attribute "anchor", to: :anchor
-        map_attribute "initials", to: :initials
-        map_attribute "asciiInitials", to: :ascii_initials
-        map_attribute "surname", to: :surname
-        map_attribute "asciiSurname", to: :ascii_surname
-        map_attribute "fullname", to: :fullname
-        map_attribute "role", to: :role
-        map_attribute "asciiFullname", to: :ascii_fullname
+        map_attribute "initials", to: :initials,
+                                  value_map: { to: { empty: :empty } }
+        map_attribute "asciiInitials", to: :ascii_initials,
+                                       value_map: { to: { empty: :empty } }
+        map_attribute "surname", to: :surname,
+                                 value_map: { to: { empty: :empty } }
+        map_attribute "asciiSurname", to: :ascii_surname,
+                                      value_map: { to: { empty: :empty } }
+        map_attribute "fullname", to: :fullname,
+                                  value_map: { to: { empty: :empty } }
+        map_attribute "role", to: :role, value_map: { to: { empty: :empty } }
+        map_attribute "asciiFullname", to: :ascii_fullname,
+                                       value_map: { to: { empty: :empty } }
         map_element "organization", to: :organization
         map_element "address", to: :address
       end

data/lib/rfcxml/v3/back.rb

@@ -10,7 +10,8 @@ module Rfcxml
       attribute :section, Section, collection: true
 
       xml do
-        root "back"
+        element "back"
+        ordered
 
         map_element "displayreference", to: :displayreference
         map_element "references", to: :references

data/lib/rfcxml/v3/bcp14.rb

@@ -8,7 +8,7 @@ module Rfcxml
       attribute :content, :string
 
       xml do
-        root "bcp14"
+        element "bcp14"
 
         map_content to: :content
       end

data/lib/rfcxml/v3/blockquote.rb

@@ -33,7 +33,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "blockquote"
+        element "blockquote"
+        ordered
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/boilerplate.rb

@@ -8,7 +8,8 @@ module Rfcxml
       attribute :section, Section, collection: true
 
       xml do
-        root "boilerplate"
+        element "boilerplate"
+        ordered
 
         map_element "section", to: :section
       end

data/lib/rfcxml/v3/br.rb

@@ -6,7 +6,7 @@ module Rfcxml
   module V3
     class Br < Lutaml::Model::Serializable
       xml do
-        root "br"
+        element "br"
       end
     end
   end

data/lib/rfcxml/v3/c.rb

@@ -13,7 +13,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "c"
+        element "c"
+        ordered
 
         map_content to: :content
         map_element "cref", to: :cref

data/lib/rfcxml/v3/city.rb

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

data/lib/rfcxml/v3/cityarea.rb

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

data/lib/rfcxml/v3/code.rb

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

data/lib/rfcxml/v3/contact.rb

@@ -16,7 +16,8 @@ module Rfcxml
       attribute :address, Address
 
       xml do
-        root "contact"
+        element "contact"
+        ordered
 
         map_attribute "anchor", to: :anchor
         map_attribute "initials", to: :initials

data/lib/rfcxml/v3/country.rb

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

data/lib/rfcxml/v3/cref.rb

@@ -20,7 +20,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "cref"
+        element "cref"
+        ordered
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/date.rb

@@ -11,12 +11,12 @@ module Rfcxml
       attribute :year, :string
 
       xml do
-        root "date"
+        element "date"
 
         map_content to: :content
-        map_attribute "day", to: :day
-        map_attribute "month", to: :month
-        map_attribute "year", to: :year
+        map_attribute "day", to: :day, value_map: { to: { empty: :empty } }
+        map_attribute "month", to: :month, value_map: { to: { empty: :empty } }
+        map_attribute "year", to: :year, value_map: { to: { empty: :empty } }
       end
     end
   end

data/lib/rfcxml/v3/dd.rb

@@ -34,7 +34,8 @@ module Rfcxml
       attribute :aside, Aside, collection: true
 
       xml do
-        root "dd", mixed: true
+        element "dd"
+        mixed_content
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/displayreference.rb

@@ -9,7 +9,7 @@ module Rfcxml
       attribute :to, :string
 
       xml do
-        root "displayreference"
+        element "displayreference"
 
         map_attribute "target", to: :target
         map_attribute "to", to: :to

data/lib/rfcxml/v3/dl.rb

@@ -14,7 +14,8 @@ module Rfcxml
       attribute :dd, Dd, collection: true
 
       xml do
-        root "dl", mixed: true
+        element "dl"
+        mixed_content
 
         map_attribute "anchor", to: :anchor
         map_attribute "spacing", to: :spacing

data/lib/rfcxml/v3/dt.rb

@@ -22,7 +22,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "dt"
+        element "dt"
+        ordered
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/email.rb

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

data/lib/rfcxml/v3/eref.rb

@@ -10,7 +10,7 @@ module Rfcxml
       attribute :target, :string
 
       xml do
-        root "eref"
+        element "eref"
 
         map_content to: :content
         map_attribute "brackets", to: :brackets

data/lib/rfcxml/v3/extaddr.rb

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

data/lib/rfcxml/v3/facsimile.rb

@@ -8,7 +8,7 @@ module Rfcxml
       attribute :content, :string
 
       xml do
-        root "facsimile"
+        element "facsimile"
 
         map_content to: :content
       end

data/lib/rfcxml/v3/figure.rb

@@ -7,14 +7,18 @@ module Rfcxml
     class Figure < Lutaml::Model::Serializable
       attribute :anchor, :string
       attribute :pn, :string
-      attribute :title, :string, default: -> { "" }
-      attribute :suppress_title, :string, default: -> { "false" }
+      attribute :title, :string
+      attribute :suppress_title, :string,
+                values: %w[true false],
+                default: -> { "false" }
       attribute :src, :string
       attribute :original_src, :string
-      attribute :align, :string, default: -> { "left" }
-      attribute :alt, :string, default: -> { "" }
-      attribute :width, :string, default: -> { "" }
-      attribute :height, :string, default: -> { "" }
+      attribute :align, :string,
+                values: %w[left center right],
+                default: -> { "left" }
+      attribute :alt, :string
+      attribute :width, :string
+      attribute :height, :string
       attribute :name, Name
       attribute :iref, Iref, collection: true
       attribute :preamble, Preamble
@@ -24,18 +28,20 @@ module Rfcxml
       attribute :postamble, Postamble
 
       xml do
-        root "figure"
+        element "figure"
+        ordered
 
         map_attribute "anchor", to: :anchor
         map_attribute "pn", to: :pn
-        map_attribute "title", to: :title
+        map_attribute "title", to: :title, value_map: { to: { empty: :empty } }
         map_attribute "suppress-title", to: :suppress_title
         map_attribute "src", to: :src
         map_attribute "originalSrc", to: :original_src
         map_attribute "align", to: :align
-        map_attribute "alt", to: :alt
-        map_attribute "width", to: :width
-        map_attribute "height", to: :height
+        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 } }
 
         %w[name iref preamble artset artwork sourcecode
            postamble].each do |element|

data/lib/rfcxml/v3/format.rb

@@ -10,7 +10,7 @@ module Rfcxml
       attribute :octets, :string
 
       xml do
-        root "format"
+        element "format"
 
         map_attribute "target", to: :target
         map_attribute "type", to: :type

data/lib/rfcxml/v3/front.rb

@@ -18,7 +18,8 @@ module Rfcxml
       attribute :toc, Toc
 
       xml do
-        root "front"
+        element "front"
+        ordered
 
         map_element "title", to: :title
         map_element "seriesInfo", to: :series_info

data/lib/rfcxml/v3/iref.rb

@@ -6,15 +6,16 @@ module Rfcxml
   module V3
     class Iref < Lutaml::Model::Serializable
       attribute :item, :string
-      attribute :subitem, :string, default: -> { "" }
+      attribute :subitem, :string
       attribute :primary, :string, default: -> { "false" }
       attribute :pn, :string
 
       xml do
-        root "iref"
+        element "iref"
 
         map_attribute "item", to: :item
-        map_attribute "subitem", to: :subitem
+        map_attribute "subitem", to: :subitem,
+                                 value_map: { to: { empty: :empty } }
         map_attribute "primary", to: :primary
         map_attribute "pn", to: :pn
       end

data/lib/rfcxml/v3/keyword.rb

@@ -8,7 +8,7 @@ module Rfcxml
       attribute :content, :string
 
       xml do
-        root "keyword"
+        element "keyword"
 
         map_content to: :content
       end

data/lib/rfcxml/v3/li.rb

@@ -35,7 +35,8 @@ module Rfcxml
       attribute :derived_counter, :string
 
       xml do
-        root "li", mixed: true
+        element "li"
+        mixed_content
 
         map_content to: :content
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/link.rb

@@ -9,7 +9,7 @@ module Rfcxml
       attribute :rel, :string
 
       xml do
-        root "link"
+        element "link"
 
         map_attribute "href", to: :href
         map_attribute "rel", to: :rel

data/lib/rfcxml/v3/list.rb

@@ -12,7 +12,8 @@ module Rfcxml
       attribute :text, "Rfcxml::V3::Text", collection: true
 
       xml do
-        root "list"
+        element "list"
+        ordered
 
         map_attribute "style", to: :style
         map_attribute "hangIndent", to: :hang_indent

data/lib/rfcxml/v3/middle.rb

@@ -8,7 +8,8 @@ module Rfcxml
       attribute :section, Section, collection: true
 
       xml do
-        root "middle"
+        element "middle"
+        ordered
 
         map_element "section", to: :section
       end

data/lib/rfcxml/v3/name.rb

@@ -21,7 +21,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "name"
+        element "name"
+        mixed_content
 
         map_content to: :content
         map_attribute "slugifiedName", to: :slugified_name

data/lib/rfcxml/v3/note.rb

@@ -15,7 +15,8 @@ module Rfcxml
       attribute :ul, Ul, collection: true
 
       xml do
-        root "note"
+        element "note"
+        ordered
 
         map_attribute "title", to: :title
         map_attribute "pn", to: :pn

data/lib/rfcxml/v3/ol.rb

@@ -9,13 +9,16 @@ module Rfcxml
       attribute :type, :string, default: -> { "1" }
       attribute :start, :string, default: -> { "1" }
       attribute :group, :string
-      attribute :spacing, :string, default: -> { "normal" }
+      attribute :spacing, :string,
+                values: %w[normal compact],
+                default: -> { "normal" }
       attribute :indent, :string, default: -> { "adaptive" }
       attribute :pn, :string
       attribute :li, Li, collection: true
 
       xml do
-        root "ol"
+        element "ol"
+        ordered
 
         map_attribute "anchor", to: :anchor
         map_attribute "type", to: :type

data/lib/rfcxml/v3/organization.rb

@@ -9,15 +9,20 @@ module Rfcxml
       attribute :abbrev, :string
       attribute :ascii, :string
       attribute :ascii_abbrev, :string
-      attribute :show_on_front_page, :string, default: -> { "true" }
+      attribute :show_on_front_page, :string,
+                values: %w[true false],
+                default: -> { "true" }
 
       xml do
-        root "organization"
+        element "organization"
+        mixed_content
 
         map_content to: :content
-        map_attribute "abbrev", to: :abbrev
-        map_attribute "ascii", to: :ascii
-        map_attribute "asciiAbbrev", to: :ascii_abbrev
+        map_attribute "abbrev", to: :abbrev,
+                                value_map: { to: { empty: :empty } }
+        map_attribute "ascii", to: :ascii, value_map: { to: { empty: :empty } }
+        map_attribute "asciiAbbrev", to: :ascii_abbrev,
+                                     value_map: { to: { empty: :empty } }
         map_attribute "showOnFrontPage", to: :show_on_front_page
       end
     end

data/lib/rfcxml/v3/phone.rb

@@ -8,7 +8,7 @@ module Rfcxml
       attribute :content, :string
 
       xml do
-        root "phone"
+        element "phone"
 
         map_content to: :content
       end

data/lib/rfcxml/v3/pobox.rb

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

data/lib/rfcxml/v3/postal.rb

@@ -17,7 +17,8 @@ module Rfcxml
       attribute :postal_line, PostalLine, collection: true
 
       xml do
-        root "postal"
+        element "postal"
+        ordered
 
         map_element "extaddr", to: :extaddr
         map_element "street", to: :street

data/lib/rfcxml/v3/postal_line.rb

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

data/lib/rfcxml/v3/postamble.rb

@@ -13,7 +13,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "postamble"
+        element "postamble"
+        ordered
 
         map_content to: :content
         map_element "cref", to: :cref

data/lib/rfcxml/v3/preamble.rb

@@ -21,7 +21,8 @@ module Rfcxml
       attribute :xref, Xref, collection: true
 
       xml do
-        root "preamble"
+        element "preamble"
+        ordered
 
         map_content to: :content
         map_element "bcp14", to: :bcp14