rfcxml 0.2.1 → 0.4.0

data/lib/rfcxml/v3/figure.rb

@@ -2,27 +2,23 @@
 
 require "lutaml/model"
 
-require_relative "artset"
-require_relative "artwork"
-require_relative "iref"
-require_relative "name"
-require_relative "postamble"
-require_relative "preamble"
-require_relative "sourcecode"
-
 module Rfcxml
   module V3
     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
@@ -32,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

@@ -2,18 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "abstract"
-require_relative "area"
-require_relative "author"
-require_relative "boilerplate"
-require_relative "date"
-require_relative "keyword"
-require_relative "note"
-require_relative "series_info"
-require_relative "title"
-require_relative "toc"
-require_relative "workgroup"
-
 module Rfcxml
   module V3
     class Front < Lutaml::Model::Serializable
@@ -30,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

@@ -2,35 +2,8 @@
 
 require "lutaml/model"
 
-require_relative "artset"
-require_relative "artwork"
-require_relative "bcp14"
-require_relative "blockquote"
-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 "table"
-require_relative "tt"
-require_relative "u"
-# require_relative "ul"
-require_relative "xref"
-
 module Rfcxml
   module V3
-    class Ul < Lutaml::Model::Serializable; end
-    class Ol < Lutaml::Model::Serializable; end
-
     class Li < Lutaml::Model::Serializable
       attribute :content, :string
       attribute :anchor, :string
@@ -62,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

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "text"
-
 module Rfcxml
   module V3
     class List < Lutaml::Model::Serializable
@@ -11,10 +9,11 @@ module Rfcxml
       attribute :hang_indent, :string
       attribute :counter, :string
       attribute :pn, :string
-      attribute :text, Text, collection: true
+      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

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

data/lib/rfcxml/v3/name.rb

@@ -2,19 +2,6 @@
 
 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 "tt"
-require_relative "xref"
-
 module Rfcxml
   module V3
     class Name < Lutaml::Model::Serializable
@@ -34,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

@@ -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
@@ -21,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

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "li"
-
 module Rfcxml
   module V3
     class Ol < Lutaml::Model::Serializable
@@ -11,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

@@ -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
@@ -28,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

@@ -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
@@ -19,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

@@ -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
@@ -35,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

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
@@ -13,7 +10,8 @@ module Rfcxml
       include XrefText
 
       xml do
-        root "refcontent"
+        element "refcontent"
+        ordered
 
         map_content to: :content
         map_element "bcp14", to: :bcp14

data/lib/rfcxml/v3/reference.rb

@@ -2,20 +2,15 @@
 
 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
       attribute :anchor, :string
       attribute :derived_anchor, :string
       attribute :target, :string
-      # attribute :quote_title, :string, default: -> { "true" }
-      attribute :quote_title, :string
+      attribute :quote_title, :string,
+                values: %w[true false],
+                default: -> { "true" }
       attribute :stream, :string
       attribute :front, Front
       attribute :annotation, Annotation, collection: true
@@ -24,11 +19,13 @@ module Rfcxml
       attribute :series_info, SeriesInfo, collection: true
 
       xml do
-        root "reference", mixed: true
+        element "reference"
+        mixed_content
 
         map_attribute "anchor", to: :anchor
         map_attribute "derivedAnchor", to: :derived_anchor
-        map_attribute "target", to: :target
+        map_attribute "target", to: :target,
+                                value_map: { to: { empty: :empty } }
         map_attribute "quoteTitle", to: :quote_title
         # map_attribute "quote-title", to: :quote_title
         map_element "stream", to: :stream

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
@@ -13,7 +11,8 @@ module Rfcxml
       attribute :reference, Reference, collection: true
 
       xml do
-        root "referencegroup"
+        element "referencegroup"
+        ordered
 
         map_attribute "anchor", to: :anchor
         map_attribute "derivedAnchor", to: :derived_anchor

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
@@ -18,7 +14,8 @@ module Rfcxml
       attribute :referencegroup, Referencegroup, collection: true
 
       xml do
-        root "references"
+        element "references"
+        ordered
 
         map_attribute "pn", to: :pn
         map_attribute "anchor", to: :anchor

data/lib/rfcxml/v3/region.rb

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

data/lib/rfcxml/v3/relref.rb

@@ -14,7 +14,7 @@ module Rfcxml
       attribute :derived_link, :string
 
       xml do
-        root "relref"
+        element "relref"
 
         map_content to: :content
         map_attribute "target", to: :target