sts 0.3.3 → 0.4.0

data/lib/sts/tbx_iso_tml/mstyle.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "mspace"
 
 module Sts
   module TbxIsoTml
     class Mstyle < Lutaml::Model::Serializable
-      attribute :mathvariant, Lutaml::Model::Type::String
-      attribute :mstyle, Mstyle
-      attribute :mspace, Mspace, collection: true
-      attribute :mi, Lutaml::Model::Type::String, collection: true
-      attribute :mn, Lutaml::Model::Type::String, collection: true
-      attribute :mo, Lutaml::Model::Type::String, collection: true
+      attribute :mathvariant, :string
+      attribute :mstyle, ::Sts::TbxIsoTml::Mstyle
+      attribute :mspace, ::Sts::TbxIsoTml::Mspace, collection: true
+      attribute :mi, :string, collection: true
+      attribute :mn, :string, collection: true
+      attribute :mo, :string, collection: true
 
       xml do
-        root "mstyle", mixed: true
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "mstyle"
+        mixed_content
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_attribute "mathvariant", to: :mathvariant
         map_element "mi", to: :mi

data/lib/sts/tbx_iso_tml/msub.rb

@@ -1,25 +1,20 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "mstyle"
-require_relative "mrow"
-require_relative "mspace"
-
 module Sts
   module TbxIsoTml
     class Msub < Lutaml::Model::Serializable
-      attribute :mstyle, Mstyle, collection: true
-      attribute :mrow, Mrow
-      attribute :mspace, Mspace
-      attribute :mo, Lutaml::Model::Type::String, collection: true
-      attribute :mi, Lutaml::Model::Type::String, collection: true
-      attribute :mn, Lutaml::Model::Type::String, collection: true
-      attribute :mtext, Lutaml::Model::Type::String, collection: true
+      attribute :mstyle, ::Sts::TbxIsoTml::Mstyle, collection: true
+      attribute :mrow, ::Sts::TbxIsoTml::Mrow
+      attribute :mspace, ::Sts::TbxIsoTml::Mspace
+      attribute :mo, :string, collection: true
+      attribute :mi, :string, collection: true
+      attribute :mn, :string, collection: true
+      attribute :mtext, :string, collection: true
 
       xml do
-        root "msub", mixed: true
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "msub"
+        mixed_content
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_element "mstyle", to: :mstyle
         map_element "mo", to: :mo

data/lib/sts/tbx_iso_tml/msup.rb

@@ -1,21 +1,16 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "mstyle"
-require_relative "mrow"
-
 module Sts
   module TbxIsoTml
     class Msup < Lutaml::Model::Serializable
-      attribute :mstyle, Mstyle
-      attribute :mrow, Mrow
-      attribute :mi, Lutaml::Model::Type::String
-      attribute :mn, Lutaml::Model::Type::String, collection: true
+      attribute :mstyle, ::Sts::TbxIsoTml::Mstyle
+      attribute :mrow, ::Sts::TbxIsoTml::Mrow
+      attribute :mi, :string
+      attribute :mn, :string, collection: true
 
       xml do
-        root "msup"
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "msup"
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_element "mstyle", to: :mstyle
         map_element "mi", to: :mi

data/lib/sts/tbx_iso_tml/munder.rb

@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "mrow"
-
 module Sts
   module TbxIsoTml
     class Munder < Lutaml::Model::Serializable
-      attribute :mrow, Mrow, collection: true
+      attribute :mrow, ::Sts::TbxIsoTml::Mrow, collection: true
 
       xml do
-        root "munder"
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "munder"
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_element "mrow", to: :mrow
       end

data/lib/sts/tbx_iso_tml/munderover.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "mrow"
-
 module Sts
   module TbxIsoTml
     class Munderover < Lutaml::Model::Serializable
-      attribute :mo, Lutaml::Model::Type::String
-      attribute :mi, Lutaml::Model::Type::String
-      attribute :mrow, Mrow, collection: true
+      attribute :mo, :string
+      attribute :mi, :string
+      attribute :mrow, ::Sts::TbxIsoTml::Mrow, collection: true
 
       xml do
-        root "munderover", mixed: true
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "munderover"
+        mixed_content
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_element "mo", to: :mo
         map_element "mi", to: :mi

