rfcxml 0.2.0 → 0.3.0

data/lib/rfcxml/v3/figure.rb

@@ -2,14 +2,6 @@
 
 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
@@ -44,13 +36,11 @@ module Rfcxml
         map_attribute "alt", to: :alt
         map_attribute "width", to: :width
         map_attribute "height", to: :height
-        map_element "name", to: :name
-        map_element "iref", to: :iref
-        map_element "preamble", to: :preamble
-        map_element "artset", to: :artset
-        map_element "artwork", to: :artwork
-        map_element "sourcecode", to: :sourcecode
-        map_element "postamble", to: :postamble
+
+        %w[name iref preamble artset artwork sourcecode
+           postamble].each do |element|
+          map_element element, to: element.to_sym
+        end
       end
     end
   end

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

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
@@ -68,29 +41,11 @@ module Rfcxml
         map_attribute "anchor", to: :anchor
         map_attribute "derivedCounter", to: :derived_counter
         map_attribute "pn", to: :pn
-        map_element "artset", to: :artset
-        map_element "artwork", to: :artwork
-        map_element "blockquote", to: :blockquote
-        map_element "dl", to: :dl
-        map_element "figure", to: :figure
-        map_element "ol", to: :ol
-        map_element "sourcecode", to: :sourcecode
-        map_element "t", to: :t
-        map_element "table", to: :table
-        map_element "ul", to: :ul
-        map_element "bcp14", to: :bcp14
-        map_element "br", to: :br
-        map_element "cref", to: :cref
-        map_element "em", to: :em
-        map_element "eref", to: :eref
-        map_element "iref", to: :iref
-        map_element "relref", to: :relref
-        map_element "strong", to: :strong
-        map_element "sub", to: :sub
-        map_element "sup", to: :sup
-        map_element "tt", to: :tt
-        map_element "u", to: :u
-        map_element "xref", to: :xref
+
+        %w[artset artwork blockquote dl figure ol sourcecode t table ul bcp14
+           br cref em eref iref relref strong sub sup tt u xref].each do |element|
+          map_element element, to: element.to_sym
+        end
       end
     end
   end

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,7 +9,7 @@ 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"

data/lib/rfcxml/v3/middle.rb

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

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

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,11 +59,11 @@ 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_element "link", to: :link
-        map_element "front", to: :front
-        map_element "middle", to: :middle
-        map_element "back", to: :back
+        map_attribute "lang", to: :lang
+
+        %w[link front middle back].each do |element|
+          map_element element, to: element.to_sym
+        end
       end
     end
   end

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/sourcecode.rb

@@ -20,8 +20,8 @@ module Rfcxml
         map_content to: :content
         map_attribute "anchor", to: :anchor
         map_attribute "pn", to: :pn
-        map_attribute "name", to: :name
-        map_attribute "type", to: :type
+        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

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
@@ -62,27 +40,11 @@ module Rfcxml
         map_attribute "colspan", to: :colspan
         map_attribute "rowspan", to: :rowspan
         map_attribute "align", to: :align
-        map_element "artset", to: :artset
-        map_element "artwork", to: :artwork
-        map_element "dl", to: :dl
-        map_element "figure", to: :figure
-        map_element "ol", to: :ol
-        map_element "sourcecode", to: :sourcecode
-        map_element "t", to: :t
-        map_element "ul", to: :ul
-        map_element "bcp14", to: :bcp14
-        map_element "br", to: :br
-        map_element "cref", to: :cref
-        map_element "em", to: :em
-        map_element "eref", to: :eref
-        map_element "iref", to: :iref
-        map_element "relref", to: :relref
-        map_element "strong", to: :strong
-        map_element "sub", to: :sub
-        map_element "sup", to: :sup
-        map_element "tt", to: :tt
-        map_element "u", to: :u
-        map_element "xref", to: :xref
+
+        %w[artset artwork dl figure ol sourcecode t ul bcp14 br cref em eref
+           iref relref strong sub sup tt u xref].each do |element|
+          map_element element, to: element.to_sym
+        end
       end
     end
   end

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