sts 0.3.2 → 0.3.4

data/lib/sts/tbx_iso_tml/fn.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "shale"
-
 require_relative "../niso_sts/paragraph"
 
 module Sts
   module TbxIsoTml
-    class Fn < Sts::Mapper
-      attribute :id, Shale::Type::String
-      attribute :label, Shale::Type::String
+    class Fn < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :label, :string
       attribute :p, Sts::NisoSts::Paragraph
 
       xml do

data/lib/sts/tbx_iso_tml/fn_group.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "fn"
 
 module Sts
   module TbxIsoTml
-    class FnGroup < Sts::Mapper
+    class FnGroup < Lutaml::Model::Serializable
       attribute :fn, Sts::TbxIsoTml::Fn, collection: true
 
       xml do

data/lib/sts/tbx_iso_tml/geographical_usage.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class GeographicalUsage < Sts::Mapper
-      attribute :value, Shale::Type::String
+    class GeographicalUsage < Lutaml::Model::Serializable
+      attribute :value, :string
 
       xml do
         root "geographicalUsage"

data/lib/sts/tbx_iso_tml/grammatical_gender.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class GrammaticalGender < Sts::Mapper
-      # TODO: can be masculine, feminine, singular
-      attribute :value, Shale::Type::String
+    class GrammaticalGender < Lutaml::Model::Serializable
+      attribute :value, :string,
+                values: %w[masculine feminine neuter]
 
       xml do
         root "grammaticalGender"

data/lib/sts/tbx_iso_tml/grammatical_number.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class GrammaticalNumber < Sts::Mapper
-      # TODO: can be singular | plural
-      attribute :value, Shale::Type::String
+    class GrammaticalNumber < Lutaml::Model::Serializable
+      attribute :value, :string,
+                values: %w[singular plural]
 
       xml do
         root "grammaticalNumber"

data/lib/sts/tbx_iso_tml/italic.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class Italic < Sts::Mapper
-      attribute :value, Shale::Type::String
-      attribute :sub, Shale::Type::String
+    class Italic < Lutaml::Model::Serializable
+      attribute :value, :string
+      attribute :sub, :string
 
       xml do
-        root "italic"
+        root "italic", mixed: true
         namespace nil, nil
 
         map_content to: :value

data/lib/sts/tbx_iso_tml/lang_set.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "note"
 require_relative "example"
@@ -12,12 +12,12 @@ require_relative "term_information_group"
 
 module Sts
   module TbxIsoTml
-    class Definition < Sts::Mapper; end
-    class Note < Sts::Mapper; end
-    class Caption < Sts::Mapper; end
+    class Definition < Lutaml::Model::Serializable; end
+    class Note < Lutaml::Model::Serializable; end
+    class Caption < Lutaml::Model::Serializable; end
 
-    class LangSet < Sts::Mapper
-      attribute :lang, Shale::Type::String
+    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
@@ -25,12 +25,12 @@ module Sts
       attribute :see, See, collection: true
       attribute :source, Source, collection: true
       attribute :x_source, ExternalSource, collection: true
-      attribute :cross_reference, Shale::Type::String, collection: true
-      attribute :subject_field, Shale::Type::String
+      attribute :cross_reference, :string, collection: true
+      attribute :subject_field, :string
       # attribute :x_graphic, ExternalGraphic, collection: true
 
       xml do
-        root "langSet"
+        root "langSet", mixed: true
         namespace "urn:iso:std:iso:30042:ed-1", "tbx"
 
         map_attribute "lang", to: :lang,

data/lib/sts/tbx_iso_tml/math.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "semantics"
 require_relative "mrow"
@@ -14,19 +14,19 @@ require_relative "munderover"
 
 module Sts
   module TbxIsoTml
-    class Mfenced < Sts::Mapper; end
+    class Mfenced < Lutaml::Model::Serializable; end
 
-    class Math < Sts::Mapper
-      attribute :id, Shale::Type::String
-      attribute :content, Shale::Type::String
-      attribute :display, Shale::Type::String
+    class Math < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content, :string
+      attribute :display, :string
       attribute :mrow, Mrow
-      attribute :msub, Msub
+      attribute :msub, Msub, collection: true
       attribute :msup, Msup
-      attribute :mn, Shale::Type::String
-      attribute :mo, Shale::Type::String
-      attribute :mi, Shale::Type::String
-      attribute :mtext, Shale::Type::String
+      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
@@ -35,7 +35,7 @@ module Sts
       attribute :munderover, Munderover, collection: true
 
       xml do
-        root "math"
+        root "math", mixed: true
         namespace "http://www.w3.org/1998/Math/MathML", "mml"
 
         map_attribute "id", to: :id

data/lib/sts/tbx_iso_tml/mfenced.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "mspace"
 require_relative "msub"
@@ -9,24 +9,25 @@ require_relative "mfrac"
 
 module Sts
   module TbxIsoTml
-    class Mfenced < Sts::Mapper
-      attribute :separators, Shale::Type::String
-      attribute :open, Shale::Type::String
-      attribute :close, Shale::Type::String
-      attribute :mo, Shale::Type::String
-      attribute :mn, Shale::Type::String
-      attribute :mi, Shale::Type::String
-      attribute :mtext, Shale::Type::String
+    class Mfenced < Lutaml::Model::Serializable
+      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, Mspace, collection: true
       attribute :msub, Msub, collection: true
       attribute :mstyle, Mstyle, collection: true
       attribute :mfrac, Mfrac, collection: true
 
       xml do
-        root "math"
+        root "mfenced", mixed: true
         namespace "http://www.w3.org/1998/Math/MathML", "mml"
 