data/lib/sts/tbx_iso_tml/normative_authorization.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class NormativeAuthorization < Lutaml::Model::Serializable
-      attribute :value, Lutaml::Model::Type::String,
+      attribute :value, :string,
                 values: %w[admittedTerm preferredTerm deprecatedTerm]
 
       xml do
-        root "normativeAuthorization"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "normativeAuthorization"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "value", to: :value
       end

data/lib/sts/tbx_iso_tml/note.rb

@@ -1,46 +1,34 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "table_wrap"
-require_relative "entailed_term"
-require_relative "math"
-require_relative "sup"
-require_relative "italic"
-require_relative "xref"
-require_relative "../niso_sts/list"
-require_relative "../niso_sts/reference_standard"
-
 module Sts
   module TbxIsoTml
     class Note < Lutaml::Model::Serializable
-      attribute :id, Lutaml::Model::Type::String
-      attribute :value, Lutaml::Model::Type::String
-      attribute :table_wrap, Sts::TbxIsoTml::TableWrap
-      attribute :entailed_term, EntailedTerm, collection: true
-      attribute :math, Sts::TbxIsoTml::Math, collection: true
-      attribute :xref, Sts::TbxIsoTml::Xref
-      attribute :list, Sts::NisoSts::List
-      attribute :std, Sts::NisoSts::ReferenceStandard
-      attribute :sup, Sup
-      attribute :italic, Italic, collection: true
+      attribute :id, :string
+      attribute :value, :string
+      attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap
+      attribute :entailed_term, ::Sts::TbxIsoTml::EntailedTerm, collection: true
+      attribute :math, ::Sts::TbxIsoTml::Math, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref
+      attribute :list, ::Sts::NisoSts::List
+      attribute :std, ::Sts::NisoSts::ReferenceStandard
+      attribute :sup, ::Sts::TbxIsoTml::Sup
+      attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
-        root "note", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "note"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "id", to: :id
         map_content to: :value
         map_element "entailedTerm", to: :entailed_term
-        map_element "list", to: :list, namespace: nil, prefix: nil
-        map_element "table-wrap", to: :table_wrap, namespace: nil, prefix: nil
-        map_element "std", to: :std, namespace: nil, prefix: nil
-        map_element "sup", to: :sup, namespace: nil, prefix: nil
-        map_element "italic", to: :italic, namespace: nil, prefix: nil
-        map_element "xref", to: :xref, namespace: nil, prefix: nil
-        map_element "math", to: :math,
-                            namespace: "http://www.w3.org/1998/Math/MathML",
-                            prefix: "mml"
+        map_element "list", to: :list
+        map_element "table-wrap", to: :table_wrap
+        map_element "std", to: :std
+        map_element "sup", to: :sup
+        map_element "italic", to: :italic
+        map_element "xref", to: :xref
+        map_element "math", to: :math
       end
     end
   end

data/lib/sts/tbx_iso_tml/part_of_speech.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class PartOfSpeech < Lutaml::Model::Serializable
-      attribute :value, Lutaml::Model::Type::String,
+      attribute :value, :string,
                 values: %w[noun verb adj adv]
 
       xml do
-        root "partOfSpeech"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "partOfSpeech"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "value", to: :value
       end

data/lib/sts/tbx_iso_tml/pronunciation.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Sts
+  module TbxIsoTml
+    class Pronunciation < Lutaml::Model::Serializable
+      attribute :value, :string
+
+      xml do
+        element "pronunciation"
+        namespace ::Sts::Namespaces::TbxNamespace
+
+        map_content to: :value
+      end
+    end
+  end
+end

data/lib/sts/tbx_iso_tml/see.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class See < Lutaml::Model::Serializable
-      attribute :script, Lutaml::Model::Type::String
-      attribute :value, Lutaml::Model::Type::String
+      attribute :script, :string
+      attribute :value, :string
 
       xml do
-        root "see"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "see"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "script", to: :script
         map_content to: :value

data/lib/sts/tbx_iso_tml/semantics.rb

@@ -1,22 +1,18 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "mrow"
-require_relative "munder"
-
 module Sts
   module TbxIsoTml
     class Semantics < Lutaml::Model::Serializable
-      attribute :mrow, Mrow, collection: true
-      attribute :mo, Lutaml::Model::Type::String
-      attribute :mtext, Lutaml::Model::Type::String
-      attribute :munder, Sts::TbxIsoTml::Munder
-      attribute :content, Lutaml::Model::Type::String
+      attribute :mrow, ::Sts::TbxIsoTml::Mrow, collection: true
+      attribute :mo, :string
+      attribute :mtext, :string
+      attribute :munder, ::Sts::TbxIsoTml::Munder
+      attribute :content, :string
 
       xml do
