sts 0.3.2 → 0.3.3

data/lib/sts/niso_sts/reference_list.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "shale"
-
 require_relative "reference"
 
 module Sts
   module NisoSts
-    class ReferenceList < Sts::Mapper
-      attribute :content_type, Shale::Type::String
-      attribute :id, Shale::Type::String
-      attribute :specific_use, Shale::Type::String
-      attribute :title, Shale::Type::String
+    class ReferenceList < Lutaml::Model::Serializable
+      attribute :content_type, Lutaml::Model::Type::String
+      attribute :id, Lutaml::Model::Type::String
+      attribute :specific_use, Lutaml::Model::Type::String
+      attribute :title, Lutaml::Model::Type::String
       attribute :label, Label
       attribute :ref, Reference, collection: true
 

data/lib/sts/niso_sts/reference_standard.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "standard_ref"
 require_relative "std_id_group"
 require_relative "fn"
@@ -8,18 +8,18 @@ require_relative "../tbx_iso_tml/xref"
 
 module Sts
   module NisoSts
-    class ReferenceStandard < Sts::Mapper
-      attribute :type, Shale::Type::String
-      attribute :std_id, Shale::Type::String
-      attribute :content, Shale::Type::String
+    class ReferenceStandard < Lutaml::Model::Serializable
+      attribute :type, Lutaml::Model::Type::String
+      attribute :std_id, Lutaml::Model::Type::String
+      attribute :content, Lutaml::Model::Type::String
       attribute :std_ref, StandardRef
-      attribute :title, Shale::Type::String
+      attribute :title, Lutaml::Model::Type::String
       attribute :fn, Fn, collection: true
       attribute :std_id_group, StdIdGroup, collection: true
       attribute :xref, Sts::TbxIsoTml::Xref, collection: true
 
       xml do
-        root "std"
+        root "std", mixed: true
 
         map_attribute "type", to: :type
         map_attribute "std-id", to: :std_id

data/lib/sts/niso_sts/section.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "paragraph"
 require_relative "list"
@@ -16,14 +16,14 @@ require_relative "../tbx_iso_tml/table_wrap"
 
 module Sts
   module NisoSts
-    class Title < Sts::Mapper; end
+    class Title < Lutaml::Model::Serializable; end
 
-    class Section < Sts::Mapper
-      attribute :id, Shale::Type::String
-      attribute :specific_use, Shale::Type::String
+    class Section < Lutaml::Model::Serializable
+      attribute :id, Lutaml::Model::Type::String
+      attribute :specific_use, Lutaml::Model::Type::String
       attribute :label, Label
       attribute :title, Title
-      attribute :type, Shale::Type::String
+      attribute :type, Lutaml::Model::Type::String
       attribute :array, SectionArray
       attribute :paragraphs, Paragraph, collection: true
       attribute :list, List, collection: true
@@ -38,13 +38,13 @@ module Sts
       attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
 
       xml do
-        root "sec"
+        root "sec", mixed: true
 
         map_attribute "id", to: :id
         map_attribute "sec-type", to: :type
         map_attribute "specific-use", to: :specific_use
 
-        map_element "label", to: :label, render_nil: true
+        map_element "label", to: :label
         map_element "title", to: :title
         map_element "p", to: :paragraphs
         map_element "sec", to: :sec

data/lib/sts/niso_sts/section_array.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "../tbx_iso_tml/table"
 
 module Sts
   module NisoSts
-    class SectionArray < Sts::Mapper
-      attribute :id, Shale::Type::String
+    class SectionArray < Lutaml::Model::Serializable
+      attribute :id, Lutaml::Model::Type::String
       attribute :table, Sts::TbxIsoTml::Table
 
       xml do

data/lib/sts/niso_sts/standard.rb

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
-require "shale"
-
 require_relative "front"
 require_relative "body"
 require_relative "back"
 
 module Sts
   module NisoSts
-    class Standard < Sts::Mapper
+    class Standard < Lutaml::Model::Serializable
       attribute :front, Front
       attribute :body, Body
       attribute :back, Back
-      attribute :id, Shale::Type::String
-      attribute :lang, Shale::Type::String
-      attribute :mml, Shale::Type::String
-      attribute :tbx, Shale::Type::String
-      attribute :xlink, Shale::Type::String
+      attribute :id, Lutaml::Model::Type::String
+      attribute :lang, Lutaml::Model::Type::String
+      attribute :mml, Lutaml::Model::Type::String
+      attribute :tbx, Lutaml::Model::Type::String
+      attribute :xlink, Lutaml::Model::Type::String
 
       xml do
         root "standard"

