sts 0.3.4 → 0.4.0

data/lib/sts/tbx_iso_tml/external_graphic.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class ExternalGraphic < Lutaml::Model::Serializable
       attribute :target, :string
 
       xml do
-        root "xGraphic"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "xGraphic"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "xtarget", to: :target
       end

data/lib/sts/tbx_iso_tml/external_source.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class ExternalSource < Lutaml::Model::Serializable
@@ -9,8 +7,8 @@ module Sts
       attribute :value, :string
 
       xml do
-        root "xSource"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "xSource"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "xtarget", to: :target
         map_content to: :value

data/lib/sts/tbx_iso_tml/fn.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../niso_sts/paragraph"
-
 module Sts
   module TbxIsoTml
     class Fn < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :label, :string
-      attribute :p, Sts::NisoSts::Paragraph
+      attribute :p, ::Sts::NisoSts::Paragraph
 
       xml do
-        root "fn"
+        element "fn"
 
         map_attribute "id", to: :id
         map_element "label", to: :label

data/lib/sts/tbx_iso_tml/fn_group.rb

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

data/lib/sts/tbx_iso_tml/geographical_usage.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class GeographicalUsage < Lutaml::Model::Serializable
       attribute :value, :string
 
       xml do
-        root "geographicalUsage"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "geographicalUsage"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_content to: :value
       end

data/lib/sts/tbx_iso_tml/grammatical_gender.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class GrammaticalGender < Lutaml::Model::Serializable
@@ -9,8 +7,8 @@ module Sts
                 values: %w[masculine feminine neuter]
 
       xml do
-        root "grammaticalGender"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "grammaticalGender"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "value", to: :value
       end

data/lib/sts/tbx_iso_tml/grammatical_number.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class GrammaticalNumber < Lutaml::Model::Serializable
@@ -9,8 +7,8 @@ module Sts
                 values: %w[singular plural]
 
       xml do
-        root "grammaticalNumber"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "grammaticalNumber"
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_attribute "value", to: :value
       end

data/lib/sts/tbx_iso_tml/italic.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Italic < Lutaml::Model::Serializable
@@ -9,7 +7,8 @@ module Sts
       attribute :sub, :string
 
       xml do
-        root "italic", mixed: true
+        element "italic"
+        mixed_content
         namespace nil, nil
 
         map_content to: :value

data/lib/sts/tbx_iso_tml/lang_set.rb

@@ -1,41 +1,27 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "note"
-require_relative "example"
-require_relative "definition"
-require_relative "see"
-require_relative "source"
-require_relative "external_source"
-require_relative "term_information_group"
-
 module Sts
   module TbxIsoTml
-    class Definition < Lutaml::Model::Serializable; end
-    class Note < Lutaml::Model::Serializable; end
-    class Caption < Lutaml::Model::Serializable; end
-
     class LangSet < Lutaml::Model::Serializable
-      attribute :lang, :string
-      attribute :definition, Sts::TbxIsoTml::Definition, collection: true
-      attribute :note, Note, collection: true
-      attribute :example, Example, collection: true
-      attribute :tig, TermInformationGroup, collection: true
-      attribute :see, See, collection: true
-      attribute :source, Source, collection: true
-      attribute :x_source, ExternalSource, collection: true
-      attribute :cross_reference, :string, collection: true
-      attribute :subject_field, :string
-      # attribute :x_graphic, ExternalGraphic, collection: true
+      attribute :lang, Lutaml::Xml::W3c::XmlLangType
+      attribute :definition, ::Sts::TbxIsoTml::Definition, collection: true
+      attribute :note, ::Sts::TbxIsoTml::Note, collection: true
+      attribute :example, ::Sts::TbxIsoTml::Example, collection: true
+      attribute :tig, ::Sts::TbxIsoTml::TermInformationGroup, collection: true
+      attribute :see, ::Sts::TbxIsoTml::See, collection: true
+      attribute :source, ::Sts::TbxIsoTml::Source, collection: true
+      attribute :x_source, ::Sts::TbxIsoTml::ExternalSource, collection: true
+      attribute :cross_reference, ::Sts::TbxIsoTml::CrossReference,
+                collection: true
+      attribute :subject_field, ::Sts::TbxIsoTml::SubjectField, collection: true
+      # attribute :x_graphic, ::Sts::TbxIsoTml::ExternalGraphic, collection: true
 
       xml do
-        root "langSet", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "langSet"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
-        map_attribute "lang", to: :lang,
-                              namespace: "http://www.w3.org/XML/1998/namespace",
-                              prefix: "xml"
+        map_attribute "lang", to: :lang
         map_element "definition", to: :definition
         map_element "source", to: :source
         map_element "example", to: :example

data/lib/sts/tbx_iso_tml/math.rb

@@ -1,42 +1,29 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "semantics"
-require_relative "mrow"
-require_relative "msub"
-require_relative "msup"
-require_relative "mstyle"
-require_relative "mspace"
-require_relative "mfrac"
-require_relative "mfenced"
-require_relative "munderover"
-
 module Sts
   module TbxIsoTml
-    class Mfenced < Lutaml::Model::Serializable; end
-
     class Math < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content, :string
       attribute :display, :string
-      attribute :mrow, Mrow
-      attribute :msub, Msub, collection: true
-      attribute :msup, Msup
+      attribute :mrow, ::Sts::TbxIsoTml::Mrow
+      attribute :msub, ::Sts::TbxIsoTml::Msub, collection: true
+      attribute :msup, ::Sts::TbxIsoTml::Msup
       attribute :mn, :string, collection: true
       attribute :mo, :string, collection: true
       attribute :mi, :string
       attribute :mtext, :string