-        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,23 +1,23 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "mrow"
 require_relative "mstyle"
 
 module Sts
   module TbxIsoTml
-    class Mrow < Sts::Mapper; end
+    class Mrow < Lutaml::Model::Serializable; end
 
-    class Mfrac < Sts::Mapper
+    class Mfrac < Lutaml::Model::Serializable
       attribute :mrow, Mrow, collection: true
       attribute :mstyle, Mstyle, collection: true
-      attribute :bevelled, Shale::Type::String
-      attribute :linethickness, Shale::Type::String
-      attribute :mn, Shale::Type::String
-      attribute :mtext, Shale::Type::String
+      attribute :bevelled, :string
+      attribute :linethickness, :string
+      attribute :mn, :string, collection: true
+      attribute :mtext, :string, collection: true
 
       xml do
-        root "math"
+        root "mfrac", mixed: true
         namespace "http://www.w3.org/1998/Math/MathML", "mml"
 
         map_attribute "bevelled", to: :bevelled

data/lib/sts/tbx_iso_tml/mi.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "mstyle"
 
 module Sts
   module TbxIsoTml
-    class Mi < Sts::Mapper
-      attribute :content, Shale::Type::String
+    class Mi < Lutaml::Model::Serializable
+      attribute :content, :string
 
       xml do
         root "mi"

data/lib/sts/tbx_iso_tml/mrow.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "mfrac"
 require_relative "mstyle"
 require_relative "msub"
@@ -10,22 +10,22 @@ require_relative "mfenced"
 
 module Sts
   module TbxIsoTml
-    class Mrow < Sts::Mapper
-      attribute :content, Shale::Type::String
-      attribute :mo, Shale::Type::String
-      attribute :mi, Shale::Type::String
-      attribute :mn, Shale::Type::String
-      attribute :mtext, Shale::Type::String
+    class Mrow < Lutaml::Model::Serializable
+      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, Mrow
-      attribute :mfrac, Mfrac
-      attribute :mstyle, Mstyle
-      attribute :msub, Msub
+      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
 
       xml do
-        root "math"
+        root "mrow", mixed: true
         namespace "http://www.w3.org/1998/Math/MathML", "mml"
 
         map_element "mo", to: :mo

data/lib/sts/tbx_iso_tml/mspace.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class Mspace < Sts::Mapper
-      attribute :width, Shale::Type::String
+    class Mspace < Lutaml::Model::Serializable
+      attribute :width, :string
 
       xml do
         root "mspace"

data/lib/sts/tbx_iso_tml/mstyle.rb

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

data/lib/sts/tbx_iso_tml/msub.rb

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

data/lib/sts/tbx_iso_tml/msup.rb

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

data/lib/sts/tbx_iso_tml/munder.rb

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

data/lib/sts/tbx_iso_tml/munderover.rb

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

data/lib/sts/tbx_iso_tml/named_content.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class NamedContent < Sts::Mapper
-      attribute :content_type, Shale::Type::String
-      attribute :content, Shale::Type::String
+    class NamedContent < Lutaml::Model::Serializable
+      attribute :content_type, :string
+      attribute :content, :string
 
       xml do
         root "named-content"

data/lib/sts/tbx_iso_tml/normative_authorization.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class NormativeAuthorization < Sts::Mapper
-      # TODO: can be: admittedTerm, preferredTerm, deprecatedTerm
-      attribute :value, Shale::Type::String
+    class NormativeAuthorization < Lutaml::Model::Serializable
+      attribute :value, :string,
+                values: %w[admittedTerm preferredTerm deprecatedTerm]
 
       xml do
         root "normativeAuthorization"

data/lib/sts/tbx_iso_tml/note.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "table_wrap"
 require_relative "entailed_term"
@@ -13,20 +13,20 @@ require_relative "../niso_sts/reference_standard"
 
 module Sts
   module TbxIsoTml
-    class Note < Sts::Mapper
-      attribute :id, Shale::Type::String
-      attribute :value, Shale::Type::String
+    class Note < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :value, :string
       attribute :table_wrap, Sts::TbxIsoTml::TableWrap
-      attribute :entailed_term, EntailedTerm
-      attribute :math, Sts::TbxIsoTml::Math
+      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
+      attribute :italic, Italic, collection: true
 
       xml do
-        root "note"
+        root "note", mixed: true
         namespace "urn:iso:std:iso:30042:ed-1", "tbx"
 
         map_attribute "id", to: :id

data/lib/sts/tbx_iso_tml/part_of_speech.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class PartOfSpeech < Sts::Mapper
-      # TODO: can be `noun`, `verb`, `adj`, `adv`
-      attribute :value, Shale::Type::String
+    class PartOfSpeech < Lutaml::Model::Serializable
+      attribute :value, :string,
+                values: %w[noun verb adj adv]
 
       xml do
         root "partOfSpeech"

data/lib/sts/tbx_iso_tml/see.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class See < Sts::Mapper
-      attribute :script, Shale::Type::String
-      attribute :value, Shale::Type::String
+    class See < Lutaml::Model::Serializable
+      attribute :script, :string
+      attribute :value, :string
 
       xml do
         root "see"

data/lib/sts/tbx_iso_tml/semantics.rb

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

data/lib/sts/tbx_iso_tml/source.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require "shale"
-
 require_relative "italic"
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class Source < Sts::Mapper
-      attribute :value, Shale::Type::String
+    class Source < Lutaml::Model::Serializable
+      attribute :value, :string
       attribute :italic, Italic
 
       xml do
-        root "source"
+        root "source", mixed: true
         namespace "urn:iso:std:iso:30042:ed-1", "tbx"
 
         map_content to: :value