data/lib/sts/niso_sts/standard_identification.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "std_id_group"
 
 module Sts
   module NisoSts
-    class StandardIdentification < Sts::Mapper
-      attribute :originator, Shale::Type::String
-      attribute :doc_type, Shale::Type::String
-      attribute :doc_number, Shale::Type::String
-      attribute :edition, Shale::Type::String
-      attribute :version, Shale::Type::String
-      attribute :part_number, Shale::Type::String
+    class StandardIdentification < Lutaml::Model::Serializable
+      attribute :originator, Lutaml::Model::Type::String
+      attribute :doc_type, Lutaml::Model::Type::String
+      attribute :doc_number, Lutaml::Model::Type::String
+      attribute :edition, Lutaml::Model::Type::String
+      attribute :version, Lutaml::Model::Type::String
+      attribute :part_number, Lutaml::Model::Type::String
       attribute :std_id_group, StdIdGroup
 
       xml do
-        root "std-iden"
+        root "std-ident", mixed: true
 
         map_element "originator", to: :originator
         map_element "doc-type", to: :doc_type

data/lib/sts/niso_sts/standard_ref.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class StandardRef < Sts::Mapper
-      attribute :type, Shale::Type::String
-      attribute :value, Shale::Type::String
+    class StandardRef < Lutaml::Model::Serializable
+      attribute :type, Lutaml::Model::Type::String
+      attribute :value, Lutaml::Model::Type::String
 
       xml do
         root "std-ref"

data/lib/sts/niso_sts/std_cross_reference.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class StdCrossReference < Sts::Mapper
-      attribute :type, Shale::Type::String
+    class StdCrossReference < Lutaml::Model::Serializable
+      attribute :type, Lutaml::Model::Type::String
       attribute :std_ref, StandardRef, collection: true
 
       xml do

data/lib/sts/niso_sts/std_id.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module NisoSts
-    class StdId < Sts::Mapper
-      attribute :std_id_link_type, Shale::Type::String
-      attribute :std_id_type, Shale::Type::String
-      attribute :specific_use, Shale::Type::String
-      attribute :content, Shale::Type::String
+    class StdId < Lutaml::Model::Serializable
+      attribute :std_id_link_type, Lutaml::Model::Type::String
+      attribute :std_id_type, Lutaml::Model::Type::String
+      attribute :specific_use, Lutaml::Model::Type::String
+      attribute :content, Lutaml::Model::Type::String
 
       xml do
         root "std-id"

data/lib/sts/niso_sts/std_id_group.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "std_id"
 
 module Sts
   module NisoSts
-    class StdIdGroup < Sts::Mapper
+    class StdIdGroup < Lutaml::Model::Serializable
       attribute :std_id, StdId, collection: true
 
       xml do

data/lib/sts/niso_sts/term_display.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "paragraph"
 require_relative "non_normative_note"
 
 module Sts
   module NisoSts
-    class TermDisplay < Sts::Mapper
+    class TermDisplay < Lutaml::Model::Serializable
       attribute :p, Paragraph, collection: true
       attribute :non_normative_note, NonNormativeNote, collection: true
 

data/lib/sts/niso_sts/term_section.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "../tbx_iso_tml"
 require_relative "term_display"
@@ -8,15 +8,15 @@ require_relative "../tbx_iso_tml/term_entry"
 
 module Sts
   module NisoSts
-    class TermSection < Sts::Mapper
-      attribute :id, Shale::Type::String
-      attribute :sec_type, Shale::Type::String
+    class TermSection < Lutaml::Model::Serializable
+      attribute :id, Lutaml::Model::Type::String
+      attribute :sec_type, Lutaml::Model::Type::String
       attribute :label, Label
       attribute :term_entry, Sts::TbxIsoTml::TermEntry # , collection: true
       attribute :term_display, TermDisplay # , collection: true
 
       xml do
-        root "term-sec"
+        root "term-sec", mixed: true
         map_attribute "id", to: :id
         map_attribute "sec-type", to: :sec_type
 

data/lib/sts/niso_sts/title.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "section"
 require_relative "inline_formula"
 
 module Sts
   module NisoSts
-    class Title < Sts::Mapper
-      attribute :content, Shale::Type::String
+    class Title < Lutaml::Model::Serializable
+      attribute :content, Lutaml::Model::Type::String
       attribute :inline_formula, Sts::NisoSts::InlineFormula, collection: true
 
       xml do
-        root "title"
+        root "title", mixed: true
 
         map_content to: :content
         map_element "inline-formula", to: :inline_formula

data/lib/sts/niso_sts/title_wrap.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 require_relative "reference_list"
 require_relative "reference_standard"
 
 module Sts
   module NisoSts