-        root "semantics", mixed: true
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "semantics"
+        mixed_content
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_element "mrow", to: :mrow
         map_element "mo", to: :mo

data/lib/sts/tbx_iso_tml/source.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-require_relative "italic"
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Source < Lutaml::Model::Serializable
-      attribute :value, Lutaml::Model::Type::String
-      attribute :italic, Italic
+      attribute :value, :string
+      attribute :italic, ::Sts::TbxIsoTml::Italic
 
       xml do
-        root "source", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "source"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_content to: :value
-        map_element "italic", to: :italic, namespace: nil, prefix: nil
+        map_element "italic", to: :italic
       end
     end
   end

data/lib/sts/tbx_iso_tml/subject_field.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Sts
+  module TbxIsoTml
+    class SubjectField < Lutaml::Model::Serializable
+      attribute :value, :string
+
+      xml do
+        element "subjectField"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
+
+        map_content to: :value
+      end
+    end
+  end
+end

data/lib/sts/tbx_iso_tml/sup.rb

@@ -1,20 +1,17 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "xref"
 
 module Sts
   module TbxIsoTml
-    class Xref < Lutaml::Model::Serializable; end
-
     class Sup < Lutaml::Model::Serializable
-      attribute :value, Lutaml::Model::Type::String
-      attribute :xref, Xref
+      attribute :value, :string
+      attribute :xref, ::Sts::TbxIsoTml::Xref
 
       xml do
-        root "sup"
+        element "sup"
 
-        map_element "xref", to: :xref, namespace: nil, prefix: nil
+        map_element "xref", to: :xref
         map_content to: :value
       end
     end

data/lib/sts/tbx_iso_tml/table.rb

@@ -1,24 +1,18 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "col"
-require_relative "thead"
-require_relative "tbody"
-
 module Sts
   module TbxIsoTml
     class Table < Lutaml::Model::Serializable
-      attribute :col, Sts::TbxIsoTml::Col, collection: true
-      attribute :thead, Sts::TbxIsoTml::Thead
-      attribute :tbody, Sts::TbxIsoTml::Tbody
-      attribute :border, Lutaml::Model::Type::String
-      attribute :rules, Lutaml::Model::Type::String
-      attribute :frame, Lutaml::Model::Type::String
-      attribute :width, Lutaml::Model::Type::String
+      attribute :col, ::Sts::TbxIsoTml::Col, collection: true
+      attribute :thead, ::Sts::TbxIsoTml::Thead
+      attribute :tbody, ::Sts::TbxIsoTml::Tbody
+      attribute :border, :string
+      attribute :rules, :string
+      attribute :frame, :string
+      attribute :width, :string
 
       xml do
-        root "table"
+        element "table"
 
         map_attribute "border", to: :border
         map_attribute "rules", to: :rules

data/lib/sts/tbx_iso_tml/table_break.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class TableBreak < Lutaml::Model::Serializable

data/lib/sts/tbx_iso_tml/table_wrap.rb

@@ -1,26 +1,20 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "table"
-require_relative "table_wrap_foot"
-
 module Sts
   module TbxIsoTml
     class TableWrap < Lutaml::Model::Serializable
-      attribute :id, Lutaml::Model::Type::String
-      attribute :orientation, Lutaml::Model::Type::String
-      attribute :position, Lutaml::Model::Type::String
-      attribute :label, Lutaml::Model::Type::String
-      attribute :table, Sts::TbxIsoTml::Table, collection: true
-      attribute :table_wrap_foot, Sts::TbxIsoTml::TableWrapFoot
+      attribute :id, :string
+      attribute :orientation, :string
+      attribute :position, :string
+      attribute :label, :string
+      attribute :table, ::Sts::TbxIsoTml::Table, collection: true
+      attribute :table_wrap_foot, ::Sts::TbxIsoTml::TableWrapFoot
 
       # TODO: This require will cause a loop when defined in header
-      require_relative "../niso_sts/caption"
-      attribute :caption, Sts::NisoSts::Caption
+      attribute :caption, ::Sts::NisoSts::Caption
 
       xml do
-        root "table-wrap"
+        element "table-wrap"
 
         map_attribute "id", to: :id
         map_attribute "orientation", to: :orientation

