sts 0.3.3 → 0.4.0

data/lib/sts/tbx_iso_tml/caption.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Caption < Lutaml::Model::Serializable
-      attribute :p, Lutaml::Model::Type::String
+      attribute :p, :string
 
       xml do
-        root "caption"
+        element "caption"
 
         map_element "p", to: :p
       end

data/lib/sts/tbx_iso_tml/col.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Col < Lutaml::Model::Serializable
-      attribute :width, Lutaml::Model::Type::String
-      attribute :char, Lutaml::Model::Type::String
-      attribute :charoff, Lutaml::Model::Type::String
-      attribute :span, Lutaml::Model::Type::String
+      attribute :width, :string
+      attribute :char, :string
+      attribute :charoff, :string
+      attribute :span, :string
 
       xml do
-        root "col"
+        element "col"
 
         map_attribute "width", to: :width
-        map_attribute "char", to: :char
+        map_attribute "char", to: :char, value_map: { to: { empty: :empty } }
         map_attribute "charoff", to: :charoff
         map_attribute "span", to: :span
       end

data/lib/sts/tbx_iso_tml/cross_reference.rb

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

data/lib/sts/tbx_iso_tml/definition.rb

@@ -1,38 +1,30 @@
 # frozen_string_literal: true
 
-require_relative "entailed_term"
-require_relative "note"
-require_relative "italic"
-require_relative "math"
-require_relative "../niso_sts/list"
-require_relative "../niso_sts/reference_standard"
-
 module Sts
   module TbxIsoTml
     class Definition < Lutaml::Model::Serializable
-      attribute :entailed_term, EntailedTerm, collection: true
-      attribute :note, Note
-      attribute :value, Lutaml::Model::Type::String
-      attribute :italic, Italic
-      attribute :math, Sts::TbxIsoTml::Math
-      attribute :sub, Lutaml::Model::Type::String
-      attribute :list, Sts::NisoSts::List, collection: true
-      attribute :std, Sts::NisoSts::ReferenceStandard, collection: true
+      attribute :entailed_term, ::Sts::TbxIsoTml::EntailedTerm, collection: true
+      attribute :note, ::Sts::TbxIsoTml::Note
+      attribute :value, :string
+      attribute :italic, ::Sts::TbxIsoTml::Italic
+      attribute :math, ::Sts::TbxIsoTml::Math
+      attribute :sub, :string
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
 
       xml do
-        root "definition", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "definition"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_content to: :value
         map_element "entailedTerm", to: :entailed_term
         map_element "note", to: :note
-        map_element "italic", to: :italic, namespace: nil, prefix: nil
-        map_element "sub", to: :sub, namespace: nil, prefix: nil
-        map_element "list", to: :list, namespace: nil, prefix: nil
-        map_element "std", to: :std, namespace: nil, prefix: nil
-        map_element "math", to: :math,
-                            namespace: "http://www.w3.org/1998/Math/MathML",
-                            prefix: "mml"
+        map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "list", to: :list
+        map_element "std", to: :std
+        map_element "math", to: :math
       end
     end
   end

data/lib/sts/tbx_iso_tml/entailed_term.rb

@@ -1,24 +1,20 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class EntailedTerm < Lutaml::Model::Serializable
-      attribute :target, Lutaml::Model::Type::String
-      attribute :xtarget, Lutaml::Model::Type::String
-      attribute :lang, Lutaml::Model::Type::String
-      attribute :value, Lutaml::Model::Type::String
+      attribute :target, :string
+      attribute :xtarget, :string
+      attribute :lang, Lutaml::Xml::W3c::XmlLangType
+      attribute :value, :string
 
       xml do
-        root "entailedTerm"
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "entailedTerm"
+        namespace ::Sts::Namespaces::TbxNamespace
 
-        map_attribute :target, to: :target
-        map_attribute :xtarget, to: :xtarget
-        map_attribute :lang, to: :lang,
-                             namespace: "http://www.w3.org/XML/1998/namespace",
-                             prefix: "xml"
+        map_attribute "target", to: :target
+        map_attribute "xtarget", to: :xtarget
+        map_attribute "lang", to: :lang
         map_content to: :value
       end
     end

data/lib/sts/tbx_iso_tml/example.rb

@@ -1,30 +1,26 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "entailed_term"
-
-require_relative "../niso_sts/inline_formula"
 
 module Sts
   module TbxIsoTml
     class Example < Lutaml::Model::Serializable