-    class TitleFull < Sts::Mapper
-      attribute :content, Shale::Type::String
+    class TitleFull < Lutaml::Model::Serializable
+      attribute :content, Lutaml::Model::Type::String
       attribute :std, ReferenceStandard
 
       xml do
-        root "full"
+        root "full", mixed: true
+
         map_content to: :content
         map_element "std", to: :std, namespace: nil, prefix: nil
       end
@@ -21,20 +22,21 @@ module Sts
     class TitleCompl < TitleFull
       xml do
         root "compl"
+
         map_content to: :content
         map_element "std", to: :std, namespace: nil, prefix: nil
       end
     end
 
-    class TitleWrap < Sts::Mapper
-      attribute :intro, Shale::Type::String
-      attribute :main, Shale::Type::String
+    class TitleWrap < Lutaml::Model::Serializable
+      attribute :intro, Lutaml::Model::Type::String
+      attribute :main, Lutaml::Model::Type::String
       attribute :full, TitleFull
       attribute :compl, TitleCompl
-      attribute :lang, Shale::Type::String
+      attribute :lang, Lutaml::Model::Type::String
 
       xml do
-        root "title-wrap"
+        root "title-wrap", mixed: true
         map_attribute "lang", to: :lang,
                               namespace: "http://www.w3.org/XML/1998/namespace",
                               prefix: "xml"

data/lib/sts/tbx_iso_tml/bold.rb

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

data/lib/sts/tbx_iso_tml/caption.rb

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

data/lib/sts/tbx_iso_tml/col.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class Col < Sts::Mapper
-      attribute :width, Sts::TbxIsoTml::Col
-      attribute :char, Sts::TbxIsoTml::Col
-      attribute :charoff, Sts::TbxIsoTml::Col
-      attribute :span, Sts::TbxIsoTml::Col
+    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
 
       xml do
         root "col"

data/lib/sts/tbx_iso_tml/definition.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "shale"
-
 require_relative "entailed_term"
 require_relative "note"
 require_relative "italic"
@@ -11,18 +9,18 @@ require_relative "../niso_sts/reference_standard"
 
 module Sts
   module TbxIsoTml
-    class Definition < Sts::Mapper
-      attribute :entailed_term, EntailedTerm
+    class Definition < Lutaml::Model::Serializable
+      attribute :entailed_term, EntailedTerm, collection: true
       attribute :note, Note
-      attribute :value, Shale::Type::String
+      attribute :value, Lutaml::Model::Type::String
       attribute :italic, Italic
       attribute :math, Sts::TbxIsoTml::Math
-      attribute :sub, Shale::Type::String
+      attribute :sub, Lutaml::Model::Type::String
       attribute :list, Sts::NisoSts::List, collection: true
       attribute :std, Sts::NisoSts::ReferenceStandard, collection: true
 
       xml do
-        root "definition"
+        root "definition", mixed: true
         namespace "urn:iso:std:iso:30042:ed-1", "tbx"
 
         map_content to: :value

data/lib/sts/tbx_iso_tml/entailed_term.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../mapper"
+require "lutaml/model"
 
 module Sts
   module TbxIsoTml
-    class EntailedTerm < Sts::Mapper
-      attribute :target, Shale::Type::String
-      attribute :xtarget, Shale::Type::String
-      attribute :lang, Shale::Type::String
-      attribute :value, Shale::Type::String
+    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
 
       xml do
         root "entailedTerm"

data/lib/sts/tbx_iso_tml/example.rb

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
-require "shale"
-
-require_relative "../mapper"
+require "lutaml/model"
 require_relative "entailed_term"
 
 require_relative "../niso_sts/inline_formula"
 
 module Sts
   module TbxIsoTml
-    class Example < Sts::Mapper
-      attribute :id, Shale::Type::String
-      attribute :value, Shale::Type::String
-      attribute :entailed_term, EntailedTerm
+    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
 
       xml do
-        root "example"
+        root "example", mixed: true
         namespace "urn:iso:std:iso:30042:ed-1", "tbx"
 
         map_content to: :value

data/lib/sts/tbx_iso_tml/external_graphic.rb

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

data/lib/sts/tbx_iso_tml/external_source.rb

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

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, Lutaml::Model::Type::String
+      attribute :label, Lutaml::Model::Type::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, Lutaml::Model::Type::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, Lutaml::Model::Type::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, Lutaml::Model::Type::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, Lutaml::Model::Type::String
+      attribute :sub, Lutaml::Model::Type::String
 
       xml do
-        root "italic"
+        root "italic", mixed: true
         namespace nil, nil
 
         map_content to: :value