data/lib/sts/tbx_iso_tml/table_wrap_foot.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "fn_group"
-
 module Sts
   module TbxIsoTml
     class TableWrapFoot < Lutaml::Model::Serializable
-      attribute :fn_group, Sts::TbxIsoTml::FnGroup
+      attribute :fn_group, ::Sts::TbxIsoTml::FnGroup
 
       xml do
-        root "table-wrap-foot"
+        element "table-wrap-foot"
 
         map_element "fn-group", to: :fn_group
       end

data/lib/sts/tbx_iso_tml/tbody.rb

@@ -1,21 +1,17 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "tr"
-
 module Sts
   module TbxIsoTml
     class Tbody < Lutaml::Model::Serializable
-      attribute :tr, Sts::TbxIsoTml::Tr, collection: true
-      attribute :char, Lutaml::Model::Type::String
-      attribute :charoff, Lutaml::Model::Type::String
-      attribute :valign, Lutaml::Model::Type::String
+      attribute :tr, ::Sts::TbxIsoTml::Tr, collection: true
+      attribute :char, :string
+      attribute :charoff, :string
+      attribute :valign, :string
 
       xml do
-        root "tbody"
+        element "tbody"
 
-        map_attribute "char", to: :char
+        map_attribute "char", to: :char, value_map: { to: { empty: :empty } }
         map_attribute "charoff", to: :charoff
         map_attribute "valign", to: :valign
 

data/lib/sts/tbx_iso_tml/td.rb

@@ -1,45 +1,34 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "italic"
-require_relative "xref"
-require_relative "bold"
-require_relative "../niso_sts/reference_standard"
-require_relative "../niso_sts/inline_formula"
-require_relative "../niso_sts/non_normative_note"
-require_relative "../niso_sts/graphic"
-require_relative "../niso_sts/def_list"
-require_relative "../niso_sts/paragraph"
-
 module Sts
   module TbxIsoTml
     class Td < Lutaml::Model::Serializable
-      attribute :content, Lutaml::Model::Type::String
-      attribute :align, Lutaml::Model::Type::String
-      attribute :scope, Lutaml::Model::Type::String
-      attribute :style, Lutaml::Model::Type::String
+      attribute :content, :string
+      attribute :align, :string
+      attribute :scope, :string
+      attribute :style, :string
       attribute :bold, Bold
       attribute :italic, Italic
-      attribute :content_type, Lutaml::Model::Type::String
-      attribute :char, Lutaml::Model::Type::String
-      attribute :charoff, Lutaml::Model::Type::String
-      attribute :colspan, Lutaml::Model::Type::String
-      attribute :rowspan, Lutaml::Model::Type::String
-      attribute :valign, Lutaml::Model::Type::String
-      attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
+      attribute :content_type, :string
+      attribute :char, :string
+      attribute :charoff, :string
+      attribute :colspan, :string
+      attribute :rowspan, :string
+      attribute :valign, :string
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
       attribute :non_normative_note,
-                Sts::NisoSts::NonNormativeNote,
+                ::Sts::NisoSts::NonNormativeNote,
                 collection: true
-      attribute :list, Sts::NisoSts::List
+      attribute :list, ::Sts::NisoSts::List
       attribute :xref, Xref, collection: true
-      attribute :std, Sts::NisoSts::ReferenceStandard
-      attribute :graphic, Sts::NisoSts::Graphic
-      attribute :def_list, Sts::NisoSts::DefList
-      attribute :paragraph, Sts::NisoSts::Paragraph
+      attribute :std, ::Sts::NisoSts::ReferenceStandard
+      attribute :graphic, ::Sts::NisoSts::Graphic
+      attribute :def_list, ::Sts::NisoSts::DefList
+      attribute :paragraph, ::Sts::NisoSts::Paragraph
 
       xml do
-        root "td", mixed: true
+        element "td"
+        mixed_content
 
         map_content to: :content
 
@@ -47,7 +36,7 @@ module Sts
         map_attribute "scope", to: :scope
         map_attribute "style", to: :style
         map_attribute "content-type", to: :content_type
-        map_attribute "char", to: :char
+        map_attribute "char", to: :char, value_map: { to: { empty: :empty } }
         map_attribute "charoff", to: :charoff
         map_attribute "colspan", to: :colspan
         map_attribute "rowspan", to: :rowspan