-      attribute :id, Lutaml::Model::Type::String
-      attribute :value, Lutaml::Model::Type::String
-      attribute :entailed_term, EntailedTerm, collection: true
-      attribute :inline_formula, Sts::NisoSts::InlineFormula
+      attribute :id, :string
+      attribute :value, :string
+      attribute :entailed_term, ::Sts::TbxIsoTml::EntailedTerm, collection: true
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula
 
       xml do
-        root "example", mixed: true
-        namespace "urn:iso:std:iso:30042:ed-1", "tbx"
+        element "example"
+        mixed_content
+        namespace ::Sts::Namespaces::TbxNamespace
 
         map_content to: :value
 
         map_attribute "id", to: :id
 
         map_element "entailedTerm", to: :entailed_term
-        map_element "inline-formula", to: :inline_formula,
-                                      namespace: nil,
-                                      prefix: nil
+        map_element "inline-formula", to: :inline_formula
       end
     end
   end

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, Lutaml::Model::Type::String
+      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,16 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class ExternalSource < Lutaml::Model::Serializable
-      attribute :target, Lutaml::Model::Type::String
-      attribute :value, Lutaml::Model::Type::String
+      attribute :target, :string
+      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, Lutaml::Model::Type::String
-      attribute :label, Lutaml::Model::Type::String
-      attribute :p, Sts::NisoSts::Paragraph
+      attribute :id, :string
+      attribute :label, :string
+      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, Lutaml::Model::Type::String
+      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,16 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class GrammaticalGender < Lutaml::Model::Serializable
-      attribute :value, Lutaml::Model::Type::String,
+      attribute :value, :string,
                 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,16 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class GrammaticalNumber < Lutaml::Model::Serializable
-      attribute :value, Lutaml::Model::Type::String,
+      attribute :value, :string,
                 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,15 +1,14 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module TbxIsoTml
     class Italic < Lutaml::Model::Serializable
-      attribute :value, Lutaml::Model::Type::String
-      attribute :sub, Lutaml::Model::Type::String
+      attribute :value, :string
+      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, Lutaml::Model::Type::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, Lutaml::Model::Type::String, collection: true
-      attribute :subject_field, Lutaml::Model::Type::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, Lutaml::Model::Type::String
-      attribute :content, Lutaml::Model::Type::String
-      attribute :display, Lutaml::Model::Type::String
-      attribute :mrow, Mrow
-      attribute :msub, Msub, collection: true
-      attribute :msup, Msup
-      attribute :mn, Lutaml::Model::Type::String, collection: true
-      attribute :mo, Lutaml::Model::Type::String, collection: true
-      attribute :mi, Lutaml::Model::Type::String
-      attribute :mtext, Lutaml::Model::Type::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 :id, :string
+      attribute :content, :string
+      attribute :display, :string
+      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, ::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,32 +1,27 @@
 # 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
-      attribute :separators, Lutaml::Model::Type::String
-      attribute :open, Lutaml::Model::Type::String
-      attribute :close, Lutaml::Model::Type::String
-      attribute :mo, Lutaml::Model::Type::String, collection: true
-      attribute :mn, Lutaml::Model::Type::String, collection: true
-      attribute :mi, Lutaml::Model::Type::String
-      attribute :mtext, Lutaml::Model::Type::String
-      attribute :mspace, Mspace, collection: true
-      attribute :msub, Msub, collection: true
-      attribute :mstyle, Mstyle, collection: true
-      attribute :mfrac, Mfrac, collection: true
+      attribute :separators, :string
+      attribute :open, :string
+      attribute :close, :string
+      attribute :mo, :string, collection: true
+      attribute :mn, :string, collection: true
+      attribute :mi, :string
+      attribute :mtext, :string
+      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
+        map_attribute "separators", to: :separators,
+                                    value_map: { to: { empty: :empty } }
         map_attribute "open", to: :open
         map_attribute "close", to: :close
 

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 :bevelled, Lutaml::Model::Type::String
-      attribute :linethickness, Lutaml::Model::Type::String
-      attribute :mn, Lutaml::Model::Type::String, collection: true
-      attribute :mtext, Lutaml::Model::Type::String, 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,16 +1,15 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "mstyle"
 
 module Sts
   module TbxIsoTml
     class Mi < Lutaml::Model::Serializable
-      attribute :content, Lutaml::Model::Type::String
+      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,32 +1,27 @@
 # 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
     class Mrow < Lutaml::Model::Serializable
-      attribute :content, Lutaml::Model::Type::String
-      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 :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 :content, :string
+      attribute :mo, :string, collection: true
+      attribute :mi, :string, collection: true
+      attribute :mn, :string, collection: true
+      attribute :mtext, :string, 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, Lutaml::Model::Type::String
+      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