-      attribute :semantics, Semantics
-      attribute :mstyle, Mstyle, collection: true
-      attribute :mfenced, Mfenced, collection: true
-      attribute :mspace, Mspace, collection: true
-      attribute :mfrac, Mfrac, collection: true
-      attribute :munderover, Munderover, collection: true
+      attribute :semantics, ::Sts::TbxIsoTml::Semantics
+      attribute :mstyle, ::Sts::TbxIsoTml::Mstyle, collection: true
+      attribute :mfenced, ::Sts::TbxIsoTml::Mfenced, collection: true
+      attribute :mspace, ::Sts::TbxIsoTml::Mspace, collection: true
+      attribute :mfrac, ::Sts::TbxIsoTml::Mfrac, collection: true
+      attribute :munderover, ::Sts::TbxIsoTml::Munderover, collection: true
 
       xml do
-        root "math", mixed: true
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "math"
+        mixed_content
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_attribute "id", to: :id
 

data/lib/sts/tbx_iso_tml/mfenced.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-require_relative "mspace"
-require_relative "msub"
-require_relative "mstyle"
-require_relative "mfrac"
-
 module Sts
   module TbxIsoTml
     class Mfenced < Lutaml::Model::Serializable
@@ -17,14 +10,15 @@ module Sts
       attribute :mn, :string, collection: true
       attribute :mi, :string
       attribute :mtext, :string
-      attribute :mspace, Mspace, collection: true
-      attribute :msub, Msub, collection: true
-      attribute :mstyle, Mstyle, collection: true
-      attribute :mfrac, Mfrac, collection: true
+      attribute :mspace, ::Sts::TbxIsoTml::Mspace, collection: true
+      attribute :msub, ::Sts::TbxIsoTml::Msub, collection: true
+      attribute :mstyle, ::Sts::TbxIsoTml::Mstyle, collection: true
+      attribute :mfrac, ::Sts::TbxIsoTml::Mfrac, collection: true
 
       xml do
-        root "mfenced", mixed: true
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "mfenced"
+        mixed_content
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_attribute "separators", to: :separators,
                                     value_map: { to: { empty: :empty } }

data/lib/sts/tbx_iso_tml/mfrac.rb

@@ -1,24 +1,21 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "mrow"
-require_relative "mstyle"
 
 module Sts
   module TbxIsoTml
-    class Mrow < Lutaml::Model::Serializable; end
-
     class Mfrac < Lutaml::Model::Serializable
-      attribute :mrow, Mrow, collection: true
-      attribute :mstyle, Mstyle, collection: true
+      attribute :mrow, ::Sts::TbxIsoTml::Mrow, collection: true
+      attribute :mstyle, ::Sts::TbxIsoTml::Mstyle, collection: true
       attribute :bevelled, :string
       attribute :linethickness, :string
       attribute :mn, :string, collection: true
       attribute :mtext, :string, collection: true
 
       xml do
-        root "mfrac", mixed: true
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "mfrac"
+        mixed_content
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_attribute "bevelled", to: :bevelled
         map_attribute "linethickness", to: :linethickness

data/lib/sts/tbx_iso_tml/mi.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "mstyle"
 
 module Sts
   module TbxIsoTml
@@ -9,8 +8,8 @@ module Sts
       attribute :content, :string
 
       xml do
-        root "mi"
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "mi"
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_content to: :content
       end

data/lib/sts/tbx_iso_tml/mrow.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "mfrac"
-require_relative "mstyle"
-require_relative "msub"
-require_relative "msup"
-require_relative "mspace"
-require_relative "mfenced"
 
 module Sts
   module TbxIsoTml
@@ -16,17 +10,18 @@ module Sts
       attribute :mi, :string, collection: true
       attribute :mn, :string, collection: true
       attribute :mtext, :string, collection: true
-      attribute :mrow, Mrow
-      attribute :mfrac, Mfrac, collection: true
-      attribute :mstyle, Mstyle, collection: true
-      attribute :msub, Msub, collection: true
-      attribute :msup, Msup
-      attribute :mfenced, Mfenced, collection: true
-      attribute :mspace, Mspace, collection: true
+      attribute :mrow, ::Sts::TbxIsoTml::Mrow
+      attribute :mfrac, ::Sts::TbxIsoTml::Mfrac, collection: true
+      attribute :mstyle, ::Sts::TbxIsoTml::Mstyle, collection: true
+      attribute :msub, ::Sts::TbxIsoTml::Msub, collection: true
+      attribute :msup, ::Sts::TbxIsoTml::Msup
+      attribute :mfenced, ::Sts::TbxIsoTml::Mfenced, collection: true
+      attribute :mspace, ::Sts::TbxIsoTml::Mspace, collection: true
 
       xml do
-        root "mrow", mixed: true
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "mrow"
+        mixed_content
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_element "mo", to: :mo
         map_element "mi", to: :mi

data/lib/sts/tbx_iso_tml/mspace.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Mspace < Lutaml::Model::Serializable
       attribute :width, :string
 
       xml do
-        root "mspace"
-        namespace "http://www.w3.org/1998/Math/MathML", "mml"
+        element "mspace"
+        namespace ::Sts::Namespaces::MathmlNamespace
 
         map_attribute "width", to: :width
       end

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, :string
-      attribute :mstyle, Mstyle
-      attribute :mspace, Mspace, collection: true
+      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 :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 :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, :string
       attribute :mi, :string
-      attribute :mrow, Mrow, collection: true
+      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,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class NormativeAuthorization < Lutaml::Model::Serializable
@@ -9,8 +7,8 @@ module Sts
                 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, :string
       attribute :value, :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 :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,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class PartOfSpeech < Lutaml::Model::Serializable
@@ -9,8 +7,8 @@ module Sts
                 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